fix #44

regularjs · Sep 29, 2015 · 41d2700 · 41d2700
1 parent 787683f
commit 41d2700
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/dist/regular.js b/dist/regular.js
@@ -2476,12 +2476,12 @@ var rules = {
     if(all) return {type: 'TEXT', value: all}
   }],
 
-  ENTER_TAG: [/[^\x00<>]*?(?=<)/, function(all){ 
+  ENTER_TAG: [/[^\x00]*?(?=<[\w\/\!])/, function(all){ 
     this.enter('TAG');
     if(all) return {type: 'TEXT', value: all}
   }],
 
-  TEXT: [/[^\x00]+/, 'TEXT'],
+  TEXT: [/[^\x00]+/, 'TEXT' ],
 
   // 2. TAG
   // --------------------
@@ -3974,7 +3974,7 @@ animate.inject = function( node, refer ,direction, callback ){
  * @return {[type]}            [description]
  */
 animate.remove = function(node, callback){
-  if(!node) throw new Error('node to be removed is undefined')
+  if(!node) return;
   var count = 0;
   function loop(){
     count++;

diff --git a/dist/regular.min.js b/dist/regular.min.js
diff --git a/src/helper/animate.js b/src/helper/animate.js
@@ -84,7 +84,7 @@ animate.inject = function( node, refer ,direction, callback ){
  * @return {[type]}            [description]
  */
 animate.remove = function(node, callback){
-  if(!node) throw new Error('node to be removed is undefined')
+  if(!node) return;
   var count = 0;
   function loop(){
     count++;

diff --git a/src/parser/Lexer.js b/src/parser/Lexer.js
@@ -239,12 +239,12 @@ var rules = {
     if(all) return {type: 'TEXT', value: all}
   }],
 
-  ENTER_TAG: [/[^\x00<>]*?(?=<)/, function(all){ 
+  ENTER_TAG: [/[^\x00]*?(?=<[\w\/\!])/, function(all){ 
     this.enter('TAG');
     if(all) return {type: 'TEXT', value: all}
   }],
 
-  TEXT: [/[^\x00]+/, 'TEXT'],
+  TEXT: [/[^\x00]+/, 'TEXT' ],
 
   // 2. TAG
   // --------------------

diff --git a/test/regular.js b/test/regular.js
@@ -2474,12 +2474,12 @@ var rules = {
     if(all) return {type: 'TEXT', value: all}
   }],
 
-  ENTER_TAG: [/[^\x00<>]*?(?=<)/, function(all){ 
+  ENTER_TAG: [/[^\x00]*?(?=<[\w\/\!])/, function(all){ 
     this.enter('TAG');
     if(all) return {type: 'TEXT', value: all}
   }],
 
-  TEXT: [/[^\x00]+/, 'TEXT'],
+  TEXT: [/[^\x00]+/, 'TEXT' ],
 
   // 2. TAG
   // --------------------
@@ -3972,7 +3972,7 @@ animate.inject = function( node, refer ,direction, callback ){
  * @return {[type]}            [description]
  */
 animate.remove = function(node, callback){
-  if(!node) throw new Error('node to be removed is undefined')
+  if(!node) return;
   var count = 0;
   function loop(){
     count++;

diff --git a/test/spec/browser-syntax.js b/test/spec/browser-syntax.js
@@ -166,6 +166,18 @@ void function(){
 
     })
 
+    it("#44: <div>></div> should not throw error", function(){
+
+      expect(function(){ 
+        new Regular({template: '<div>></div>'}) 
+      }) .to.not.throwError();
+      expect(function(){ 
+        new Regular({template: '<div>><</div>'}) 
+      }) .to.not.throwError();
+
+    })
+
+