Changeset 26212

Timestamp:

11/15/2013 02:25:29 PM (11 years ago)

Author:

nacin

Message:

Fix JSHint errors in quicktags.js. Ignore deprecated API rather than marking it as exported globals.

props kovshenin.
fixes #26046.

File:

• trunk/src/wp-includes/js/quicktags.js (modified) (27 diffs)

trunk/src/wp-includes/js/quicktags.js

@@ +1 @@
+/* global adminpage, wpActiveEditor, quicktagsL10n, wpLink, fullscreen, prompt */
 /*
  * Quicktags
@@ -22 +23 @@
 // http://www.alexking.org/
 
-var QTags, edButtons = [], edCanvas,
+var QTags, edCanvas,
+    edButtons = [];
+
+/* jshint ignore:start */
 
 /**
@@ -29 +33 @@
  * Define all former global functions so plugins that hack quicktags.js directly don't cause fatal errors.
  */
-edAddTag = function(){},
+var edAddTag = function(){},
 edCheckOpenTags = function(){},
 edCloseAllTags = function(){},
@@ -66 +70 @@
  * @see QTags.addButton()
  */
-function edButton(id, display, tagStart, tagEnd, access, open) {
+function edButton(id, display, tagStart, tagEnd, access) {
     return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 );
 }
+
+/* jshint ignore:end */
 
 (function(){
     // private stuff is prefixed with an underscore
     var _domReady = function(func) {
-        var t, i,  DOMContentLoaded;
-
-        if ( typeof jQuery != 'undefined' ) {
+        var t, i, DOMContentLoaded, _tryReady;
+
+        if ( typeof jQuery !== 'undefined' ) {
             jQuery(document).ready(func);
         } else {
@@ -106 +112 @@
                     window.attachEvent('onload', t.ready);
 
-                    (function(){
+                    _tryReady = function() {
                         try {
-                            document.documentElement.doScroll("left");
+                            document.documentElement.doScroll('left');
                         } catch(e) {
-                            setTimeout(arguments.callee, 50);
+                            setTimeout(_tryReady, 50);
                             return;
                         }
 
                         t.ready();
-                    })();
+                    };
+                    _tryReady();
                 }
 
@@ -129 +136 @@
             var str = number.toString();
 
-            if ( str.length < 2 )
-                str = "0" + str;
+            if ( str.length < 2 ) {
+                str = '0' + str;
+            }
 
             return str;
-        }
+        };
 
         return now.getUTCFullYear() + '-' +
@@ -146 +154 @@
 
     qt = QTags = function(settings) {
-        if ( typeof(settings) == 'string' )
+        if ( typeof(settings) === 'string' ) {
             settings = {id: settings};
-        else if ( typeof(settings) != 'object' )
+        } else if ( typeof(settings) !== 'object' ) {
             return false;
+        }
 
         var t = this,
@@ -157 +166 @@
             tb, onclick, toolbar_id;
 
-        if ( !id || !canvas )
+        if ( !id || !canvas ) {
             return false;
+        }
 
         t.name = name;
@@ -165 +175 @@
         t.settings = settings;
 
-        if ( id == 'content' && typeof(adminpage) == 'string' && ( adminpage == 'post-new-php' || adminpage == 'post-php' ) ) {
+        if ( id === 'content' && typeof(adminpage) === 'string' && ( adminpage === 'post-new-php' || adminpage === 'post-php' ) ) {
             // back compat hack :-(
             edCanvas = canvas;
@@ -186 +196 @@
 
             // don't call the callback on pressing the accesskey when the button is not visible
-            if ( !visible )
+            if ( !visible ) {
                 return;
+            }
 
             // as long as it has the class ed_button, execute the callback
@@ -195 +206 @@
                 i = target.id.replace(name + '_', '');
 
-                if ( t.theButtons[i] )
+                if ( t.theButtons[i] ) {
                     t.theButtons[i].callback.call(t.theButtons[i], target, canvas, t);
+                }
             }
         };
@@ -233 +245 @@
 
         for ( inst in t.instances ) {
-            if ( inst == 0 )
+            if ( inst === 0 ) {
                 continue;
+            }
 
             ed = t.instances[inst];
@@ -245 +258 @@
 
             // set buttons
-            if ( settings.buttons )
+            if ( settings.buttons ) {
                 use = ','+settings.buttons+',';
+            }
 
             for ( i in edButtons ) {
-                if ( !edButtons[i] )
+                if ( !edButtons[i] ) {
                     continue;
+                }
 
                 id = edButtons[i].id;
-                if ( use && defaults.indexOf(','+id+',') != -1 && use.indexOf(','+id+',') == -1 )
+                if ( use && defaults.indexOf( ',' + id + ',' ) !== -1 && use.indexOf( ',' + id + ',' ) === -1 ) {
                     continue;
-
-                if ( !edButtons[i].instance || edButtons[i].instance == inst ) {
+                }
+
+                if ( !edButtons[i].instance || edButtons[i].instance === inst ) {
                     theButtons[id] = edButtons[i];
 
-                    if ( edButtons[i].html )
+                    if ( edButtons[i].html ) {
                         html += edButtons[i].html(name + '_');
-                }
-            }
-
-            if ( use && use.indexOf(',fullscreen,') != -1 ) {
-                theButtons['fullscreen'] = new qt.FullscreenButton();
-                html += theButtons['fullscreen'].html(name + '_');
-            }
-
-
-            if ( 'rtl' == document.getElementsByTagName('html')[0].dir ) {
-                theButtons['textdirection'] = new qt.TextDirectionButton();
-                html += theButtons['textdirection'].html(name + '_');
+                    }
+                }
+            }
+
+            if ( use && use.indexOf(',fullscreen,') !== -1 ) {
+                theButtons.fullscreen = new qt.FullscreenButton();
+                html += theButtons.fullscreen.html(name + '_');
+            }
+
+
+            if ( 'rtl' === document.getElementsByTagName('html')[0].dir ) {
+                theButtons.textdirection = new qt.TextDirectionButton();
+                html += theButtons.textdirection.html(name + '_');
             }
 
@@ -310 +327 @@
         var btn;
 
-        if ( !id || !display )
+        if ( !id || !display ) {
             return;
+        }
 
         priority = priority || 0;
@@ -325 +343 @@
         }
 
-        if ( priority == -1 ) // back-compat
+        if ( priority === -1 ) { // back-compat
             return btn;
+        }
 
         if ( priority > 0 ) {
-            while ( typeof(edButtons[priority]) != 'undefined' ) {
-                priority++
+            while ( typeof(edButtons[priority]) !== 'undefined' ) {
+                priority++;
             }
 
@@ -338 +357 @@
         }
 
-        if ( this.buttonsInitDone )
+        if ( this.buttonsInitDone ) {
             this._buttonsInit(); // add the button HTML to all instances toolbars if addButton() was called too late
+        }
     };
 
@@ -345 +365 @@
         var sel, startPos, endPos, scrollTop, text, canvas = document.getElementById(wpActiveEditor);
 
-        if ( !canvas )
+        if ( !canvas ) {
             return false;
+        }
 
         if ( document.selection ) { //IE
@@ -353 +374 @@
             sel.text = content;
             canvas.focus();
-        } else if ( canvas.selectionStart || canvas.selectionStart == '0' ) { // FF, WebKit, Opera
+        } else if ( canvas.selectionStart || canvas.selectionStart === '0' ) { // FF, WebKit, Opera
             text = canvas.value;
             startPos = canvas.selectionStart;
@@ -420 +441 @@
         if ( ed.openTags ) {
             while ( ret === false && i < ed.openTags.length ) {
-                ret = ed.openTags[i] == t.id ? i : false;
+                ret = ed.openTags[i] === t.id ? i : false;
                 i ++;
             }
@@ -435 +456 @@
             sel = document.selection.createRange();
             if ( sel.text.length > 0 ) {
-                if ( !t.tagEnd )
+                if ( !t.tagEnd ) {
                     sel.text = sel.text + t.tagStart;
-                else
+                } else {
                     sel.text = t.tagStart + sel.text + endTag;
+                }
             } else {
                 if ( !t.tagEnd ) {
@@ -451 +473 @@
             }
             canvas.focus();
-        } else if ( canvas.selectionStart || canvas.selectionStart == '0' ) { // FF, WebKit, Opera
+        } else if ( canvas.selectionStart || canvas.selectionStart === '0' ) { // FF, WebKit, Opera
             startPos = canvas.selectionStart;
             endPos = canvas.selectionEnd;
@@ -459 +481 @@
             r = v.substring(endPos, v.length); // right of the selection
             i = v.substring(startPos, endPos); // inside the selection
-            if ( startPos != endPos ) {
+            if ( startPos !== endPos ) {
                 if ( !t.tagEnd ) {
                     canvas.value = l + i + t.tagStart + r; // insert self closing tags after the selection
@@ -518 +540 @@
                 element = document.getElementById(ed.name + '_' + button.id);
 
-                if ( e )
+                if ( e ) {
                     button.callback.call(button, element, c, ed);
-                else
+                } else {
                     button.closeTag(element, ed);
+                }
             }
         }
@@ -541 +564 @@
         var URL, t = this;
 
-        if ( typeof(wpLink) != 'undefined' ) {
+        if ( typeof(wpLink) !== 'undefined' ) {
             wpLink.open();
             return;
         }
 
-        if ( ! defaultValue )
+        if ( ! defaultValue ) {
             defaultValue = 'http://';
+        }
 
         if ( t.isOpen(ed) === false ) {
@@ -582 +606 @@
     qt.FullscreenButton.prototype = new qt.Button();
     qt.FullscreenButton.prototype.callback = function(e, c) {
-        if ( !c.id || typeof(fullscreen) == 'undefined' )
+        if ( !c.id || typeof(fullscreen) === 'undefined' ) {
             return;
+        }
 
         fullscreen.on();
@@ -589 +614 @@
 
     qt.TextDirectionButton = function() {
-        qt.Button.call(this, 'textdirection', quicktagsL10n.textdirection, '', quicktagsL10n.toggleTextdirection)
+        qt.Button.call(this, 'textdirection', quicktagsL10n.textdirection, '', quicktagsL10n.toggleTextdirection);
     };
     qt.TextDirectionButton.prototype = new qt.Button();
     qt.TextDirectionButton.prototype.callback = function(e, c) {
-        var isRTL = ( 'rtl' == document.getElementsByTagName('html')[0].dir ),
+        var isRTL = ( 'rtl' === document.getElementsByTagName('html')[0].dir ),
             currentDirection = c.style.direction;
 
-        if ( ! currentDirection )
+        if ( ! currentDirection ) {
             currentDirection = ( isRTL ) ? 'rtl' : 'ltr';
-
-        c.style.direction = ( 'rtl' == currentDirection ) ? 'ltr' : 'rtl';
+        }
+
+        c.style.direction = ( 'rtl' === currentDirection ) ? 'ltr' : 'rtl';
         c.focus();
-    }
+    };
 
     // ensure backward compatibility
@@ -616 +642 @@
     edButtons[110] = new qt.TagButton('code','code','<code>','</code>','c'),
     edButtons[120] = new qt.TagButton('more','more','<!--more-->','','t'),
-    edButtons[140] = new qt.CloseButton()
+    edButtons[140] = new qt.CloseButton();
 
 })();