From 928f3f3ed3981f7f81b69ed94f2a315205db39fa Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Sat, 17 Mar 2012 21:08:23 +0000 Subject: Fixed frontend properties and updated MochiKit version --- (limited to 'frontend/gamma/js/MochiKit/Iter.js') 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 @@ -8,7 +8,7 @@ See for documentation, downloads, license, etc. ***/ -MochiKit.Base._module('Iter', '1.5', ['Base']); +MochiKit.Base.module(MochiKit, 'Iter', '1.5', ['Base']); MochiKit.Base.update(MochiKit.Iter, { /** @id MochiKit.Iter.registerIteratorFactory */ @@ -222,14 +222,15 @@ MochiKit.Base.update(MochiKit.Iter, { }, 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; } @@ -280,15 +281,12 @@ MochiKit.Base.update(MochiKit.Iter, { 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) { @@ -413,7 +411,7 @@ MochiKit.Base.update(MochiKit.Iter, { var self = MochiKit.Iter; iterable = self.iter(iterable); - var rval = []; + rval = []; var a_val; try { while (true) { -- cgit v0.9.0.2