Merge remote-tracking branch 'origin/dev-1.2.5' into dev-1.2.5

Conflicts:
	_src/plugins/table.js

_src/plugins/wordcount.js

@@ -13,14 +13,20 @@
 UE.plugins['wordcount'] = function(){
     var me = this;
     me.addListener('contentchange',function(){
-        me.fireEvent('wordcount')
+        me.fireEvent('wordcount');
     });
     var timer;
-    me.addListener('keyup',function(){
-        clearTimeout(timer);
+    me.addListener('ready',function(){
         var me = this;
-        timer = setTimeout(function(){
-            me.fireEvent('wordcount')
-        },200)
+        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;
+            clearTimeout(timer);
+            timer = setTimeout(function(){
+                me.fireEvent('wordcount')
+            },200)
+        })
     });
 };

_src/plugins/wordimage.js

@@ -14,13 +14,14 @@ UE.plugins["wordimage"] = function () {
                 flag = parseInt(attrs.width) < 128 || parseInt(attrs.height) < 43,
                 opt = me.options,
                 src = opt.UEDITOR_HOME_URL + 'themes/default/images/spacer.gif';
-            if (attrs['_src']) {
+            if (attrs['_src'].indexOf("file:///")!==-1) {
                 img.setAttr({
                     width:attrs.width,
                     height:attrs.height,
                     alt:attrs.alt,
                     word_img:attrs._src,
                     src:src,
+                    _src:src,
                     'style':'background:url(' + ( flag ? opt.themePath + opt.theme + '/images/word.gif' : opt.langPath + opt.lang + '/images/localimage.png') + ') no-repeat center center;border:1px solid #ddd'
                 })
             }