From eb283a0ddf30b21f780864c8c302f3f3335bcc3a Mon Sep 17 00:00:00 2001
From: taoqili <taoqili@126.com>
Date: Wed, 20 Feb 2013 18:05:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.2.5' into
 dev-1.2.5

Conflicts:
	_src/plugins/table.js
---
 _src/core/htmlparser.js   | 4 ++--
 _src/plugins/wordcount.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_src/core/htmlparser.js b/_src/core/htmlparser.js
index 1f184f17..6d6c3274 100644
--- a/_src/core/htmlparser.js
+++ b/_src/core/htmlparser.js
@@ -9,7 +9,7 @@ var htmlparser = UE.htmlparser = function (htmlstr) {
         re_attr = /([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g;
 
     var uNode = UE.uNode,
-        needparentNode = {
+        needParentNode = {
             'td':'tr',
             'tr':'tbody',
             'tbody':'table',
@@ -33,7 +33,7 @@ var htmlparser = UE.htmlparser = function (htmlstr) {
 
     function element(parent, tagName, htmlattr) {
         var needParentTag;
-        if (needParentTag = needparentNode[tagName]) {
+        if (needParentTag = needParentNode[tagName]) {
             if (tagName == parent.tagName) {
                 parent = parent.parentNode;
             } else if (utils.isArray(needParentTag) ? utils.indexOf(needParentTag, parent.tagName) == -1 : needParentTag != parent.tagName) {
diff --git a/_src/plugins/wordcount.js b/_src/plugins/wordcount.js
index 6007e8ae..ea769634 100644
--- a/_src/plugins/wordcount.js
+++ b/_src/plugins/wordcount.js
@@ -21,11 +21,11 @@ UE.plugins['wordcount'] = function(){
         domUtils.on(me.body,"keyup",function(evt){
             var code = evt.keyCode||evt.which,
                 //忽略的按键,ctr,alt,shift,方向键
-                ignore = {"16":1,"18":1,"20":1,"37":1,"38":1,"39":1,"40":1};
-            if(code in ignore) return;
+                ignores = {"16":1,"18":1,"20":1,"37":1,"38":1,"39":1,"40":1};
+            if(code in ignores) return;
             clearTimeout(timer);
             timer = setTimeout(function(){
-                me.fireEvent('wordcount')
+                me.fireEvent('wordcount');
             },200)
         })
     });
-- 
GitLab