Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/89797
Change subject: Alias OO to oo ...................................................................... Alias OO to oo Change-Id: I0d91ab996465216cd22fdd1ac53ef3ef99105c62 --- M VisualEditor.php M demos/ve/index.php M maintenance/makeStaticLoader.php A modules/oojs/oo.export.js M modules/ve/test/index.php M modules/ve/ve.js 6 files changed, 19 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/97/89797/1 diff --git a/VisualEditor.php b/VisualEditor.php index 13a05cb..0fe53c8 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -90,6 +90,7 @@ 'oojs' => $wgVisualEditorResourceTemplate + array( 'scripts' => array( 'oojs/oo.js', + 'oojs/oo.export.js' ), ), diff --git a/demos/ve/index.php b/demos/ve/index.php index 5b745d3..1d6ec28 100644 --- a/demos/ve/index.php +++ b/demos/ve/index.php @@ -89,6 +89,7 @@ <script src="../../modules/jquery/jquery.js"></script> <script src="../../modules/jquery/jquery.client.js"></script> <script src="../../modules/oojs/oo.js"></script> + <script src="../../modules/oojs/oo.export.js"></script> <script src="../../modules/rangy/rangy-core-1.3.js"></script> <script src="../../modules/rangy/rangy-position-1.3.js"></script> <script src="../../modules/unicodejs/unicodejs.js"></script> diff --git a/maintenance/makeStaticLoader.php b/maintenance/makeStaticLoader.php index 96085b9..5d12276 100644 --- a/maintenance/makeStaticLoader.php +++ b/maintenance/makeStaticLoader.php @@ -85,6 +85,7 @@ 'jquery/jquery.js', 'jquery/jquery.client.js', 'oojs/oo.js', + 'oojs/oo.export.js', 'rangy/rangy-core-1.3.js', 'rangy/rangy-position-1.3.js', 'unicodejs/unicodejs.js', diff --git a/modules/oojs/oo.export.js b/modules/oojs/oo.export.js new file mode 100644 index 0000000..35e1405 --- /dev/null +++ b/modules/oojs/oo.export.js @@ -0,0 +1,9 @@ +/*global OO */ +/*! + * VisualEditor OOJS exports. + * + * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ + +window.oo = OO; diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php index 620d4a0..96e579c 100644 --- a/modules/ve/test/index.php +++ b/modules/ve/test/index.php @@ -34,6 +34,7 @@ <script src="../../jquery/jquery.js"></script> <script src="../../jquery/jquery.client.js"></script> <script src="../../oojs/oo.js"></script> + <script src="../../oojs/oo.export.js"></script> <script src="../../rangy/rangy-core-1.3.js"></script> <script src="../../rangy/rangy-position-1.3.js"></script> <script src="../../unicodejs/unicodejs.js"></script> diff --git a/modules/ve/ve.js b/modules/ve/ve.js index 782067e..c21bbf4 100644 --- a/modules/ve/ve.js +++ b/modules/ve/ve.js @@ -5,7 +5,7 @@ * @license The MIT License (MIT); see LICENSE.txt */ -( function ( oo ) { +( function () { var ve, hasOwn; /** @@ -66,13 +66,13 @@ /** * @method - * @inheritdoc OO#cloneObject + * @inheritdoc oo#cloneObject */ ve.cloneObject = oo.cloneObject; /** * @method - * @inheritdoc OO#cloneObject + * @inheritdoc oo#cloneObject */ ve.getObjectValues = oo.getObjectValues; @@ -85,13 +85,13 @@ /** * @method - * @inheritdoc OO#compare + * @inheritdoc oo#compare */ ve.compare = oo.compare; /** * @method - * @inheritdoc OO#copy + * @inheritdoc oo#copy */ ve.copy = oo.copy; @@ -1010,4 +1010,4 @@ // Expose window.ve = ve; -}( OO ) ); +}() ); -- To view, visit https://gerrit.wikimedia.org/r/89797 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d91ab996465216cd22fdd1ac53ef3ef99105c62 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope <roan.katt...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits