Changeset 29893

Timestamp:

10/14/2014 07:47:11 PM (10 years ago)

Author:

nacin

Message:

Twenty Fifteen: JSHint fixes.

• Define global variables set by wp_localize_script().
• Remove currently unused $ variable.
• Use dot notation when appropriate.
• Update Gruntfile.js to ignore the html5 shiv.

see #29799.

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/wp-content/themes/twentyfifteen/js/color-scheme-control.js (modified) (3 diffs)
• src/wp-content/themes/twentyfifteen/js/functions.js (modified) (1 diff)

trunk/Gruntfile.js

@@ -219 +219 @@
                     '!twenty{eleven,twelve,thirteen}/**',
                     // Third party scripts
-                    '!twentyfourteen/js/html5.js'
+                    '!twenty{fourteen,fifteen}/js/html5.js'
                 ]
             },

trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js

@@ +1 @@
+/* global colorScheme */
 /**
  * Theme Customizer enhancements for a better user experience.
@@ -5 +6 @@
  */
 
-( function( wp, $ ) {
+( function( wp ) {
     wp.customize.controlConstructor.colorScheme = wp.customize.Control.extend( {
         ready: function() {
@@ -17 +18 @@
                 // if Header Text is not hidden, update value
                 if ( 'blank' !== wp.customize( 'header_textcolor' ).get() ) {
-                    wp.customize( 'header_textcolor' ).set( colorScheme[value]['colors'][4] );
-                    headerTextColor.val( colorScheme[value]['colors'][4] )
-                        .data( 'data-default-color', colorScheme[value]['colors'][4] )
-                        .wpColorPicker( 'color', colorScheme[value]['colors'][4] )
-                        .wpColorPicker( 'defaultColor', colorScheme[value]['colors'][4] );
+                    wp.customize( 'header_textcolor' ).set( colorScheme[value].colors[4] );
+                    headerTextColor.val( colorScheme[value].colors[4] )
+                        .data( 'data-default-color', colorScheme[value].colors[4] )
+                        .wpColorPicker( 'color', colorScheme[value].colors[4] )
+                        .wpColorPicker( 'defaultColor', colorScheme[value].colors[4] );
                 }
 
                 // update Background Color
-                wp.customize( 'background_color' ).set( colorScheme[value]['colors'][0] );
-                backgroundColor.val( colorScheme[value]['colors'][0] )
-                    .data( 'data-default-color', colorScheme[value]['colors'][0] )
-                    .wpColorPicker( 'color', colorScheme[value]['colors'][0] )
-                    .wpColorPicker( 'defaultColor', colorScheme[value]['colors'][0] );
+                wp.customize( 'background_color' ).set( colorScheme[value].colors[0] );
+                backgroundColor.val( colorScheme[value].colors[0] )
+                    .data( 'data-default-color', colorScheme[value].colors[0] )
+                    .wpColorPicker( 'color', colorScheme[value].colors[0] )
+                    .wpColorPicker( 'defaultColor', colorScheme[value].colors[0] );
 
                 // update Header/Sidebar Background Color
-                wp.customize( 'header_background_color' ).set( colorScheme[value]['colors'][1] );
-                sidebarColor.val( colorScheme[value]['colors'][1] )
-                    .data( 'data-default-color', colorScheme[value]['colors'][1] )
-                    .wpColorPicker( 'color', colorScheme[value]['colors'][1] )
-                    .wpColorPicker( 'defaultColor', colorScheme[value]['colors'][1] );
+                wp.customize( 'header_background_color' ).set( colorScheme[value].colors[1] );
+                sidebarColor.val( colorScheme[value].colors[1] )
+                    .data( 'data-default-color', colorScheme[value].colors[1] )
+                    .wpColorPicker( 'color', colorScheme[value].colors[1] )
+                    .wpColorPicker( 'defaultColor', colorScheme[value].colors[1] );
 
                 // update Sidebar Text Color
-                wp.customize( 'sidebar_textcolor' ).set( colorScheme[value]['colors'][4] );
-                sidebarTextColor.val( colorScheme[value]['colors'][4] )
-                    .data( 'data-default-color', colorScheme[value]['colors'][4] )
-                    .wpColorPicker( 'color', colorScheme[value]['colors'][4] )
-                    .wpColorPicker( 'defaultColor', colorScheme[value]['colors'][4] );
+                wp.customize( 'sidebar_textcolor' ).set( colorScheme[value].colors[4] );
+                sidebarTextColor.val( colorScheme[value].colors[4] )
+                    .data( 'data-default-color', colorScheme[value].colors[4] )
+                    .wpColorPicker( 'color', colorScheme[value].colors[4] )
+                    .wpColorPicker( 'defaultColor', colorScheme[value].colors[4] );
             } );
         }
     } );
-} )( this.wp, jQuery );
+} )( this.wp );

trunk/src/wp-content/themes/twentyfifteen/js/functions.js

@@ +1 @@
+/* global screenReaderText */
 /**
  * Theme functions file