Fixed bugs related to #each blocks

.gitignore

@@ -1,5 +1,14 @@
 /bin/lib
-node_modules
 test-output.tmp
 *swp
-*un~
+/node_modules/stylus
+/node_modules/nib
+/node_modules/mkdirp
+/node_modules/MD5
+/node_modules/less
+/node_modules/html-util
+/node_modules/dom-shim
+/node_modules/commander
+/node_modules/chokidar
+/node_modules/up
+/node_modules/.bin

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "node_modules/racer"]
+	path = node_modules/racer
+	url = https://github.com/reneclaus/racer
+
+[submodule "node_modules/tracks"]
+	path = node_modules/tracks
+	url = https://github.com/reneclaus/tracks

lib/Dom.js

@@ -442,10 +442,17 @@ function setRemove(el, ignore, index) {
   if (!el.nodeType) {
     // Range
     index += el.startOffset;
-    el = el.startContainer;
+    var container = el.startContainer;
+    var n_remove = el.endOffset - el.startOffset ;
+    for (var i = 0 ; i < n_remove ; i++) {
+      var child = container.childNodes[index];
+      if (child) container.removeChild(child);
+    }
+  }
+  else {
+    var child = el.childNodes[index];
+    if (child) el.removeChild(child);
   }
-  var child = el.childNodes[index];
-  if (child) el.removeChild(child);
 }
 function setMove(el, ignore, from, to, howMany) {
   var child, fragment, nextChild, offset, ref, toEl;

lib/View.js

@@ -36,7 +36,7 @@ var defaultCtx = {
 
 var defaultGetFns = {
   equal: function(a, b) {
-    return a === b;
+    return a == b;
   }
 , not: function(value) {
     return !value;
@@ -64,8 +64,8 @@ var defaultGetFns = {
 };
 
 var defaultSetFns = {
-  equal: function(value, a) {
-    return value ? [a] : [];
+  equal: function(value, a, b) {
+    return value ? [void 0, a] : [void 0];
   }
 , not: function(value) {
     return [!value];
@@ -672,7 +672,7 @@ function createComponent(view, model, Component, scope, ctx, macroCtx) {
   var scoped = model.at(scope)
     , marker = '<!--' + scope + '-->'
     , prefix = scope + '.'
-    , component = new Component(scoped, scope)
+    , component = new Component(view.app, scoped, scope)
     , parentFnCtx = model.__fnCtx || ctx.$fnCtx
     , silentModel = model.silent()
     , i, key, path, value, instanceName, instances

lib/component.js

@@ -74,7 +74,8 @@ function createLibrary(config, options) {
   view._selfLibrary = library;
 
   for (id in scripts) {
-    Component = function(model, scope) {
+    Component = function(app, model, scope) {
+      view.app = app ;
       this.view = view;
       this.model = model;
       this.scope = scope;

lib/derby.Model.js

@@ -30,6 +30,8 @@ Model.prototype.at = function(node, absolute) {
         if ((blockPath.type === 'each') && last) {
           i = 0;
           while (node = node.nextSibling) {
+            if (node.nodeName == '#text')
+              continue;
             if (node === last) {
               path = path + '.' + i;
               break;

lib/derby.browser.js

@@ -7,6 +7,8 @@ var racer = require('racer')
 
 module.exports = derbyBrowser;
 
+global = window ;
+
 function derbyBrowser(derby) {
   // This assumes that only a single instance of this module can run at a time,
   // which is reasonable in the browser. This is written like this so that
@@ -61,7 +63,8 @@ function createApp(appModule) {
     if (!page._routing) {
       view._beforeRoute();
       tracks.render(page, {
-        url: page.params.previous
+        url: page.params.url,
+        previous: page.params.previous
       , method: 'exit'
       , noNavigate: true
       });

lib/derby.server.js

@@ -116,21 +116,24 @@ function createApp(appModule) {
   return app;
 }
 
-function createStatic(root) {
-  return new Static(root, this._libraries);
+function createStatic(root, init_view) {
+  return new Static(root, this._libraries, init_view);
 }
 
-function Static(root, libraries) {
+function Static(root, libraries, init_view) {
   this.root = root;
   this.libraries = libraries;
   this.views = {};
+  this.init_view = init_view ;
 }
 Static.prototype.render = function(name, res, model, ns, ctx, status) {
   var view = this.views[name];
   if (!view) {
     view = this.views[name] = new View(this.libraries);
     view._root = this.root;
     view._clientName = name;
+	if (this.init_view)
+		this.init_view (view) ;
   }
   view.render(res, model, ns, ctx, status, true);
 };

lib/viewPath.js

@@ -338,10 +338,9 @@ function setBoundFn(view, ctx, model, name, value) {
     out = set(value);
   }
   if (!out) return;
-
   for (i = 0, len = out.length; i < len; i++) {
     value = out[i];
-    arg = args[i + numInputs];
+    arg = args[i];
     if (~arg.indexOf('(')) {
       setBoundFn(view, ctx, model, arg, value);
       continue;

package.json

@@ -14,8 +14,8 @@
   "dependencies": {
     "dom-shim": ">=0.1.0",
     "html-util": ">=0.1.3",
-    "tracks": ">=0.1.10",
-    "racer": "0.3.13",
+    "tracks": "git://github.com/reneclaus/tracks",
+    "racer": "git://github.com/reneclaus/racer#master",
     "chokidar": ">=0.2.6",
     "stylus": ">=0.25.0",
     "less": ">=1.3.0",