Changeset 26667

Timestamp:

12/05/2013 04:04:59 PM (11 years ago)

Author:

nacin

Message:

Define globals and add semicolons to wp-fullscreen.js.

grunt jshint now runs clean for WordPress core!

props mattwiebe.
fixes #26029.

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/wp-admin/js/wp-fullscreen.js (modified) (19 diffs)

trunk/Gruntfile.js

@@ -137 +137 @@
                 options: {
                     processContent: function( src ) {
-                        return src.replace( /([^/]+)\.css/gi, "$1-rtl.css" );
+                        return src.replace( /([^/]+)\.css/gi, '$1-rtl.css' );
                     }
                 },

trunk/src/wp-admin/js/wp-fullscreen.js

@@ +1 @@
+/* global ajaxurl, deleteUserSetting, setUserSetting, switchEditors, tinymce, tinyMCEPreInit, wp_fullscreen_settings, wpActiveEditor:true, wpLink */
 /**
  * PubSub
@@ -64 +65 @@
 
 (function($){
-    var api, ps, bounder, s;
+    var api, ps, bounder, s, timer, block, set_title_hint;
 
     // Initialize the fullscreen/api object
@@ -81 +82 @@
         timer : 0,
         toolbar_shown : false
-    }
+    };
 
     /**
@@ -157 +158 @@
             api.ui.init();
 
-        s.is_mce_on = s.has_tinymce && typeof( tinyMCE.get(s.editor_id) ) != 'undefined';
+        s.is_mce_on = s.has_tinymce && typeof( tinymce.get(s.editor_id) ) != 'undefined';
 
         api.ui.fade( 'show', 'showing', 'shown' );
@@ -228 +229 @@
 
         hidden.val(old);
-    }
+    };
 
     api.savecontent = function() {
@@ -236 +237 @@
             $('#' + s.title_id).val( $('#wp-fullscreen-title').val() );
 
-        if ( s.mode === 'tinymce' && (ed = tinyMCE.get('wp_mce_fullscreen')) ) {
+        if ( s.mode === 'tinymce' && (ed = tinymce.get('wp_mce_fullscreen')) ) {
             content = ed.save();
         } else {
@@ -244 +245 @@
         $('#' + s.editor_id).val( content );
         $(document).triggerHandler('wpcountwords', [ content ]);
-    }
+    };
 
     set_title_hint = function( title ) {
@@ -251 +252 @@
         else
             title.siblings('label').css( 'visibility', 'hidden' );
-    }
+    };
 
     api.dfw_width = function(n) {
@@ -269 +270 @@
         el.width( w );
         setUserSetting('dfw_width', w);
-    }
+    };
 
     ps.subscribe( 'showToolbar', function() {
@@ -306 +307 @@
 
         if ( s.has_tinymce && s.mode === 'tinymce' )
-            tinyMCE.execCommand('wpFullScreenInit');
+            tinymce.execCommand('wpFullScreenInit');
 
         s.orig_y = $(window).scrollTop();
@@ -350 +351 @@
 
             tinymce.onAddEditor.add(interim_init);
-            tinyMCE.init(tinyMCEPreInit.mceInit[s.editor_id]);
+            tinymce.init(tinyMCEPreInit.mceInit[s.editor_id]);
 
             s.is_mce_on = true;
@@ -374 +375 @@
 
         if ( s.has_tinymce && s.mode === 'tinymce' )
-            tinyMCE.execCommand('wpFullScreenSave');
+            tinymce.execCommand('wpFullScreenSave');
 
         if ( s.title_id )
@@ -394 +395 @@
 
         if ( s.has_tinymce && s.is_mce_on )
-            tinyMCE.execCommand('wpFullScreenClose');
+            tinymce.execCommand('wpFullScreenClose');
 
         s.textarea_obj.value = '';
@@ -407 +408 @@
             return;
 
-        ed = tinyMCE.get('wp_mce_fullscreen');
+        ed = tinymce.get('wp_mce_fullscreen');
 
         if ( from === 'html' && to === 'tinymce' ) {
 
-            if ( tinyMCE.get(s.editor_id).getParam('wpautop') && typeof(switchEditors) != 'undefined' )
+            if ( tinymce.get(s.editor_id).getParam('wpautop') && typeof(switchEditors) != 'undefined' )
                 s.textarea_obj.value = switchEditors.wpautop( s.textarea_obj.value );
 
             if ( 'undefined' == typeof(ed) )
-                tinyMCE.execCommand('wpFullScreenInit');
+                tinymce.execCommand('wpFullScreenInit');
             else
                 ed.show();
@@ -437 +438 @@
     api.b = function() {
         if ( s.has_tinymce && 'tinymce' === s.mode )
-            tinyMCE.execCommand('Bold');
-    }
+            tinymce.execCommand('Bold');
+    };
 
     api.i = function() {
         if ( s.has_tinymce && 'tinymce' === s.mode )
-            tinyMCE.execCommand('Italic');
-    }
+            tinymce.execCommand('Italic');
+    };
 
     api.ul = function() {
         if ( s.has_tinymce && 'tinymce' === s.mode )
-            tinyMCE.execCommand('InsertUnorderedList');
-    }
+            tinymce.execCommand('InsertUnorderedList');
+    };
 
     api.ol = function() {
         if ( s.has_tinymce && 'tinymce' === s.mode )
-            tinyMCE.execCommand('InsertOrderedList');
-    }
+            tinymce.execCommand('InsertOrderedList');
+    };
 
     api.link = function() {
         if ( s.has_tinymce && 'tinymce' === s.mode )
-            tinyMCE.execCommand('WP_Link');
+            tinymce.execCommand('WP_Link');
         else
             wpLink.open();
-    }
+    };
 
     api.unlink = function() {
         if ( s.has_tinymce && 'tinymce' === s.mode )
-            tinyMCE.execCommand('unlink');
-    }
+            tinymce.execCommand('unlink');
+    };
 
     api.atd = function() {
         if ( s.has_tinymce && 'tinymce' === s.mode )
-            tinyMCE.execCommand('mceWritingImprovementTool');
-    }
+            tinymce.execCommand('mceWritingImprovementTool');
+    };
 
     api.help = function() {
         if ( s.has_tinymce && 'tinymce' === s.mode )
-            tinyMCE.execCommand('WP_Help');
-    }
+            tinymce.execCommand('WP_Help');
+    };
 
     api.blockquote = function() {
         if ( s.has_tinymce && 'tinymce' === s.mode )
-            tinyMCE.execCommand('mceBlockQuote');
-    }
+            tinymce.execCommand('mceBlockQuote');
+    };
 
     api.medialib = function() {
         if ( typeof wp !== 'undefined' && wp.media && wp.media.editor )
             wp.media.editor.open(s.editor_id);
-    }
+    };
 
     api.refresh_buttons = function( fade ) {
@@ -510 +511 @@
                 $('#wp-fullscreen-button-bar').removeClass('wp-html-mode');
         }
-    }
+    };
 
     /**
@@ -592 +593 @@
             }
 
-            topbar.mouseenter(function(e){
+            topbar.mouseenter(function(){
                 s.toolbars.addClass('fullscreen-make-sticky');
                 $( document ).unbind( '.fullscreen' );
                 clearTimeout( s.timer );
                 s.timer = 0;
-            }).mouseleave(function(e){
+            }).mouseleave(function(){
                 s.toolbars.removeClass('fullscreen-make-sticky');
 
@@ -620 +621 @@
                     if ( after )
                         ps.publish( after );
-                })
+                });
             });
         }
@@ -713 +714 @@
             setTimeout( api.resize_textarea, 200 );
         });
-    }
+    };
 
     api.oldheight = 0;