Issue #1684906 by nod_: Drupal.progressBar is a constructor, rename it Drupal.ProgressBar.

core/misc/ajax.js

@@ -353,7 +353,7 @@ Drupal.ajax.prototype.beforeSend = function (xmlhttprequest, options) {
 
   // Insert progressbar or throbber.
   if (this.progress.type === 'bar') {
-    var progressBar = new Drupal.progressBar('ajax-progress-' + this.element.id, $.noop, this.progress.method, $.noop);
+    var progressBar = new Drupal.ProgressBar('ajax-progress-' + this.element.id, $.noop, this.progress.method, $.noop);
     if (this.progress.message) {
       progressBar.setProgress(-1, this.progress.message);
     }

core/misc/batch.js

@@ -23,7 +23,7 @@ Drupal.behaviors.batch = {
         $('#wait').hide();
       };
 
-      var progress = new Drupal.progressBar('updateprogress', updateCallback, 'POST', errorCallback);
+      var progress = new Drupal.ProgressBar('updateprogress', updateCallback, 'POST', errorCallback);
       progress.setProgress(-1, settings.batch.initMessage);
       holder.append(progress.element);
       progress.startMonitoring(settings.batch.uri + '&op=do', 10);

core/misc/progress.js

@@ -9,10 +9,10 @@
  * method is the function which will perform the HTTP request to get the
  * progress bar state. Either "GET" or "POST".
  *
- * e.g. pb = new progressBar('myProgressBar');
+ * e.g. pb = new Drupal.ProgressBar('myProgressBar');
  *      some_element.appendChild(pb.element);
  */
-Drupal.progressBar = function (id, updateCallback, method, errorCallback) {
+Drupal.ProgressBar = function (id, updateCallback, method, errorCallback) {
   var pb = this;
   this.id = id;
   this.method = method || 'GET';
@@ -27,82 +27,85 @@ Drupal.progressBar = function (id, updateCallback, method, errorCallback) {
                     '<div class="message">&nbsp;</div>');
 };
 
-/**
- * Set the percentage and status message for the progressbar.
- */
-Drupal.progressBar.prototype.setProgress = function (percentage, message) {
-  if (percentage >= 0 && percentage <= 100) {
-    $(this.element).find('div.filled').css('width', percentage + '%');
-    $(this.element).find('div.percentage').html(percentage + '%');
-  }
-  $('div.message', this.element).html(message);
-  if (this.updateCallback) {
-    this.updateCallback(percentage, message, this);
-  }
-};
+$.extend(Drupal.ProgressBar.prototype, {
+  /**
+   * Set the percentage and status message for the progressbar.
+   */
+  setProgress: function (percentage, message) {
+    if (percentage >= 0 && percentage <= 100) {
+      $(this.element).find('div.filled').css('width', percentage + '%');
+      $(this.element).find('div.percentage').html(percentage + '%');
+    }
+    $('div.message', this.element).html(message);
+    if (this.updateCallback) {
+      this.updateCallback(percentage, message, this);
+    }
+  },
 
-/**
- * Start monitoring progress via Ajax.
- */
-Drupal.progressBar.prototype.startMonitoring = function (uri, delay) {
-  this.delay = delay;
-  this.uri = uri;
-  this.sendPing();
-};
-
-/**
- * Stop monitoring progress via Ajax.
- */
-Drupal.progressBar.prototype.stopMonitoring = function () {
-  clearTimeout(this.timer);
-  // This allows monitoring to be stopped from within the callback.
-  this.uri = null;
-};
+  /**
+   * Start monitoring progress via Ajax.
+   */
+  startMonitoring: function (uri, delay) {
+    this.delay = delay;
+    this.uri = uri;
+    this.sendPing();
+  },
 
-/**
- * Request progress data from server.
- */
-Drupal.progressBar.prototype.sendPing = function () {
-  if (this.timer) {
+  /**
+   * Stop monitoring progress via Ajax.
+   */
+  stopMonitoring: function () {
     clearTimeout(this.timer);
-  }
-  if (this.uri) {
-    var pb = this;
-    // When doing a post request, you need non-null data. Otherwise a
-    // HTTP 411 or HTTP 406 (with Apache mod_security) error may result.
-    $.ajax({
-      type: this.method,
-      url: this.uri,
-      data: '',
-      dataType: 'json',
-      success: function (progress) {
-        // Display errors.
-        if (progress.status === 0) {
-          pb.displayError(progress.data);
-          return;
+    // This allows monitoring to be stopped from within the callback.
+    this.uri = null;
+  },
+
+  /**
+   * Request progress data from server.
+   */
+  sendPing: function () {
+    if (this.timer) {
+      clearTimeout(this.timer);
+    }
+    if (this.uri) {
+      var pb = this;
+      // When doing a post request, you need non-null data. Otherwise a
+      // HTTP 411 or HTTP 406 (with Apache mod_security) error may result.
+      $.ajax({
+        type: this.method,
+        url: this.uri,
+        data: '',
+        dataType: 'json',
+        success: function (progress) {
+          // Display errors.
+          if (progress.status === 0) {
+            pb.displayError(progress.data);
+            return;
+          }
+          // Update display.
+          pb.setProgress(progress.percentage, progress.message);
+          // Schedule next timer.
+          pb.timer = setTimeout(function () { pb.sendPing(); }, pb.delay);
+        },
+        error: function (xmlhttp) {
+          pb.displayError(Drupal.ajaxError(xmlhttp, pb.uri));
         }
-        // Update display.
-        pb.setProgress(progress.percentage, progress.message);
-        // Schedule next timer.
-        pb.timer = setTimeout(function () { pb.sendPing(); }, pb.delay);
-      },
-      error: function (xmlhttp) {
-        pb.displayError(Drupal.ajaxError(xmlhttp, pb.uri));
-      }
-    });
-  }
-};
+      });
+    }
+  },
 
-/**
- * Display errors on the page.
- */
-Drupal.progressBar.prototype.displayError = function (string) {
-  var error = $('<div class="messages error"></div>').html(string);
-  $(this.element).before(error).hide();
+  /**
+   * Display errors on the page.
+   */
+  displayError: function (string) {
+    var error = $('<div class="messages error"></div>').html(string);
+    $(this.element).before(error).hide();
 
-  if (this.errorCallback) {
-    this.errorCallback(this);
+    if (this.errorCallback) {
+      this.errorCallback(this);
+    }
   }
-};
+});
+
 
 })(jQuery);