重构prefix

cxtom · Nov 3, 2014 · 021c3bb · 021c3bb
1 parent c2b96d7
commit 021c3bb
Show file tree

Hide file tree

Showing 12 changed files with 316 additions and 288 deletions.
diff --git a/example/Calendar.tpl b/example/Calendar.tpl
@@ -468,4 +468,4 @@ require(['jquery', 'ui/Calendar'], function ($, Calendar) {
 });
 ```
 
-{%/filter%}
+{%/filter%}
diff --git a/example/City.tpl b/example/City.tpl
@@ -12,7 +12,7 @@
     margin: 0;
     outline: none;
   }
-  
+
   .line button {
     margin: 0 10px;
   }
@@ -73,7 +73,7 @@ require(['ui/City'], function (City) {
       prefix: 'ecl-ui-city',
       triggers: $('.city-trigger').toArray(),
       //target: 'city',
-      
+
       onBeforeShow: function (arg) {
             var e = arg.event;
             var target = e.target;
@@ -188,7 +188,7 @@ require(['ui/City'], function (City) {
       prefix: 'ecl-ui-city',
       triggers: $('.city-trigger').toArray(),
       //target: 'city',
-      
+
       onBeforeShow: function (arg) {
             var e = arg.event;
             var target = e.target;
@@ -291,4 +291,4 @@ require(['ui/City'], function (City) {
 
 
 });
-</script>
+</script>
diff --git a/example/main.js b/example/main.js
@@ -0,0 +1,16 @@
+/**
+ * @file moye 主入口
+ * @author Leon([email protected])
+ */
+define(function (require) {
+    var Control = require('./Control');
+    var exports = {};
+
+    exports.init = function (container, options) {
+
+
+
+    };
+
+    return exports;
+});
diff --git a/src/css/variable.less b/src/css/variable.less
@@ -26,6 +26,13 @@
 @footer-z-index: 1000;
 @modal-z-index: 1050;
 
+// 前缀配置
+@moye-common-prefix: ui;
+@moye-card-prefix: ecl-ui;
+
+// 默认全局配置
+@moye-prefix: @moye-common-prefix;
+
 // 翻页器
 @pager-prefix: ecl-ui-pager;
 @pager-item-color: #03c;
@@ -36,14 +43,14 @@
 @pager-item-triangle-color: #666;
 @pager-item-disabled-color: #999;
 
-@button-prefix: ui-button;
+@button-prefix: replace(~"prefix-button", 'prefix', @moye-prefix);
 @button-background: #2196ff;
 @button-color: #fff;
 @button-border-color: #f3f3f3;
 @butotn-disabled-background-color: #e7e7e7;
 
 // 日历
-@cal-prefix: ecl-ui-cal;
+@cal-prefix: replace(~"prefix-calendar", 'prefix', @moye-prefix);
 
 // 城市控件
 @city-prefix: ecl-ui-city;

diff --git a/src/ui/Button.js b/src/ui/Button.js
@@ -31,9 +31,6 @@ define(function (require) {
             // 控件渲染主容器
             main: '',
 
-            // 控件class前缀，同时将作为main的class之一
-            prefix: 'ui-button',
-
             text: null,
 
             width: '',
-Original file line number
+Diff line change
@@ Expand Up / @@ -468,4 +468,4 @@ require(['jquery', 'ui/Calendar'], function ($, Calendar) { @@
     });
     ```
-    {%/filter%}
+    {%/filter%}