Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/259981
Change subject: RL 'ext.bluespice' Bad reference to ExtJS ...................................................................... RL 'ext.bluespice' Bad reference to ExtJS Fixed issues introduced by https://gerrit.wikimedia.org/r/#/c/255446/ 'window.Ext' is not available when 'ext.bluespice' gets loaded so the script crashes. TODO: All code that depends on ExtJS should be wrapped with mw.loader.using('ext.bluespice.extjs'). Also a jQuery promise should be returned instead of an concrete object Also fixed some whitespace issues. Change-Id: I217c9965cd85f7bb3e1288f8a5ff953f36b6c73c --- M resources/bluespice/bluespice.tooltip.js M resources/bluespice/bluespice.util.js M resources/bluespice/bluespice.wikiText.js 3 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/81/259981/1 diff --git a/resources/bluespice/bluespice.tooltip.js b/resources/bluespice/bluespice.tooltip.js index 6f8ab7f..b656d97 100644 --- a/resources/bluespice/bluespice.tooltip.js +++ b/resources/bluespice/bluespice.tooltip.js @@ -1,4 +1,4 @@ -( function ( mw, $, bs, d, Ext, undefined ){ +( function ( mw, $, bs, d, undefined ){ //We only want the code to run (and therefore the resources to be loaded) //when a user actually hovers an appropriate element! @@ -30,4 +30,4 @@ }); } }); -}( mediaWiki, jQuery, blueSpice, Ext, document ) ); +}( mediaWiki, jQuery, blueSpice, document ) ); diff --git a/resources/bluespice/bluespice.util.js b/resources/bluespice/bluespice.util.js index 22fc11b..3433ca9 100644 --- a/resources/bluespice/bluespice.util.js +++ b/resources/bluespice/bluespice.util.js @@ -1,4 +1,4 @@ -( function( mw, bs, $, Ext, undefined ) { +( function( mw, bs, $, undefined ) { /*N-glton-pattern*/ var alerts = {}, @@ -580,4 +580,4 @@ bs.util = util; -}( mediaWiki, blueSpice, jQuery, Ext ) ); +}( mediaWiki, blueSpice, jQuery ) ); diff --git a/resources/bluespice/bluespice.wikiText.js b/resources/bluespice/bluespice.wikiText.js index cdb093c..a71ec17 100644 --- a/resources/bluespice/bluespice.wikiText.js +++ b/resources/bluespice/bluespice.wikiText.js @@ -10,7 +10,7 @@ target: '', protocol: '//' }; - + function parsePropertiesFromString( wikiText ) { if ( wikiText === '' ) { return; @@ -130,7 +130,7 @@ sizeheight: false, nolink: false }; - + function parsePropertiesFromString( wikiText ) { //Trim left and right everything (including linebreaks) that is not a starting or ending link code wikiText = wikiText.replace(/(^.*?\[\[|\]\].*?$|\r\n|\r|\n)/gm,''); @@ -222,7 +222,7 @@ } } } - + function parseTitle( title ) { if ( title.charAt( 0 ) === ':' ) { me.properties.escaped = true; -- To view, visit https://gerrit.wikimedia.org/r/259981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I217c9965cd85f7bb3e1288f8a5ff953f36b6c73c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
