change uri plugin to res

genify · Apr 12, 2018 · dbdd946 · dbdd946
1 parent 0cb5334
commit dbdd946
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,13 +1,14 @@
-0.4.7   (2018-04-12)
+0.4.8   (2018-04-12)
 --------------------------------------------------------
 - 功能支持
-  * 支持 uri 插件注入地址
+  * 支持 res 依赖插件注入地址
 
+0.4.7   (2018-04-12)
+--------------------------------------------------------
 - BUG修复模块
   * base/util 模块的 _$absolute 接口支持相对协议
   * util/timer/animation 的 requestAnimationFrame 接口返回标识
 
-
 0.4.6   (2017-11-09)
 --------------------------------------------------------
 - BUG修复模块

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "nej",
-    "version": "0.4.7",
+    "version": "0.4.8",
     "homepage": "https://github.com/genify/nej",
     "authors": [
         "genify <caijf@corp.netease.com>"

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "nej-framework",
     "description": "JavaScript Cross-Platform Framework",
-    "version": "0.4.7",
+    "version": "0.4.8",
     "license": "MIT",
     "keywords": [
         "nej",

diff --git a/src/base/demo/define/define.html b/src/base/demo/define/define.html
@@ -19,7 +19,7 @@
           'pro/a',
           'base/element',
           'json!abc/define/a.json',
-          'uri!./a/b/c.swf'
+          'res!./a/b/c.swf'
       ],function(a,e,json,swf){
           log('a:'+json.a);
           log(swf);

diff --git a/src/define.js b/src/define.js
@@ -168,7 +168,7 @@
             css:function (_uri) {
                 _doLoadStyle(_uri);
             },
-            uri:function(_uri) {
+            res:function(_uri) {
                 __scache[_uri] = 2;
                 __rcache[_uri] = _uri;
                 _doCheckLoading();