Merge pull request OpenNHP#202 from allmobilize/codename-h

multiple update
sciseo · Nov 10, 2014 · 332e578 · 332e578
2 parents 1492b1e + ebb5a5f
commit 332e578
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 15 deletions.
diff --git a/docs/getting-started/faq.md b/docs/getting-started/faq.md
@@ -0,0 +1,18 @@
+# 常见问题
+---
+
+## 版本更新
+
+### 2.0 什么时候发布?
+
+请查看[开发路线图](https://github.com/allmobilize/amazeui/wiki/Roadmap)了解详情。
+
+
+## 组件使用
+
+### Amaze UI 目前没有 xx 组件，有没有推荐的？
+
+**日历组件**：
+
+- [GMU 日历组件](http://gmu.baidu.com/demo/widget/calendar/calendar.html)
+- [Mobiscroll](https://github.com/acidb/mobiscroll)
diff --git a/docs/javascript/collapse.md b/docs/javascript/collapse.md
@@ -195,7 +195,7 @@ $('#myCollapse').collapse({
 
 - `$().collapse('toggle')` - 切换面板状态
 - `$().collapse('open')` - 展开面板
-- `$().collapse('hide')` - 关闭面板
+- `$().collapse('close')` - 关闭面板
 
 #### 选项
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -203,9 +203,11 @@ var preparingData = function() {
 
 gulp.task('build:preparing', preparingData);
 
-gulp.task('bower', function() {
-  $.bower().
-    pipe(gulp.dest('vendor/'));
+gulp.task('build:clean', function(cb) {
+  del([
+    config.dist.css,
+    config.dist.js
+  ], cb);
 });
 
 // Build to dist dir.
@@ -325,7 +327,7 @@ gulp.task('build:js', function(cb) {
 });
 
 gulp.task('build', function(cb) {
-  runSequence('build:preparing', ['build:less', 'build:js'], cb);
+  runSequence('build:preparing', 'build:clean', ['build:less', 'build:js'], cb);
 });
 
 // Rerun the task when a file changes

diff --git a/js/core.js b/js/core.js
@@ -431,7 +431,7 @@ $(function() {
   var $body = $('body');
 
   // trigger DOM ready event
-  $(document).trigger('domready:amui');
+  $(document).trigger('domready.amui');
 
   $html.removeClass('no-js').addClass('js');
 
@@ -443,7 +443,7 @@ $(function() {
   }
 
   $('.am-topbar-fixed-top').length &&
-  $body.addClass('am-with-topbar-fixed-top');
+    $body.addClass('am-with-topbar-fixed-top');
 
   $('.am-topbar-fixed-bottom').length &&
   $body.addClass('am-with-topbar-fixed-bottom');

diff --git a/js/ui.alert.js b/js/ui.alert.js
@@ -30,12 +30,12 @@ Alert.prototype.close = function() {
     $this :
     $this.parent('.am-alert');
 
-  $target.trigger('close:alert:amui');
+  $target.trigger('close.alert.amui');
 
   $target.removeClass('am-in');
 
   function processAlert() {
-    $target.trigger('closed:alert:amui').remove();
+    $target.trigger('closed.alert.amui').remove();
   }
 
   UI.support.transition && $target.hasClass('am-fade') ?
@@ -62,7 +62,7 @@ $.fn.alert = function(option) {
 };
 
 // Init code
-$(document).on('click.alert.amui', '[data-am-alert]', function(e) {
+$(document).on('click.alert.amui.data-api', '[data-am-alert]', function(e) {
   var $target = $(e.target);
   $(this).addClass('am-fade am-in');
   $target.is('.am-close') && $(this).alert('close');

diff --git a/less/icon.less b/less/icon.less
@@ -55,9 +55,7 @@
 
 [class*='am-icon-'] {
   display: inline-block;
-  &:before {
-    .am-icon-font;
-  }
+  .am-icon-font;
 }
 
 
@@ -2174,4 +2172,4 @@
 
 .hook-icon-btn() {}
 .hook-icon-btn-hover() {}
-.hook-icon-btn-active() {}
+.hook-icon-btn-active() {}
diff --git a/package.json b/package.json
@@ -47,7 +47,6 @@
     "fs-extra": "^0.10.0",
     "gulp": "^3.8.9",
     "gulp-amd-bundler": "0.0.20",
-    "gulp-bower": "^0.0.6",
     "gulp-concat": "latest",
     "gulp-header": "^1.0.2",
     "gulp-jsbeautifier": "0.0.3",