X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-utils.js;h=b73475d0542d4d7d99ca0720467ed959f1d599a5;hb=6f8f19efb497197dc136647de353368581131634;hp=9d599f38b32dcc34f26bc43c5215b2387ab193d3;hpb=648855397d1696b840865ad97b9b895558b4e0dc;p=dygraphs.git

diff --git a/dygraph-utils.js b/dygraph-utils.js
index 9d599f3..b73475d 100644
--- a/dygraph-utils.js
+++ b/dygraph-utils.js
@@ -51,20 +51,24 @@ Dygraph.DOT_DASH_LINE = [7, 2, 2, 2];
 Dygraph.log = function(severity, message) {
   var st;
   if (typeof(printStackTrace) != 'undefined') {
-    // Remove uninteresting bits: logging functions and paths.
-    st = printStackTrace({guess:false});
-    while (st[0].indexOf("stacktrace") != -1) {
-      st.splice(0, 1);
-    }
+    try {
+      // Remove uninteresting bits: logging functions and paths.
+      st = printStackTrace({guess:false});
+      while (st[0].indexOf("stacktrace") != -1) {
+        st.splice(0, 1);
+      }
 
-    st.splice(0, 2);
-    for (var i = 0; i < st.length; i++) {
-      st[i] = st[i].replace(/\([^)]*\/(.*)\)/, '@$1')
-          .replace(/\@.*\/([^\/]*)/, '@$1')
-          .replace('[object Object].', '');
+      st.splice(0, 2);
+      for (var i = 0; i < st.length; i++) {
+        st[i] = st[i].replace(/\([^)]*\/(.*)\)/, '@$1')
+            .replace(/\@.*\/([^\/]*)/, '@$1')
+            .replace('[object Object].', '');
+      }
+      var top_msg = st.splice(0, 1)[0];
+      message += ' (' + top_msg.replace(/^.*@ ?/, '') + ')';
+    } catch(e) {
+      // Oh well, it was worth a shot!
     }
-    var top_msg = st.splice(0, 1)[0];
-    message += ' (' + top_msg.replace(/^.*@ ?/, '') + ')';
   }
 
   if (typeof(console) != 'undefined') {
@@ -681,64 +685,60 @@ Dygraph.isAndroid = function() {
   return (/Android/).test(navigator.userAgent);
 };
 
+Dygraph.Iterator = function(array, start, length, predicate) {
+  start = start || 0;
+  length = length || array.length;
+  this.hasNext = true; // Use to identify if there's another element.
+  this.peek = null; // Use for look-ahead
+  this.start_ = start;
+  this.array_ = array;
+  this.predicate_ = predicate;
+  this.end_ = Math.min(array.length, start + length);
+  this.nextIdx_ = start - 1; // use -1 so initial advance works.
+  this.next(); // ignoring result.
+}
+
+Dygraph.Iterator.prototype.next = function() {
+  if (!this.hasNext) {
+    return null;
+  }
+  var obj = this.peek;
+
+  var nextIdx = this.nextIdx_ + 1;
+  var found = false;
+  while (nextIdx < this.end_) {
+    if (!this.predicate_ || this.predicate_(this.array_, nextIdx)) {
+      this.peek = this.array_[nextIdx];
+      found = true;
+      break;
+    }
+    nextIdx++;
+  }
+  this.nextIdx_ = nextIdx;
+  if (!found) {
+    this.hasNext = false;
+    this.peek = null;
+  }
+  return obj;
+}
+
 /**
  * @private
  * Returns a new iterator over array, between indexes start and 
  * start + length, and only returns entries that pass the accept function
  *
  * @param array the array to iterate over.
- * @param start the first index to iterate over
+ * @param start the first index to iterate over, 0 if absent.
  * @param length the number of elements in the array to iterate over.
  * This, along with start, defines a slice of the array, and so length
  * doesn't imply the number of elements in the iterator when accept
- * doesn't always accept all values.
+ * doesn't always accept all values. array.length when absent.
  * @param predicate a function that takes parameters array and idx, which
  * returns true when the element should be returned. If omitted, all
  * elements are accepted.
  */
 Dygraph.createIterator = function(array, start, length, predicate) {
-  start = start || 0;
-  length = length || array.length;
-  var iter = new function() {
-    this.end_ = Math.min(array.length, start + length);
-    this.nextIdx_ = start - 1; // use -1 so initial call to advance works.
-    this.hasNext_ = true;
-    this.peek_ = null;
-    var self = this;
-
-    this.hasNext = function() {
-      return self.hasNext_;
-    }
-
-    this.next = function() {
-      if (self.hasNext_) {
-        var obj = self.peek_;
-        self.advance_();
-        return obj;
-      }
-      return null;
-    }
-    this.peek = function() {
-      return self.peek_;
-    }
-    this.advance_ = function() {
-      var nextIdx = self.nextIdx_;
-      nextIdx++;
-      while(nextIdx < self.end_) {
-        if (!predicate || predicate(array, nextIdx)) {
-          self.peek_ = array[nextIdx];
-          self.nextIdx_ = nextIdx;
-          return;
-        }
-        nextIdx++;
-      }
-      self.nextIdx_ = nextIdx;
-      self.hasNext_ = false;
-      self.peek_ = null;
-    }
-  };
-  iter.advance_();
-  return iter;
+  return new Dygraph.Iterator(array, start, length, predicate);
 };
 
 /**