update

cuijing1031 · Jul 13, 2015 · 32c3629 · 32c3629
1 parent 9872a0f
commit 32c3629
Show file tree

Hide file tree

Showing 5 changed files with 10,831 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -187,11 +187,11 @@ main.js是你的入口文件，作用类似于C语言的main函数
 require([
     "avalon",
     "domReady!",
-    "avalon.tab.js",
-    "avalon.pager.js",
-    "avalon.datepicker.js"
+    "./tab/avalon.tab",
+    "./pager/avalon.pager",
+    "./datepicker/avalon.datepicker"
 ], function (avalon) {
-    avalon.log("domReady完成1")
+    avalon.log("domReady完成")
    var vm = avalon.define({$id: "demo"})
     avalon.scan(document.body, vm);
     //你们的业务代码
@@ -201,7 +201,7 @@ require([
 现在除了回调里面的代码是你们写的，其他都是oniui或avalon的文件，如果你们的同事又写一个业务代码，如
 ```javascript
 //aaa.js
-require(["avalon.dropdown"], function(){
+require(["./dropdown/avalon.dropdown"], function(){
   //你们的业务代码
 })
 ```
@@ -210,12 +210,12 @@ require(["avalon.dropdown"], function(){
 require([
     "avalon",
     "domReady!",
-    "avalon.tab",
-    "avalon.pager",
-    "avalon.datepicker",
+    "./tab/avalon.tab",
+    "./pager/avalon.pager",
+    "./datepicker/avalon.datepicker"
     "./aaa"
 ], function (avalon) {
-    avalon.log("domReady完成1")
+    avalon.log("domReady完成")
    var vm = avalon.define({$id: "demo"})
     avalon.scan(document.body, vm);
     //你们的业务代码
@@ -237,10 +237,8 @@ require([
         "css-builder": "./combo/css-builder",
         "normalize": "./combo/normalize",
         domReady: "./combo/domReady",
-        "avalon.tab": "./tab/avalon.tab",
-        "avalon.pager": "./pager/avalon.pager",
-        "avalon.datepicker": "./datepicker/avalon.datepicker"
     },
+    //optimize: "none",//如果要调试就不压缩
     name: "main", //如果从哪一个文件开始合并
     out: "./main-built.js" //确定要生成的文件路径及名字
 })
@@ -253,11 +251,6 @@ require([
 
 
 
-
-
-
-
-
 如何为OniUI贡献一套新的皮肤
 ==========================
 <b>chameleon</b>是OniUI的皮肤生成系统,基于sass的compass框架改写而成.

diff --git a/build.html b/build.html
@@ -10,6 +10,7 @@
     <body>
         <div ms-controller="demo">
             <input ms-widget="datepicker"/>
+             <div ms-widget="tab" ></div>
         </div>
     </body>
 </html>
diff --git a/build.js b/build.js
@@ -1,4 +1,5 @@
 ({
+
     baseUrl: "./", //找到main.js文件的目录
     paths: {
         avalon: "./avalon.shim",
@@ -7,10 +8,9 @@
         "css-builder": "./combo/css-builder",
         "normalize": "./combo/normalize",
         domReady: "./combo/domReady",
-        "avalon.tab": "./tab/avalon.tab",
-        "avalon.pager": "./pager/avalon.pager",
-        "avalon.datepicker": "./datepicker/avalon.datepicker"
     },
+
+    //optimize: "none",//如果要调试就不压缩
     name: "main", //如果从哪一个文件开始合并
     out: "./main-built.js" //确定要生成的文件路径及名字
 })