author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:08:23 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:08:23 (UTC) |
commit | 928f3f3ed3981f7f81b69ed94f2a315205db39fa (patch) (side-by-side diff) | |
tree | 8a47229b56e4c906de8512baf0c5ca100bc03dfb /frontend/gamma/js/MochiKit/Iter.js | |
parent | bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7 (diff) | |
download | clipperz-928f3f3ed3981f7f81b69ed94f2a315205db39fa.zip clipperz-928f3f3ed3981f7f81b69ed94f2a315205db39fa.tar.gz clipperz-928f3f3ed3981f7f81b69ed94f2a315205db39fa.tar.bz2 |
Fixed frontend properties and updated MochiKit version
Diffstat (limited to 'frontend/gamma/js/MochiKit/Iter.js') (more/less context) (ignore whitespace changes)
-rw-r--r-- | frontend/gamma/js/MochiKit/Iter.js | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/frontend/gamma/js/MochiKit/Iter.js b/frontend/gamma/js/MochiKit/Iter.js index 524b2bc..77623bc 100644 --- a/frontend/gamma/js/MochiKit/Iter.js +++ b/frontend/gamma/js/MochiKit/Iter.js @@ -5,13 +5,13 @@ MochiKit.Iter 1.5 See <http://mochikit.com/> for documentation, downloads, license, etc. (c) 2005 Bob Ippolito. All rights Reserved. ***/ -MochiKit.Base._module('Iter', '1.5', ['Base']); +MochiKit.Base.module(MochiKit, 'Iter', '1.5', ['Base']); MochiKit.Base.update(MochiKit.Iter, { /** @id MochiKit.Iter.registerIteratorFactory */ registerIteratorFactory: function (name, check, iterfactory, /* optional */ override) { MochiKit.Iter.iteratorRegistry.register(name, check, iterfactory, override); }, @@ -219,20 +219,21 @@ MochiKit.Base.update(MochiKit.Iter, { return { repr: function () { return "islice(" + ["...", start, stop, step].join(", ") + ")"; }, toString: m.forwardCall("repr"), next: function () { + if (start >= stop) { + throw self.StopIteration; + } + var rval; while (i < start) { rval = seq.next(); i++; } - if (start >= stop) { - throw self.StopIteration; - } start += step; return rval; } }; }, @@ -277,21 +278,18 @@ MochiKit.Base.update(MochiKit.Iter, { return { repr: function () { return "chain(...)"; }, toString: m.forwardCall("repr"), next: function () { while (argiter.length > 1) { try { - var result = argiter[0].next(); - return result; + return argiter[0].next(); } catch (e) { if (e != self.StopIteration) { throw e; } argiter.shift(); - var result = argiter[0].next(); - return result; } } if (argiter.length == 1) { // optimize last element var arg = argiter.shift(); this.next = m.bind("next", arg); @@ -410,13 +408,13 @@ MochiKit.Base.update(MochiKit.Iter, { } return rval; } var self = MochiKit.Iter; iterable = self.iter(iterable); - var rval = []; + rval = []; var a_val; try { while (true) { a_val = iterable.next(); rval.push(a_val); } |