try to fixes #367

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Amaze UI Change Log
 ---
 
+### 2015.01 W1
+
+- `IMPROVED` #367 尝试修复 Modal 遮罩层关闭回调函数被触发多次问题；
+
+## Amaze UI 2.1.0-beta1
+
 ### 2014.12 W4
 
 **JS:**

js/ui.dimmer.js

@@ -13,7 +13,7 @@ var Dimmer = function() {
 
   this.inited = false;
   this.scrollbarWidth = 0;
-  this.used = $([]);
+  this.$used = $([]);
 };
 
 Dimmer.DEFAULTS = {
@@ -39,12 +39,12 @@ Dimmer.prototype.open = function(relatedElement) {
 
   // 用于多重调用
   if (relatedElement) {
-    this.used = this.used.add($(relatedElement));
+    this.$used = this.$used.add($(relatedElement));
   }
 
   this.checkScrollbar().setScrollbar();
 
-  $element.show().trigger('open.dimmer.amui');
+  $element.off(transition.end).show().trigger('open.dimmer.amui');
 
   setTimeout(function() {
     $element.addClass('am-active');
@@ -54,9 +54,9 @@ Dimmer.prototype.open = function(relatedElement) {
 };
 
 Dimmer.prototype.close = function(relatedElement, force) {
-  this.used = this.used.not($(relatedElement));
+  this.$used = this.$used.not($(relatedElement));
 
-  if (!force && this.used.length) {
+  if (!force && this.$used.length) {
     return this;
   }
 
@@ -65,12 +65,12 @@ Dimmer.prototype.close = function(relatedElement, force) {
   $element.removeClass('am-active').trigger('close.dimmer.amui');
 
   function complete() {
-    this.resetScrollbar();
     $element.hide();
+    this.resetScrollbar();
   }
 
-  transition ? $element.one(transition.end, $.proxy(complete, this)) :
-    complete.call(this);
+  // transition ? $element.one(transition.end, $.proxy(complete, this)) :
+  complete.call(this);
 
   return this;
 };

less/ui.component.less

@@ -86,7 +86,7 @@ tbody.@{ns}collapse.@{ns}in {
   background-color: rgba(0, 0, 0, .6);
   z-index: @z-index-dimmer;
   opacity: 0;
-  transition: opacity .15s;
+  // transition: opacity .15s;
 
   &.@{ns}active {
     opacity: 1;