Changeset 26214

Timestamp:

11/15/2013 03:04:04 PM (12 years ago)

Author:

nacin

Message:

Fix JSHint errors in remaining WP TinyMCE plugin files.

fixes #26048.

Location:

trunk/src/wp-includes/js/tinymce/plugins

Files:

• wordpress/editor_plugin_src.js (modified) (6 diffs)
• wpdialogs/editor_plugin_src.js (modified) (1 diff)
• wpeditimage/editor_plugin_src.js (modified) (7 diffs)
• wpfullscreen/editor_plugin_src.js (modified) (8 diffs)
• wpgallery/editor_plugin_src.js (modified) (4 diffs)

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

@@ +1 @@
+/* global tinymce, getUserSetting, setUserSetting, switchEditors, autosave */
 /**
  * WordPress plugin.
@@ -143 +144 @@
             });
 
-            ed.onExecCommand.add( function( ed, cmd, ui, val ) {
+            ed.onExecCommand.add( function( ed, cmd ) {
                 if ( tinymce.isWebKit && style && ( 'InsertUnorderedList' == cmd || 'InsertOrderedList' == cmd ) )
                     ed.dom.remove( style );
@@ -222 +223 @@
                     last = k;
                 });
-            };
+            }
 
             // keep empty paragraphs :(
@@ -292 +293 @@
             // popup buttons for images and the gallery
             ed.onInit.add(function(ed) {
-                tinymce.dom.Event.add(ed.getWin(), 'scroll', function(e) {
+                tinymce.dom.Event.add(ed.getWin(), 'scroll', function() {
                     ed.plugins.wordpress._hideButtons();
                 });
-                tinymce.dom.Event.add(ed.getBody(), 'dragstart', function(e) {
+                tinymce.dom.Event.add(ed.getBody(), 'dragstart', function() {
                     ed.plugins.wordpress._hideButtons();
                 });
             });
 
-            ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) {
+            ed.onBeforeExecCommand.add( function( ed ) {
                 ed.plugins.wordpress._hideButtons();
             });
 
-            ed.onSaveContent.add(function(ed, o) {
+            ed.onSaveContent.add( function( ed ) {
                 ed.plugins.wordpress._hideButtons();
             });
@@ -326 +327 @@
                     }
                 }
-            }
+            };
 
             // close popups when clicking on the background
@@ -362 +363 @@
 
         _showButtons : function(n, id) {
-            var ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y;
+            var ed = tinymce.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y;
 
             vp = ed.dom.getViewPort(ed.getWin());

trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin_src.js

@@ -1 @@
-/**
- * editor_plugin_src.js
- *
- * Copyright 2009, Moxiecode Systems AB
- * Released under LGPL
- *
- * License: http://tinymce.moxiecode.com/license
- * Contributing: http://tinymce.moxiecode.com/contributing
- */
-
+/* global tinymce */
 (function() {
     tinymce.create('tinymce.plugins.WPDialogs', {
-        init : function(ed, url) {
+        init : function( ed ) {
             tinymce.create('tinymce.WPWindowManager:tinymce.InlineWindowManager', {
                 WPWindowManager : function(ed) {

trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js

@@ -1 @@
-
+/* global tinymce */
 (function() {
+    var mouse = {};
+
     tinymce.create('tinymce.plugins.wpEditImage', {
         url: '',
@@ -6 +8 @@
 
         init: function(ed, url) {
-            var t = this, mouse = {};
+            var t = this;
 
             t.url = url;
@@ -28 +30 @@
                 // when pressing Return inside a caption move the caret to a new parapraph under it
                 ed.dom.events.add(ed.getBody(), 'keydown', function(e) {
-                    var n, DL, DIV, P, content;
+                    var n, DL, DIV, P;
 
                     if ( e.keyCode == 13 ) {
@@ -106 +108 @@
             // When inserting content, if the caret is inside a caption create new paragraph under
             // and move the caret there
-            ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) {
+            ed.onBeforeExecCommand.add( function( ed, cmd ) {
                 var node, p;
 
@@ -228 +230 @@
             });
 
-            tinymce.dom.Event.add(editButton, 'mousedown', function(e) {
+            tinymce.dom.Event.add(editButton, 'mousedown', function() {
                 t._editImage();
                 ed.plugins.wordpress._hideButtons();
@@ -241 +243 @@
             });
 
-            tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
+            tinymce.dom.Event.add(dellButton, 'mousedown', function() {
                 var ed = tinymce.activeEditor, el = ed.selection.getNode(), parent;
 
@@ -318 +320 @@
                 authorurl : 'http://wordpress.org',
                 infourl : '',
-                version : "1.0"
+                version : '1.0'
             };
         }

trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js

@@ +1 @@
+/* global tinymce:false, switchEditors, fullscreen */
 /**
  * WP Fullscreen TinyMCE plugin
@@ -9 +10 @@
         resize_timeout: false,
 
-        init : function(ed, url) {
-            var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM;
+        init : function( ed ) {
+            var t = this, s = {}, DOM = tinymce.DOM;
 
             // Register commands
             ed.addCommand('wpFullScreenClose', function() {
-                // this removes the editor, content has to be saved first with tinyMCE.execCommand('wpFullScreenSave');
+                // this removes the editor, content has to be saved first with tinymce.execCommand('wpFullScreenSave');
                 if ( ed.getParam('wp_fullscreen_is_enabled') ) {
                     DOM.win.setTimeout(function() {
-                        tinyMCE.remove(ed);
+                        tinymce.remove(ed);
                         DOM.remove('wp_mce_fullscreen_parent');
-                        tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings
+                        tinymce.settings = tinymce.oldSettings; // Restore old settings
                     }, 10);
                 }
@@ -25 +26 @@
 
             ed.addCommand('wpFullScreenSave', function() {
-                var ed = tinyMCE.get('wp_mce_fullscreen'), edd;
+                var ed = tinymce.get('wp_mce_fullscreen'), edd;
 
                 ed.focus();
-                edd = tinyMCE.get( ed.getParam('wp_fullscreen_editor_id') );
+                edd = tinymce.get( ed.getParam('wp_fullscreen_editor_id') );
 
                 edd.setContent( ed.getContent({format : 'raw'}), {format : 'raw'} );
@@ -36 +37 @@
                 var d, b, fsed;
 
-                ed = tinyMCE.activeEditor;
+                ed = tinymce.activeEditor;
                 d = ed.getDoc();
                 b = d.body;
 
-                tinyMCE.oldSettings = tinyMCE.settings; // Store old settings
+                tinymce.oldSettings = tinymce.settings; // Store old settings
 
                 tinymce.each(ed.settings, function(v, n) {
@@ -68 +69 @@
 
                     setTimeout(function(){ // add last
-                        edd.onNodeChange.add(function(ed, cm, e){
+                        edd.onNodeChange.add( function() {
                             tinymce.each(buttons, function(c) {
                                 var btn, cls;
@@ -146 +147 @@
                     }, 40);
                 }
-            };
+            }
 
             // Add appropriate listeners for resizing content area
-            ed.onInit.add(function(ed, l) {
+            ed.onInit.add( function( ed ) {
                 ed.onChange.add(resize);
                 ed.onSetContent.add(resize);
@@ -156 +157 @@
                 ed.onPostRender.add(resize);
 
-                ed.getBody().style.overflowY = "hidden";
+                ed.getBody().style.overflowY = 'hidden';
             });
 
             if ( ed.getParam('autoresize_on_init', true) ) {
-                ed.onLoadContent.add(function(ed, l) {
+                ed.onLoadContent.add( function() {
                     // Because the content area resizes when its content CSS loads,
                     // and we can't easily add a listener to its onload event,
@@ -170 +171 @@
             }
 
-            // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+            // Register the command so that it can be invoked by using tinymce.activeEditor.execCommand('mceExample');
             ed.addCommand('wpAutoResize', resize);
         },

trunk/src/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js

@@ -1 @@
-
+/* global tinymce */
 (function() {
     tinymce.create('tinymce.plugins.wpGallery', {
@@ -79 +79 @@
                 n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
                 return n ? tinymce.DOM.decode(n[1]) : '';
-            };
+            }
 
             return co.replace(/(?:<p[^>]*>)*(<img[^>]+>)(?:<\/p>)*/g, function(a,im) {
@@ -113 +113 @@
             });
 
-            tinymce.dom.Event.add(editButton, 'mousedown', function(e) {
+            tinymce.dom.Event.add( editButton, 'mousedown', function() {
                 var ed = tinymce.activeEditor;
                 ed.wpGalleryBookmark = ed.selection.getBookmark('simple');
-                ed.execCommand("WP_Gallery");
+                ed.execCommand('WP_Gallery');
                 ed.plugins.wordpress._hideButtons();
             });
@@ -148 +148 @@
                 authorurl : 'http://wordpress.org',
                 infourl : '',
-                version : "1.0"
+                version : '1.0'
             };
         }