From 919e8716bc80d656e97ae2c80ad2d2b59019a51b Mon Sep 17 00:00:00 2001 From: mytharcher Date: Tue, 7 Aug 2012 23:05:56 +0800 Subject: [PATCH 1/5] Add test case for template 'for' syntax. --- test/template.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/template.js b/test/template.js index 37b375e..10cd752 100644 --- a/test/template.js +++ b/test/template.js @@ -117,6 +117,11 @@ test("merge", function() { er.template.merge( el, 'mergeTest6_3' ); equals(el.innerHTML, '1,0|2,1|3,2|4,3|5,4', 'merge,for遍历数组,带数组索引'); + er.template.parse('${item}'); + er.context.set( 'myObject', {myList: [1,2,3,4,5]} ); + er.template.merge( el, 'mergeTest6_4' ); + equals(el.innerHTML, '12345', 'for遍历多级对象数组'); + er.template.parse('${num}zeroinvalid'); er.context.set( 'num', 1 ); er.template.merge( el, 'mergeTest7' ); From 81f4c7e0acf6baf478561cbe7dc0a2e72dba2783 Mon Sep 17 00:00:00 2001 From: mytharcher Date: Mon, 3 Sep 2012 10:56:34 +0800 Subject: [PATCH 2/5] Fix wrong semicolon. --- src/esui/validator/Rule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/esui/validator/Rule.js b/src/esui/validator/Rule.js index 8b65841..47d567e 100644 --- a/src/esui/validator/Rule.js +++ b/src/esui/validator/Rule.js @@ -21,7 +21,7 @@ esui.validator.Rule = function () { this.name = options.name; this.check = options.check; this.errorMessage = options.errorMessage; - }; + } Rule.prototype = { /** From c5c8d9d37760b65c35adecb011c73d6dce7cdfe2 Mon Sep 17 00:00:00 2001 From: mytharcher Date: Mon, 3 Sep 2012 11:27:30 +0800 Subject: [PATCH 3/5] Add test case for issue #17. --- test/template.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/template.js b/test/template.js index 10cd752..5608515 100644 --- a/test/template.js +++ b/test/template.js @@ -117,11 +117,6 @@ test("merge", function() { er.template.merge( el, 'mergeTest6_3' ); equals(el.innerHTML, '1,0|2,1|3,2|4,3|5,4', 'merge,for遍历数组,带数组索引'); - er.template.parse('${item}'); - er.context.set( 'myObject', {myList: [1,2,3,4,5]} ); - er.template.merge( el, 'mergeTest6_4' ); - equals(el.innerHTML, '12345', 'for遍历多级对象数组'); - er.template.parse('${num}zeroinvalid'); er.context.set( 'num', 1 ); er.template.merge( el, 'mergeTest7' ); @@ -132,6 +127,11 @@ test("merge", function() { er.context.set( 'num', -1 ); er.template.merge( el, 'mergeTest7' ); equals(el.innerHTML, 'invalid', 'merge,进入else分支'); + + er.template.parse('${num}'); + er.context.set( 'num', -1 ); + er.template.merge( el, 'mergeTest7_2' ); + equals(el.innerHTML, '-1', '负数也可以比较'); er.template.parse('1'); er.context.set( 'num', 0 ); From 97806bcb65274e2e6d9a1f33dcdf2039dbc4d0ca Mon Sep 17 00:00:00 2001 From: mytharcher Date: Mon, 3 Sep 2012 12:44:48 +0800 Subject: [PATCH 4/5] Revert test case deleted. --- test/template.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/template.js b/test/template.js index 5608515..de216f0 100644 --- a/test/template.js +++ b/test/template.js @@ -116,6 +116,11 @@ test("merge", function() { er.context.set( 'myList', [1,2,3,4,5] ); er.template.merge( el, 'mergeTest6_3' ); equals(el.innerHTML, '1,0|2,1|3,2|4,3|5,4', 'merge,for遍历数组,带数组索引'); + + er.template.parse('${item}'); + er.context.set( 'myObject', {myList: [1,2,3,4,5]} ); + er.template.merge( el, 'mergeTest6_4' ); + equals(el.innerHTML, '12345', 'for遍历多级对象数组'); er.template.parse('${num}zeroinvalid'); er.context.set( 'num', 1 ); From 0aabbe6fd5e2efeaef54f2e2cb525fb3fded4099 Mon Sep 17 00:00:00 2001 From: mytharcher Date: Mon, 10 Sep 2012 15:26:05 +0800 Subject: [PATCH 5/5] Add test case for #19. --- test/template.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/template.js b/test/template.js index de216f0..e4232aa 100644 --- a/test/template.js +++ b/test/template.js @@ -133,6 +133,14 @@ test("merge", function() { er.template.merge( el, 'mergeTest7' ); equals(el.innerHTML, 'invalid', 'merge,进入else分支'); + er.template.parse('${num}'); + er.context.set( 'num', 0 ); + er.template.merge( el, 'mergeTest9' ); + equals(el.innerHTML, '0', '不等于比较,不相等时'); + er.context.set( 'num', 3 ); + er.template.merge( el, 'mergeTest9' ); + equals(el.innerHTML, '', '不等于比较,相等时'); + er.template.parse('${num}'); er.context.set( 'num', -1 ); er.template.merge( el, 'mergeTest7_2' );