Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280090
Change subject: Add npm entry point
......................................................................
Add npm entry point
Change-Id: Ifbb3eaa80fd554cf79aae409b4f255c7ab332527
---
M .gitignore
A .jshintignore
A .jshintrc
M FanBoxes.js
A Gruntfile.js
M color-picker.js
A package.json
7 files changed, 82 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FanBoxes
refs/changes/90/280090/1
diff --git a/.gitignore b/.gitignore
index 98b092a..1689d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.svn
*~
*.kate-swp
.*.swp
+node_modules/**
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 0000000..3c3629e
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..04c3a97
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,23 @@
+{
+ // Enforcing
+ "bitwise": true,
+ "eqeqeq": true,
+ "freeze": true,
+ "latedef": "nofunc",
+ "noarg": true,
+ "nonew": true,
+ "undef": true,
+ "unused": true,
+ "strict": false,
+
+ // Relaxing
+ "es5": false,
+
+ // Environment
+ "browser": true,
+ "jquery": true,
+
+ "globals": {
+ "mediaWiki": false
+ }
+}
diff --git a/FanBoxes.js b/FanBoxes.js
index b09e1ac..09ff251 100644
--- a/FanBoxes.js
+++ b/FanBoxes.js
@@ -153,7 +153,7 @@
var $container = jQuery( '#show-message-container' + fantagId );
jQuery.post(
- mw.util.wikiScript( 'api' ), {
+ mediaWiki.util.wikiScript( 'api' ), {
action: 'fanboxes',
what: 'showAddRemoveMessage',
'addRemove': addRemove,
@@ -175,7 +175,7 @@
$container.fadeOut( 1000 );
jQuery.post(
- mw.util.wikiScript( 'api' ), {
+ mediaWiki.util.wikiScript( 'api' ), {
action: 'fanboxes',
what: 'messageAddRemoveUserPage',
'addRemove': addRemove,
@@ -197,7 +197,7 @@
*/
createFantag: function() {
if ( !document.getElementById( 'inputRightSide' ).value ) {
- alert( mw.msg( 'fanbox-mustenter-right-or' ) );
+ alert( mediaWiki.msg( 'fanbox-mustenter-right-or' ) );
return '';
}
@@ -206,18 +206,18 @@
!document.getElementById( 'fantag_image_name' ).value
)
{
- alert( mw.msg( 'fanbox-mustenter-left' ) );
+ alert( mediaWiki.msg( 'fanbox-mustenter-left' ) );
return '';
}
var title = document.getElementById( 'wpTitle' ).value;
if ( !title ) {
- alert( mw.msg( 'fanbox-mustenter-title' ) );
+ alert( mediaWiki.msg( 'fanbox-mustenter-title' ) );
return '';
}
if ( title.indexOf( '#' ) > -1 ) {
- alert( mw.msg( 'fanbox-hash' ) );
+ alert( mediaWiki.msg( 'fanbox-hash' ) );
return '';
}
@@ -225,7 +225,7 @@
title = title.replace( '&', '%26' );
jQuery.post(
- mw.util.wikiScript( 'api' ), {
+ mediaWiki.util.wikiScript( 'api' ), {
action: 'fanboxes',
what: 'checkTitleExistence',
page_name: encodeURIComponent(
document.getElementById( 'wpTitle' ).value ),
@@ -248,7 +248,7 @@
*/
createFantagSimple: function() {
if ( !document.getElementById( 'inputRightSide' ).value ) {
- alert( mw.msg( 'fanbox-mustenter-right' ) );
+ alert( mediaWiki.msg( 'fanbox-mustenter-right' ) );
return '';
}
@@ -257,7 +257,7 @@
!document.getElementById( 'fantag_image_name' ).value
)
{
- alert( mw.msg( 'fanbox-mustenter-left' ) );
+ alert( mediaWiki.msg( 'fanbox-mustenter-left' ) );
return '';
}
@@ -266,14 +266,14 @@
resetUpload: function() {
var frame = document.getElementById( 'imageUpload-frame' );
- frame.src = mw.config.get( 'wgScriptPath' ) +
'/index.php?title=Special:FanBoxAjaxUpload';
+ frame.src = mediaWiki.config.get( 'wgScriptPath' ) +
'/index.php?title=Special:FanBoxAjaxUpload';
frame.style.display = 'block';
frame.style.visibility = 'visible';
},
completeImageUpload: function() {
var html = '<div style="margin:0px 0px 10px 0px;"><img
height="30" width="30" src="' +
- mw.config.get( 'wgExtensionAssetsPath' ) +
'/FanBoxes/ajax-loader-white.gif" alt="" /></div>';
+ mediaWiki.config.get( 'wgExtensionAssetsPath' ) +
'/FanBoxes/ajax-loader-white.gif" alt="" /></div>';
document.getElementById( 'fanbox_image' ).innerHTML = html;
document.getElementById( 'fanBoxLeftSideOutput2' ).innerHTML =
html;
},
@@ -282,7 +282,7 @@
document.getElementById( 'fanbox_image' ).innerHTML = img_tag;
document.getElementById( 'fanbox_image2' ).innerHTML =
'<p><a href="javascript:FanBoxes.resetUpload();">' +
- mw.msg( 'fanbox-upload-new-image' ) + '</a></p>';
+ mediaWiki.msg( 'fanbox-upload-new-image' ) + '</a></p>';
document.getElementById( 'fanbox_image' ).value = img_name;
document.getElementById( 'fanBoxLeftSideOutput2' ).innerHTML =
img_tag;
@@ -295,7 +295,7 @@
};
jQuery( document ).ready( function() {
- if ( mw.config.get( 'wgCanonicalSpecialPageName' ) == 'UserBoxes' ) {
+ if ( mediaWiki.config.get( 'wgCanonicalSpecialPageName' ) ==
'UserBoxes' ) {
jQuery( 'div.create-fanbox-buttons
input[type="button"].fanbox-simple-button' ).on( 'click', function() {
FanBoxes.createFantagSimple();
} );
@@ -386,7 +386,7 @@
} );
// FanBoxClass.php (UserBox: pages), Special:TopUserBoxes,
Special:ViewUserBoxes
- if ( mw.config.get( 'wgCanonicalSpecialPageName' ) !== 'UserBoxes' ) {
+ if ( mediaWiki.config.get( 'wgCanonicalSpecialPageName' ) !==
'UserBoxes' ) {
jQuery( 'body' ).on( 'click', 'table.fanBoxTable', function() {
var $element;
if ( jQuery( this ).parent().attr( 'id' ) ) {
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000..36b6671
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,30 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: [
+ '**/*.js',
+ '!node_modules/**'
+ ]
+ },
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/color-picker.js b/color-picker.js
index 39cc486..03665a8 100644
--- a/color-picker.js
+++ b/color-picker.js
@@ -35,4 +35,4 @@
document.getElementById( 'textColorRightSideColor'
).value = sColor;
}
} );
-} );
\ No newline at end of file
+} );
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..ec97d7b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "0.4.5",
+ "grunt-cli": "0.1.13",
+ "grunt-banana-checker": "0.4.0",
+ "grunt-contrib-jshint": "1.0.0",
+ "grunt-jsonlint": "1.0.7"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/280090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbb3eaa80fd554cf79aae409b4f255c7ab332527
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
