[MediaWiki-commits] [Gerrit] Fix 404 on iframe styles by standardizing get and set module... - change (mediawiki...VisualEditor)

2013-04-10 Thread jenkins-bot (Code Review)
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' );



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' => '
if ( window.devicePixelRatio > 1 ) {
-   document.write( \'\' );
+   document.write( \'\' );
} else {
-   document.write( \'\' );
+   document.write( \'\' );
}
 ',
'bodyAdd' => '

[MediaWiki-commits] [Gerrit] Fix 404 on iframe styles by standardizing get and set module... - change (mediawiki...VisualEditor)

2013-04-10 Thread Robmoen (Code Review)
Robmoen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/58542


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(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/42/58542/1

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' );



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' => '
if ( window.devicePixelRatio > 1 ) {
-   document.write( \'\' );
+   document.write( \'\' );
} else {
-   document.write( \'\' );
+   document.write( \'\' );
}
 ',
'bodyAdd' => '