Changeset 26626

Timestamp:

12/04/2013 07:23:39 PM (13 years ago)

Author:

nacin

Message:

Heartbeat: Don't use a variable of the same name as the function it is in.

fixes #25073.

File:

• trunk/src/wp-includes/js/heartbeat.js (modified) (4 diffs)

trunk/src/wp-includes/js/heartbeat.js

@@ -607 +607 @@
                  */
                 function interval( speed, ticks ) {
-                        var interval, oldInerval = settings.tempInterval ? settings.tempInterval : settings.mainInterval;
+                        var newInterval,
+                                oldInterval = settings.tempInterval ? settings.tempInterval : settings.mainInterval;
 
                         if ( speed ) {
@@ -613 +614 @@
                                         case 'fast':
                                         case 5:
-                                                interval = 5000;
+                                                newInterval = 5000;
                                                 break;
                                         case 15:
-                                                interval = 15000;
+                                                newInterval = 15000;
                                                 break;
                                         case 30:
-                                                interval = 30000;
+                                                newInterval = 30000;
                                                 break;
                                         case 60:
-                                                interval = 60000;
+                                                newInterval = 60000;
                                                 break;
                                         case 'long-polling':
@@ -629 +630 @@
                                                 return 0;
                                         default:
-                                                interval = settings.originalInterval;
-                                }
-
-                                if ( 5000 === interval ) {
+                                                newInterval = settings.originalInterval;
+                                }
+
+                                if ( 5000 === newInterval ) {
                                         ticks = parseInt( ticks, 10 ) || 30;
                                         ticks = ticks < 1 || ticks > 30 ? 30 : ticks;
 
                                         settings.countdown = ticks;
-                                        settings.tempInterval = interval;
+                                        settings.tempInterval = newInterval;
                                 } else {
                                         settings.countdown = 0;
                                         settings.tempInterval = 0;
-                                        settings.mainInterval = interval;
+                                        settings.mainInterval = newInterval;
                                 }
 
@@ -647 +648 @@
                                 // Will connect immediately if the time since the last connection
                                 // is greater than the new interval.
-                                if ( interval !== oldInerval ) {
+                                if ( newInterval !== oldInterval ) {
                                         scheduleNextTick();
                                 }