jenkins-bot has submitted this change and it was merged.
Change subject: JSHint: fix the last jslint/hint failures
......................................................................
JSHint: fix the last jslint/hint failures
Change-Id: I3695d0da964ee607d91510c490793aca1ace5d58
---
A .jshint
M modules/ext.codeEditor.geshi.js
M modules/jquery.codeEditor.js
3 files changed, 25 insertions(+), 5 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshint b/.jshint
new file mode 100644
index 0000000..dae6c7d
--- /dev/null
+++ b/.jshint
@@ -0,0 +1,18 @@
+{
+/* Common */
+
+// Enforcing
+"camelcase": true,
+"curly": true,
+"eqeqeq": true,
+"immed": true,
+"latedef": true,
+"newcap": true,
+"noarg": true,
+"noempty": true,
+"nonew": true,
+"quotmark": "single",
+"trailing": true,
+"undef": true,
+"unused": true
+}
diff --git a/modules/ext.codeEditor.geshi.js b/modules/ext.codeEditor.geshi.js
index b1fe6ea..876c989 100644
--- a/modules/ext.codeEditor.geshi.js
+++ b/modules/ext.codeEditor.geshi.js
@@ -140,8 +140,9 @@
setLanguage = function ( lang ) {
geshiLang = lang;
- var aceLang = map[geshiLang];
- codeEditor.getSession().setMode( new
(require( "ace/mode/" + aceLang ).Mode) );
+ var aceLang = map[geshiLang],
+ AceLangMode = require(
"ace/mode/" + aceLang ).Mode;
+ codeEditor.getSession().setMode( new
AceLangMode() );
};
setLanguage( geshiLang );
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 31d9408..df64d43 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -131,7 +131,7 @@
* Sets up the iframe in place of the textarea to allow
more advanced operations
*/
'setupCodeEditor': function () {
- var box, lang, container, editdiv, session,
resize, summary;
+ var box, lang, container, editdiv, session,
resize, summary, AceLangMode;
box = context.$textarea;
lang = mw.config.get(
"wgCodeEditorCurrentLanguage" );
@@ -184,7 +184,8 @@
// updated right away to actually use
the new style.
$( mw ).bind( 'LivePreviewPrepare',
context.evt.codeEditorSubmit );
- session.setMode( new (require(
"ace/mode/" + lang ).Mode) );
+ AceLangMode = require( "ace/mode/" +
lang ).Mode;
+ session.setMode( new AceLangMode() );
// Force the box to resize horizontally
to match in future :D
resize = function () {
@@ -251,7 +252,7 @@
}
// Line numbers in CodeEditor are
zero-based
- line = parseInt( result[1] );
+ line = parseInt( result[1], 10 );
context.codeEditor.navigateTo( line -
1, 0 );
// Scroll up a bit to give some context
context.codeEditor.scrollToRow( line -
4 );
--
To view, visit https://gerrit.wikimedia.org/r/106623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3695d0da964ee607d91510c490793aca1ace5d58
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
