update version to 0.2.0

NetEaseWD · Nov 5, 2014 · 38abeed · 38abeed
1 parent 1cd8caa
commit 38abeed
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,7 @@
 --------------------------------------------------------
 - 修正define对实例返回结果的注入
 - 增加json!类型的插件注入
+- 增加regularjs!类型的插件注入
 - 增加API/控件支持
   * util/selector/cascade
   * util/suggest/at

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nej",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "homepage": "https://github.com/genify/nej",
   "authors": ["genify <caijf@corp.netease.com>"],
   "description": "JavaScript Cross-Platform Framework",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nej-framework",
   "description": "JavaScript Cross-Platform Framework",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "MIT",
 
   "keywords": ["nej","javascript","cross platform","framework"],

diff --git a/res/nej_proxy_upload.html b/res/nej_proxy_upload.html
@@ -4,10 +4,7 @@
     window.result = '{"url":"http://192.168.146.84:1122/xhr/3.jpg"}';
 </script>
 <script>
-    var _result = 'NEJ-UPLOAD-RESULT:{\
-            "key":"'+window.name+'",\
-            "result":"'+encodeURIComponent(result)+'"\
-        }';
+    var _result = 'NEJ-UPLOAD-RESULT:{"key":"'+window.name+'","result":"'+encodeURIComponent(result)+'"}';
     if (window.postMessage){
         parent.postMessage(_result,'*');
     }else{

diff --git a/res/src/nej_proxy_upload.html b/res/src/nej_proxy_upload.html
@@ -4,10 +4,7 @@
     window.result = '{"url":"http://192.168.146.84:1122/xhr/3.jpg"}';
 </script>
 <script>
-    var _result = 'NEJ-UPLOAD-RESULT:{\
-            "key":"'+window.name+'",\
-            "result":"'+encodeURIComponent(result)+'"\
-        }';
+    var _result = 'NEJ-UPLOAD-RESULT:{"key":"'+window.name+'","result":"'+encodeURIComponent(result)+'"}';
     if (window.postMessage){
         parent.postMessage(_result,'*');
     }else{

diff --git a/src/ui/editor/command/uploadimage.html b/src/ui/editor/command/uploadimage.html
@@ -2,7 +2,7 @@
 	<div>
 	  <a class="u-btn f-ib upload j-tab f-fl" name="upload"><span class="img-upload">上传图片</span></a>
 	  <a class="u-btn f-ib extern j-tab" name="extern"><span class="img-extern">引用站外图片</span></a>
-	  <image class="j-ztag u-image" />
+	  <img class="j-ztag u-image" />
 	</div>
 	<div class="j-cnt">
 	  <div class="choose_file" name="select_image">

diff --git a/src/util/form/demo/form.html b/src/util/form/demo/form.html
@@ -34,6 +34,7 @@
             'util/template/tpl',
             '../form.js'
         ],function(_v,_ex,_e,_t){
+            "use strict";
             _e._$parseTemplate('abc');
             var _webform;
             var _form = _e._$getNodeTemplate('abc');