Changeset 26292

Timestamp:

11/20/2013 10:46:43 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Fix JSHint errors in image-edit.js.

props dougwollison.
fixes #26000.

File:

• trunk/src/wp-admin/js/image-edit.js (modified) (28 diffs)

trunk/src/wp-admin/js/image-edit.js

@@ -1 @@
-var imageEdit;
+/* global imageEditL10n, ajaxurl, confirm */
 
 (function($) {
-imageEdit = {
+var imageEdit = window.imageEdit = {
     iasapi : {},
     hold : {},
@@ -21 +21 @@
     },
 
-    init : function(postid, nonce) {
+    init : function(postid) {
         var t = this, old = $('#image-editor-' + t.postid),
             x = t.intval( $('#imgedit-x-' + postid).val() ),
             y = t.intval( $('#imgedit-y-' + postid).val() );
 
-        if ( t.postid != postid && old.length )
+        if ( t.postid !== postid && old.length ) {
             t.close(t.postid);
-
-        t.hold['w'] = t.hold['ow'] = x;
-        t.hold['h'] = t.hold['oh'] = y;
-        t.hold['xy_ratio'] = x / y;
-        t.hold['sizer'] = parseFloat( $('#imgedit-sizer-' + postid).val() );
+        }
+
+        t.hold.w = t.hold.ow = x;
+        t.hold.h = t.hold.oh = y;
+        t.hold.xy_ratio = x / y;
+        t.hold.sizer = parseFloat( $('#imgedit-sizer-' + postid).val() );
         t.postid = postid;
         $('#imgedit-response-' + postid).empty();
@@ -39 +40 @@
             var k = e.keyCode;
 
-            if ( 36 < k && k < 41 )
-                $(this).blur()
-
-            if ( 13 == k ) {
+            if ( 36 < k && k < 41 ) {
+                $(this).blur();
+            }
+
+            if ( 13 === k ) {
                 e.preventDefault();
                 e.stopPropagation();
@@ -53 +55 @@
         var wait = $('#imgedit-wait-' + postid);
 
-        if ( toggle )
+        if ( toggle ) {
             wait.height( $('#imgedit-panel-' + postid).height() ).fadeIn('fast');
-        else
+        } else {
             wait.fadeOut('fast');
+        }
     },
 
@@ -73 +76 @@
 
         if ( x ) {
-            h1 = (w.val() != '') ? Math.round( w.val() / this.hold['xy_ratio'] ) : '';
+            h1 = ( w.val() !== '' ) ? Math.round( w.val() / this.hold.xy_ratio ) : '';
             h.val( h1 );
         } else {
-            w1 = (h.val() != '') ? Math.round( h.val() * this.hold['xy_ratio'] ) : '';
+            w1 = ( h.val() !== '' ) ? Math.round( h.val() * this.hold.xy_ratio ) : '';
             w.val( w1 );
         }
 
-        if ( ( h1 && h1 > this.hold['oh'] ) || ( w1 && w1 > this.hold['ow'] ) )
+        if ( ( h1 && h1 > this.hold.oh ) || ( w1 && w1 > this.hold.ow ) ) {
             warn.css('visibility', 'visible');
-        else
+        } else {
             warn.css('visibility', 'hidden');
+        }
     },
 
     getSelRatio : function(postid) {
-        var x = this.hold['w'], y = this.hold['h'],
+        var x = this.hold.w, y = this.hold.h,
             X = this.intval( $('#imgedit-crop-width-' + postid).val() ),
             Y = this.intval( $('#imgedit-crop-height-' + postid).val() );
 
-        if ( X && Y )
+        if ( X && Y ) {
             return X + ':' + Y;
-
-        if ( x && y )
+        }
+
+        if ( x && y ) {
             return x + ':' + y;
+        }
 
         return '1:1';
@@ -104 +110 @@
         var history = $('#imgedit-history-' + postid).val(), pop, n, o, i, op = [];
 
-        if ( history != '' ) {
+        if ( history !== '' ) {
             history = JSON.parse(history);
             pop = this.intval( $('#imgedit-undone-' + postid).val() );
@@ -116 +122 @@
             if ( setSize ) {
                 if ( !history.length ) {
-                    this.hold['w'] = this.hold['ow'];
-                    this.hold['h'] = this.hold['oh'];
+                    this.hold.w = this.hold.ow;
+                    this.hold.h = this.hold.oh;
                     return '';
                 }
@@ -126 +132 @@
 
                 if ( o ) {
-                    this.hold['w'] = o.fw;
-                    this.hold['h'] = o.fh;
+                    this.hold.w = o.fw;
+                    this.hold.h = o.fh;
                 }
             }
@@ -168 +174 @@
                 max1 = Math.max( t.hold.w, t.hold.h );
                 max2 = Math.max( $(img).width(), $(img).height() );
-                t.hold['sizer'] = max1 > max2 ? max2 / max1 : 1;
+                t.hold.sizer = max1 > max2 ? max2 / max1 : 1;
 
                 t.initCrop(postid, img, parent);
                 t.setCropSelection(postid, 0);
 
-                if ( (typeof callback != "unknown") && callback != null )
+                if ( (typeof callback !== 'undefined') && callback !== null ) {
                     callback();
-
-                if ( $('#imgedit-history-' + postid).val() && $('#imgedit-undone-' + postid).val() == 0 )
+                }
+
+                if ( $('#imgedit-history-' + postid).val() && $('#imgedit-undone-' + postid).val() === 0 ) {
                     $('input.imgedit-submit-btn', '#imgedit-panel-' + postid).removeAttr('disabled');
-                else
+                } else {
                     $('input.imgedit-submit-btn', '#imgedit-panel-' + postid).prop('disabled', true);
+                }
 
                 t.toggleEditor(postid, 0);
@@ -193 +201 @@
         var t = this, data, w, h, fw, fh;
 
-        if ( t.notsaved(postid) )
-            return false;
+        if ( t.notsaved(postid) ) {
+            return false;
+        }
 
         data = {
@@ -202 +211 @@
         };
 
-        if ( 'scale' == action ) {
+        if ( 'scale' === action ) {
             w = $('#imgedit-scale-width-' + postid),
             h = $('#imgedit-scale-height-' + postid),
@@ -216 +225 @@
             }
 
-            if ( fw == t.hold.ow || fh == t.hold.oh )
+            if ( fw === t.hold.ow || fh === t.hold.oh ) {
                 return false;
+            }
 
             data['do'] = 'scale';
-            data['fwidth'] = fw;
-            data['fheight'] = fh;
-        } else if ( 'restore' == action ) {
+            data.fwidth = fw;
+            data.fheight = fh;
+        } else if ( 'restore' === action ) {
             data['do'] = 'restore';
         } else {
@@ -238 +248 @@
         var data, target = this.getTarget(postid), history = this.filterHistory(postid, 0);
 
-        if ( '' == history )
-            return false;
+        if ( '' === history ) {
+            return false;
+        }
 
         this.toggleEditor(postid, 1);
@@ -261 +272 @@
             }
 
-            if ( ret.fw && ret.fh )
+            if ( ret.fw && ret.fh ) {
                 $('#media-dims-' + postid).html( ret.fw + ' &times; ' + ret.fh );
-
-            if ( ret.thumbnail )
+            }
+
+            if ( ret.thumbnail ) {
                 $('.thumbnail', '#thumbnail-head-' + postid).attr('src', ''+ret.thumbnail);
-
-            if ( ret.msg )
+            }
+
+            if ( ret.msg ) {
                 $('#imgedit-response-' + postid).html('<div class="updated"><p>' + ret.msg + '</p></div>');
+            }
 
             imageEdit.close(postid);
@@ -317 +331 @@
             minHeight: 3,
 
-            onInit: function(img, c) {
+            onInit: function() {
                 parent.children().mousedown(function(e){
                     var ratio = false, sel, defRatio;
@@ -333 +347 @@
             },
 
-            onSelectStart: function(img, c) {
+            onSelectStart: function() {
                 imageEdit.setDisabled($('#imgedit-crop-sel-' + postid), 1);
             },
@@ -351 +365 @@
     setCropSelection : function(postid, c) {
         var sel, min = $('#imgedit-minthumb-' + postid).val() || '128:128',
-            sizer = this.hold['sizer'];
+            sizer = this.hold.sizer;
             min = min.split(':');
             c = c || 0;
@@ -378 +392 @@
         warn = warn || false;
 
-        if ( warn && this.notsaved(postid) )
-            return false;
+        if ( warn && this.notsaved(postid) ) {
+            return false;
+        }
 
         this.iasapi = {};
@@ -391 +406 @@
     notsaved : function(postid) {
         var h = $('#imgedit-history-' + postid).val(),
-            history = (h != '') ? JSON.parse(h) : new Array(),
+            history = ( h !== '' ) ? JSON.parse(h) : [],
             pop = this.intval( $('#imgedit-undone-' + postid).val() );
 
         if ( pop < history.length ) {
-            if ( confirm( $('#imgedit-leaving-' + postid).html() ) )
+            if ( confirm( $('#imgedit-leaving-' + postid).html() ) ) {
                 return false;
+            }
             return true;
         }
@@ -404 +420 @@
     addStep : function(op, postid, nonce) {
         var t = this, elem = $('#imgedit-history-' + postid),
-        history = (elem.val() != '') ? JSON.parse(elem.val()) : new Array(),
+        history = ( elem.val() !== '' ) ? JSON.parse( elem.val() ) : [],
         undone = $('#imgedit-undone-' + postid),
         pop = t.intval(undone.val());
@@ -424 +440 @@
 
     rotate : function(angle, postid, nonce, t) {
-        if ( $(t).hasClass('disabled') )
-            return false;
-
-        this.addStep({ 'r': { 'r': angle, 'fw': this.hold['h'], 'fh': this.hold['w'] }}, postid, nonce);
+        if ( $(t).hasClass('disabled') ) {
+            return false;
+        }
+
+        this.addStep({ 'r': { 'r': angle, 'fw': this.hold.h, 'fh': this.hold.w }}, postid, nonce);
     },
 
     flip : function (axis, postid, nonce, t) {
-        if ( $(t).hasClass('disabled') )
-            return false;
-
-        this.addStep({ 'f': { 'f': axis, 'fw': this.hold['w'], 'fh': this.hold['h'] }}, postid, nonce);
+        if ( $(t).hasClass('disabled') ) {
+            return false;
+        }
+
+        this.addStep({ 'f': { 'f': axis, 'fw': this.hold.w, 'fh': this.hold.h }}, postid, nonce);
     },
 
@@ -442 +460 @@
             h = this.intval( $('#imgedit-sel-height-' + postid).val() );
 
-        if ( $(t).hasClass('disabled') || sel == '' )
-            return false;
+        if ( $(t).hasClass('disabled') || sel === '' ) {
+            return false;
+        }
 
         sel = JSON.parse(sel);
         if ( sel.w > 0 && sel.h > 0 && w > 0 && h > 0 ) {
-            sel['fw'] = w;
-            sel['fh'] = h;
+            sel.fw = w;
+            sel.fh = h;
             this.addStep({ 'c': sel }, postid, nonce);
         }
@@ -457 +476 @@
             pop = t.intval( elem.val() ) + 1;
 
-        if ( button.hasClass('disabled') )
+        if ( button.hasClass('disabled') ) {
             return;
+        }
 
         elem.val(pop);
         t.refreshEditor(postid, nonce, function() {
             var elem = $('#imgedit-history-' + postid),
-            history = (elem.val() != '') ? JSON.parse(elem.val()) : new Array();
+            history = ( elem.val() !== '' ) ? JSON.parse( elem.val() ) : [];
 
             t.setDisabled($('#image-redo-' + postid), true);
@@ -474 +494 @@
             pop = t.intval( elem.val() ) - 1;
 
-        if ( button.hasClass('disabled') )
+        if ( button.hasClass('disabled') ) {
             return;
+        }
 
         elem.val(pop);
@@ -488 +509 @@
             x = this.intval( elX.val() ), y = this.intval( elY.val() ),
             img = $('#image-preview-' + postid), imgh = img.height(), imgw = img.width(),
-            sizer = this.hold['sizer'], x1, y1, x2, y2, ias = this.iasapi;
+            sizer = this.hold.sizer, x1, y1, x2, y2, ias = this.iasapi;
 
         if ( x < 1 ) {
@@ -528 +549 @@
         num = Math.round(num);
 
-        if ( this.hold.sizer > 0.6 )
+        if ( this.hold.sizer > 0.6 ) {
             return num;
+        }
 
         s = num.toString().slice(-1);
 
-        if ( '1' == s )
+        if ( '1' === s ) {
             return num - 1;
-        else if ( '9' == s )
+        } else if ( '9' === s ) {
             return num + 1;
+        }
 
         return num;
@@ -557 +580 @@
 
             if ( sel = this.iasapi.getSelection(true) ) {
-                r = Math.ceil( sel.y1 + ((sel.x2 - sel.x1) / (x / y)) );
+                r = Math.ceil( sel.y1 + ( ( sel.x2 - sel.x1 ) / ( x / y ) ) );
 
                 if ( r > h ) {
                     r = h;
-                    if ( n )
+                    if ( n ) {
                         $('#imgedit-crop-height-' + postid).val('');
-                    else
+                    } else {
                         $('#imgedit-crop-width-' + postid).val('');
+                    }
                 }
 
@@ -572 +596 @@
         }
     }
-}
+};
 })(jQuery);