jenkins-bot has submitted this change and it was merged.
Change subject: Fix 404 on iframe styles by standardizing get and set modules
methods.
......................................................................
Fix 404 on iframe styles by standardizing get and set modules methods.
Change-Id: Iebc2a9fc7db00d661f685c28dbc345fb561bb15e
---
M demos/ve/index.php
M maintenance/makeStaticLoader.php
M modules/ve/ui/ve.ui.Window.js
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/ve/index.php b/demos/ve/index.php
index 1160f4e..3e9abca 100644
--- a/demos/ve/index.php
+++ b/demos/ve/index.php
@@ -88,7 +88,7 @@
require(
'../../modules/../VisualEditor.i18n.php' );
echo 've.init.platform.addMessages( ' .
json_encode( $messages['en'] ) . ');' . "\n";
?>
- ve.init.platform.setModulesUrl( '../../modules/' );
+ ve.init.platform.setModulesUrl( '../../modules' );
</script>
<!-- ext.visualEditor.core -->
<script src="../../modules/ve/ve.Registry.js"></script>
diff --git a/maintenance/makeStaticLoader.php b/maintenance/makeStaticLoader.php
index d147c85..d05377b 100644
--- a/maintenance/makeStaticLoader.php
+++ b/maintenance/makeStaticLoader.php
@@ -32,9 +32,9 @@
$vePath = $this->getOption( 've-path',
$target === 'demo'
// From /demos/ve/index.php
- ? '../../modules/'
+ ? '../../modules'
// From /modules/ve/test/index.html
- : '../../'
+ : '../..'
);
$wgResourceModules['Dependencies'] = array(
@@ -56,9 +56,9 @@
),
'headAdd' => '<script>
if ( window.devicePixelRatio > 1 ) {
- document.write( \'<link rel="stylesheet" href="' . $vePath .
've/ui/styles/ve.ui.Icons-vector.css">\' );
+ document.write( \'<link rel="stylesheet" href="' . $vePath .
'/ve/ui/styles/ve.ui.Icons-vector.css">\' );
} else {
- document.write( \'<link rel="stylesheet" href="' . $vePath .
've/ui/styles/ve.ui.Icons-raster.css">\' );
+ document.write( \'<link rel="stylesheet" href="' . $vePath .
'/ve/ui/styles/ve.ui.Icons-raster.css">\' );
}
</script>',
'bodyAdd' => '<script>
diff --git a/modules/ve/ui/ve.ui.Window.js b/modules/ve/ui/ve.ui.Window.js
index 8a299d1..acd5e63 100644
--- a/modules/ve/ui/ve.ui.Window.js
+++ b/modules/ve/ui/ve.ui.Window.js
@@ -123,7 +123,7 @@
*/
ve.ui.Window.static.addLocalStylesheets = function ( files ) {
var i, len,
- base = ve.init.platform.getModulesUrl() + 've/ui/styles/',
+ base = ve.init.platform.getModulesUrl() + '/ve/ui/styles/',
paths = [];
// Prepend base path to each file name
--
To view, visit https://gerrit.wikimedia.org/r/58542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebc2a9fc7db00d661f685c28dbc345fb561bb15e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Robmoen <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
