gitweb.js: No need for inProgress in blame_incremental.js

JavaScript is single-threaded, so there is no need for protection
against re-entrancy via inProgress variable.

In particular calls to setInterval handler are stacked if handler
doesn't finish before new interrupt (before new interval).  The same
happens with events - they are (hopefully) stacked if even handler
didn't finish work.

Signed-off-by: Jakub Narebski <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/static/js/blame_incremental.js b/static/js/blame_incremental.js
index 0cd8db8caba44184565b6ae61b28bf7db690f9f22c503e8decbad0b5ec990c67..22ed9bf908134ddabe12fee5c518370d48d1b6c3310ee0e521729bfd7d988b69 100644 (file)
--- a/static/js/blame_incremental.js
+++ b/static/js/blame_incremental.js
@@ -420,8 +420,6 @@ function handleLine(commit, group) {
 
 // ----------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------
 

-var inProgress = false;   // are we processing response
-

 /**#@+
  * @constant
  */
 /**#@+
  * @constant
  */


@@ -536,7 +534,7 @@ function processData(unprocessed, nextReadPos) {
  *
  * @param {XMLHttpRequest} xhr: XMLHttpRequest object
  *
  *
  * @param {XMLHttpRequest} xhr: XMLHttpRequest object
  *

- * @globals pollTimer, commits, inProgress
+ * @globals pollTimer, commits

  */
 function handleError(xhr) {
        errorInfo('Server error: ' +
  */
 function handleError(xhr) {
        errorInfo('Server error: ' +


@@ -544,8 +542,6 @@ function handleError(xhr) {
 
        clearInterval(pollTimer);
        commits = {}; // free memory
 
        clearInterval(pollTimer);
        commits = {}; // free memory

-
-       inProgress = false;

 }
 
 /**
 }
 
 /**


@@ -553,7 +549,7 @@ function handleError(xhr) {
  *
  * @param {XMLHttpRequest} xhr: XMLHttpRequest object (unused)
  *
  *
  * @param {XMLHttpRequest} xhr: XMLHttpRequest object (unused)
  *

- * @globals pollTimer, commits, inProgress
+ * @globals pollTimer, commits

  */
 function responseLoaded(xhr) {
        clearInterval(pollTimer);
  */
 function responseLoaded(xhr) {
        clearInterval(pollTimer);


@@ -561,15 +557,13 @@ function responseLoaded(xhr) {
        fixColorsAndGroups();
        writeTimeInterval();
        commits = {}; // free memory
        fixColorsAndGroups();
        writeTimeInterval();
        commits = {}; // free memory

-
-       inProgress = false;

 }
 
 /**
  * handler for XMLHttpRequest onreadystatechange event
  * @see startBlame
  *
 }
 
 /**
  * handler for XMLHttpRequest onreadystatechange event
  * @see startBlame
  *

- * @globals xhr, inProgress
+ * @globals xhr

  */
 function handleResponse() {
 
  */
 function handleResponse() {
 


@@ -609,13 +603,6 @@ function handleResponse() {
                return;
        }
 
                return;
        }
 

-       // in case we were called before finished processing
-       if (inProgress) {
-               return;
-       } else {
-               inProgress = true;
-       }
-

        // extract new whole (complete) lines, and process them
        while (xhr.prevDataLength !== xhr.responseText.length) {
                if (xhr.readyState === 4 &&
        // extract new whole (complete) lines, and process them
        while (xhr.prevDataLength !== xhr.responseText.length) {
                if (xhr.readyState === 4 &&


@@ -633,8 +620,6 @@ function handleResponse() {
            xhr.prevDataLength === xhr.responseText.length) {
                responseLoaded(xhr);
        }
            xhr.prevDataLength === xhr.responseText.length) {
                responseLoaded(xhr);
        }

-
-       inProgress = false;

 }
 
 // ============================================================
 }
 
 // ============================================================