Changeset 27085

Timestamp:

02/03/2014 09:30:25 PM (9 years ago)

Author:

azaozz

Message:

Minor cleanup (jshint) of wp-fullscreen.js and /wordpress/plugin.js, see #24067

Location:

trunk/src

Files:

• wp-admin/js/wp-fullscreen.js (modified) (10 diffs)
• wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (2 diffs)

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

@@ -1 @@
-/* global ajaxurl, deleteUserSetting, setUserSetting, switchEditors, tinymce, tinyMCEPreInit, wp_fullscreen_settings, wpActiveEditor:true, wpLink */
+/* global deleteUserSetting, setUserSetting, switchEditors, tinymce, tinyMCEPreInit */
 /**
  * Distraction Free Writing
@@ -8 +8 @@
 ( function( $, window ) {
     var api, ps, s, toggleUI, uiTimer, PubSub,
-        oldheight = 0,
         uiScrollTop = 0,
         transitionend = 'transitionend webkitTransitionEnd',
@@ -87 +86 @@
     function _hideUI() {
         $body.removeClass('wp-dfw-show-ui');
-        uiShown = false;
     }
 
@@ -137 +135 @@
      */
     api.on = function() {
-        var id, $dfwWrap, editor, titleId;
+        var id, $dfwWrap, titleId;
 
         if ( s.visible ) {
@@ -265 +263 @@
             oldVal = $hidden.val(),
             $spinner = $('#wp-fullscreen-save .spinner'),
-            $saveMessage = $('#wp-fullscreen-save .wp-fullscreen-saved-message')
+            $saveMessage = $('#wp-fullscreen-save .wp-fullscreen-saved-message'),
             $errorMessage = $('#wp-fullscreen-save .wp-fullscreen-error-message');
 
@@ -406 +404 @@
         }
 
-        s.$dfwWrap.removeClass( 'wp-fullscreen-wrap' )
+        s.$dfwWrap.removeClass( 'wp-fullscreen-wrap' );
         s.$editorContainer.css( 'width', '' );
         s.$dfwTextarea.add( '#' + s.id + '_ifr' ).height( s.origHeight );
@@ -456 +454 @@
     api.ui = {
         init: function() {
-            var toolbar, last = 0;
+            var toolbar;
 
             s.toolbar = toolbar = $('#fullscreen-topbar');
@@ -466 +464 @@
 
             $document.keyup( function(e) {
-                var c = e.keyCode || e.charCode, a, data;
+                var c = e.keyCode || e.charCode, modKey;
 
                 if ( ! s.visible ) {
@@ -473 +471 @@
 
                 if ( navigator.platform && navigator.platform.indexOf('Mac') !== -1 ) {
-                    a = e.ctrlKey; // Ctrl key for Mac
+                    modKey = e.ctrlKey; // Ctrl key for Mac
                 } else {
-                    a = e.altKey; // Alt key for Win & Linux
-                }
-
-                if ( a && (61 == c || 107 == c || 187 == c) ) { // +
+                    modKey = e.altKey; // Alt key for Win & Linux
+                }
+
+                if ( modKey && ( 61 === c || 107 === c || 187 === c ) ) { // +
                     api.dfwWidth( 25 );
                     e.preventDefault();
                 }
 
-                if ( a && (45 == c || 109 == c || 189 == c) ) { // -
+                if ( modKey && ( 45 === c || 109 === c || 189 === c ) ) { // -
                     api.dfwWidth( -25 );
                     e.preventDefault();
                 }
 
-                if ( a && 48 == c ) { // 0
+                if ( modKey && 48 === c ) { // 0
                     api.dfwWidth( 0 );
                     e.preventDefault();
@@ -665 +663 @@
      */
     api.bind_resize = function() {
-        s.$dfwTextarea.on( 'keydown.wp-dfw-resize click.wp-dfw-resize paste.wp-dfw-resize', function(e) {
-            api.resizeTextarea(e);
+        s.$dfwTextarea.on( 'keydown.wp-dfw-resize click.wp-dfw-resize paste.wp-dfw-resize', function() {
+            api.resizeTextarea();
         });
     };
 
-    api.resizeTextarea = function( event ) {
+    api.resizeTextarea = function() {
         var node = s.$dfwTextarea[0];
 

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -1 @@
-/* global tinymce, autosave, getUserSetting, setUserSetting, switchEditors */
+/* global tinymce, getUserSetting, setUserSetting, switchEditors */
 tinymce.PluginManager.add( 'wordpress', function( editor ) {
     var DOM = tinymce.DOM, wpAdvButton, modKey, style,
@@ -128 +128 @@
 
     // Make sure the "more" tag is in a separate paragraph
-    editor.on( 'PreProcess', function( event ) { 
-        var more; 
-
-        if ( event.save ) { 
-            more = editor.dom.select( 'img.wp-more-tag', event.node ); 
-
-            if ( more.length ) { 
-                tinymce.each( more, function( node ) { 
-                    var parent = node.parentNode, p; 
-
-                    if ( parent.nodeName === 'P' && parent.childNodes.length > 1 ) { 
-                        p = editor.dom.create('p'); 
-                        parent.parentNode.insertBefore( p, parent ); 
-                        p.appendChild( node ); 
-                    } 
-                }); 
-            } 
-        } 
-    }); 
+    editor.on( 'PreProcess', function( event ) {
+        var more;
+
+        if ( event.save ) {
+            more = editor.dom.select( 'img.wp-more-tag', event.node );
+
+            if ( more.length ) {
+                tinymce.each( more, function( node ) {
+                    var parent = node.parentNode, p;
+
+                    if ( parent.nodeName === 'P' && parent.childNodes.length > 1 ) {
+                        p = editor.dom.create('p');
+                        parent.parentNode.insertBefore( p, parent );
+                        p.appendChild( node );
+                    }
+                });
+            }
+        }
+    });
 
     // Register commands