From 0740251309888c93dfd522acddc14c19e841a186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E6=99=BA?= Date: Thu, 11 Dec 2014 20:31:11 +0800 Subject: [PATCH] fix http://jsfiddle.net/taberhuang/4sm7yxcq/1/ --- bower.json | 2 +- dist/bisheng.js | 6 +++--- package.json | 2 +- src/brix/bisheng/flush.js | 2 +- src/brix/bisheng/locator.js | 2 +- src/brix/bisheng/loop.js | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bower.json b/bower.json index ce33125..4a1243c 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "brix-bisheng", - "version": "0.1.4", + "version": "0.1.5", "authors": [ "墨智 " ], diff --git a/dist/bisheng.js b/dist/bisheng.js index 6bce929..fdeb3c9 100644 --- a/dist/bisheng.js +++ b/dist/bisheng.js @@ -496,7 +496,7 @@ define( type: TYPES.UPDATE, path: path.concat(name), value: value, - oldValue: oldValue[name] !== undefined ? oldValue[name].valueOf() : oldValue[name] + oldValue: (oldValue[name] !== undefined && oldValue[name] !== null) ? oldValue[name].valueOf() : oldValue[name] }) continue } @@ -644,7 +644,7 @@ define( } } return $(target) - }, + } } // comment 定位符 @@ -1568,7 +1568,7 @@ define( var content = Handlebars.compile(ast)(context) content = HTML.convert(content) - Scanner.scan(content[0], change.context) + Scanner.scan(content[0], change.root) content = content.contents() var target = Locator.parseTarget(locator) diff --git a/package.json b/package.json index 9724179..ff05a2b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "brix-bisheng", - "version": "0.1.4", + "version": "0.1.5", "description": "", "main": "index.js", "scripts": { diff --git a/src/brix/bisheng/flush.js b/src/brix/bisheng/flush.js index 79552dc..dbd2a8f 100644 --- a/src/brix/bisheng/flush.js +++ b/src/brix/bisheng/flush.js @@ -276,7 +276,7 @@ define( var content = Handlebars.compile(ast)(context) content = HTML.convert(content) - Scanner.scan(content[0], change.context) + Scanner.scan(content[0], change.root) content = content.contents() var target = Locator.parseTarget(locator) diff --git a/src/brix/bisheng/locator.js b/src/brix/bisheng/locator.js index f258cf7..d469ace 100644 --- a/src/brix/bisheng/locator.js +++ b/src/brix/bisheng/locator.js @@ -103,7 +103,7 @@ define( } } return $(target) - }, + } } // comment 定位符 diff --git a/src/brix/bisheng/loop.js b/src/brix/bisheng/loop.js index 6c4f7f0..c5b3be2 100644 --- a/src/brix/bisheng/loop.js +++ b/src/brix/bisheng/loop.js @@ -495,7 +495,7 @@ define( type: TYPES.UPDATE, path: path.concat(name), value: value, - oldValue: oldValue[name] !== undefined ? oldValue[name].valueOf() : oldValue[name] + oldValue: (oldValue[name] !== undefined && oldValue[name] !== null) ? oldValue[name].valueOf() : oldValue[name] }) continue }