[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Explicit load module 'jquery.tablesorter' instead of use whe...

2017-04-27 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349174 )

Change subject: Explicit load module 'jquery.tablesorter' instead of use when 
loaded
..


Explicit load module 'jquery.tablesorter' instead of use when loaded

The module 'jquery.tablesorter' is already loaded a few lines above.
The previous situation depends on a race-condition of the function is called
or not.

Change-Id: If6777fcc7d9d49604eb78b6d233a32898fc82446
---
M modules/jquery.wikiEditor.dialogs.config.js
1 file changed, 7 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  TheDJ: Looks good to me, approved



diff --git a/modules/jquery.wikiEditor.dialogs.config.js 
b/modules/jquery.wikiEditor.dialogs.config.js
index 81c269d..847f79a 100644
--- a/modules/jquery.wikiEditor.dialogs.config.js
+++ b/modules/jquery.wikiEditor.dialogs.config.js
@@ -889,15 +889,16 @@
// Instead of 
show/hiding, switch the HTML around
// We do this because 
the sortable tables script styles the first row,
// visible or not
-   var headerHTML = $( 
'.wikieditor-toolbar-table-preview-header' ).html(),
+   var $sortable,
+   headerHTML = $( 
'.wikieditor-toolbar-table-preview-header' ).html(),
hiddenHTML = $( 
'.wikieditor-toolbar-table-preview-hidden' ).html();
$( 
'.wikieditor-toolbar-table-preview-header' ).html( hiddenHTML );
$( 
'.wikieditor-toolbar-table-preview-hidden' ).html( headerHTML );
-   if ( typeof 
jQuery.fn.tablesorter === 'function' ) {
-   $( 
'#wikieditor-toolbar-table-preview, #wikieditor-toolbar-table-preview2' )
-   
.filter( '.sortable' )
-   
.tablesorter();
-   }
+   $sortable = $( 
'#wikieditor-toolbar-table-preview, #wikieditor-toolbar-table-preview2' )
+   .filter( 
'.sortable' );
+   mw.loader.using( 
'jquery.tablesorter', function () {
+   
$sortable.tablesorter();
+   } );
} );
},
dialog: {

-- 
To view, visit https://gerrit.wikimedia.org/r/349174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If6777fcc7d9d49604eb78b6d233a32898fc82446
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Explicit load module 'jquery.tablesorter' instead of use whe...

2017-04-20 Thread Fomafix (Code Review) 
Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/349174 )

Change subject: Explicit load module 'jquery.tablesorter' instead of use when 
loaded
..

Explicit load module 'jquery.tablesorter' instead of use when loaded

The module 'jquery.tablesorter' is already loaded a few lines above.
The previous situation depends on a race-condition of the function is called
or not.

Change-Id: If6777fcc7d9d49604eb78b6d233a32898fc82446
---
M modules/jquery.wikiEditor.dialogs.config.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor 
refs/changes/74/349174/1

diff --git a/modules/jquery.wikiEditor.dialogs.config.js 
b/modules/jquery.wikiEditor.dialogs.config.js
index 81c269d..3458038 100644
--- a/modules/jquery.wikiEditor.dialogs.config.js
+++ b/modules/jquery.wikiEditor.dialogs.config.js
@@ -893,11 +893,11 @@
hiddenHTML = $( 
'.wikieditor-toolbar-table-preview-hidden' ).html();
$( 
'.wikieditor-toolbar-table-preview-header' ).html( hiddenHTML );
$( 
'.wikieditor-toolbar-table-preview-hidden' ).html( headerHTML );
-   if ( typeof 
jQuery.fn.tablesorter === 'function' ) {
+   mw.loader.using( 
'jquery.tablesorter', function () {
$( 
'#wikieditor-toolbar-table-preview, #wikieditor-toolbar-table-preview2' )

.filter( '.sortable' )

.tablesorter();
-   }
+   } );
} );
},
dialog: {

-- 
To view, visit https://gerrit.wikimedia.org/r/349174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6777fcc7d9d49604eb78b6d233a32898fc82446
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits