From 9210295470b3cfda648ead9108004b8e8d8d6cbf Mon Sep 17 00:00:00 2001
From: Jinqn <459452372@qq.com>
Date: Tue, 24 Dec 2013 14:42:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?by=20Jinqn=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lang/en/en.js       | 2 +-
 lang/zh-cn/zh-cn.js | 2 +-
 package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lang/en/en.js b/lang/en/en.js
index 73207736c..6dea0d5ec 100755
--- a/lang/en/en.js
+++ b/lang/en/en.js
@@ -416,7 +416,7 @@ UE.I18N['en'] = {
         'static':{
             'lang_input_about':'About',
             'lang_input_shortcuts':'Shortcuts',
-            'lang_input_version':'Version:1.3.5',
+            'lang_input_version':'Version:1.3.6',
             'lang_input_introduction':"UEditor is developed by Baidu Co.ltd.  It is lightweight, customizable , focusing on user experience and etc. , UEditor is based on open source BSD license , allowing free use and redistribution.",
             'lang_Txt_shortcuts':'Shortcuts',
             'lang_Txt_func':'Function',
diff --git a/lang/zh-cn/zh-cn.js b/lang/zh-cn/zh-cn.js
index 42843fb27..67a7e12f4 100755
--- a/lang/zh-cn/zh-cn.js
+++ b/lang/zh-cn/zh-cn.js
@@ -399,7 +399,7 @@ UE.I18N['zh-cn'] = {
         'static':{
             'lang_input_about':'关于UEditor',
             'lang_input_shortcuts':'快捷键',
-            'lang_input_version':'版本:1.3.5',
+            'lang_input_version':'版本:1.3.6',
             'lang_input_introduction':'UEditor是由百度web前端研发部开发的所见即所得富文本web编辑器，具有轻量，可定制，注重用户体验等特点。开源基于BSD协议，允许自由使用和修改代码。',
             'lang_Txt_shortcuts':'快捷键',
             'lang_Txt_func':'功能',
diff --git a/package.json b/package.json
index f24a6c9ab..862cbea9a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "ueditor",
     "description": "UEditor富文本web编辑器",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "homepage": "http://ueditor.baidu.com/",
     "dependencies": {
         "grunt": "~0.4.1",

From bc5716fd82ce37662d52246339cfe16447249983 Mon Sep 17 00:00:00 2001
From: Jinqn <459452372@qq.com>
Date: Tue, 24 Dec 2013 14:45:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?by=20Jinqn=20=E8=83=8C=E6=99=AF=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dialogs/background/background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dialogs/background/background.js b/dialogs/background/background.js
index bf8f47701..af2035f58 100755
--- a/dialogs/background/background.js
+++ b/dialogs/background/background.js
@@ -207,7 +207,7 @@
                 item.selected = (align == item.getAttribute('value') ? 'selected':false);
             });
         }
-        if(x && y) {
+        if(x || y) {
             $G('x').value = parseInt(x) || 0;
             $G('y').value = parseInt(y) || 0;
         }

From 74a5e97019a4f5bd62b14ebbb9a37264819b26b0 Mon Sep 17 00:00:00 2001
From: Jinqn <459452372@qq.com>
Date: Tue, 24 Dec 2013 14:52:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?by=20Jinqn=20=E7=9B=AE=E5=BD=95=E5=A4=A7?=
 =?UTF-8?q?=E7=BA=B2demo=20ie6=E3=80=817=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _examples/sectiondemo.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_examples/sectiondemo.html b/_examples/sectiondemo.html
index b578c65f4..f62554e6f 100644
--- a/_examples/sectiondemo.html
+++ b/_examples/sectiondemo.html
@@ -169,7 +169,7 @@ <h1>目录大纲demo</h1>
     function getSubStr(s,l){
         var i=0,len=0;
         for(i;i<s.length;i++){
-            if(s[i].match(/[^\x00-\xff]/g)!=null){
+            if(s.charAt(i).match(/[^\x00-\xff]/g)!=null){
                 len+=2;
             }else{
                 len++;