diff --git a/CHANGELOG.md b/CHANGELOG.md index 38a82da2064d7b2cea85a947e9f15de3b0143e0b..69ac32976f8c960dfa13e663fe004f30a8967454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Amaze UI Change Log --- +### 2014.10 W4 + +__JS插件__: + +- `FIXED` #164 Alert 插件 closed:alert:amui 自定义事件未触发; +- `FIXED` #163 Pureview 插件在 Firefox 桌面版异常。 + ### 2014.10 W3 __CSS__: diff --git a/docs/getting-started/credits.md b/docs/getting-started/credits.md index bacdaab4797aa37e4aaf0851b6269bb3368c991d..29647ae52e944deb2d57719e8acbd7c61e6daf07 100644 --- a/docs/getting-started/credits.md +++ b/docs/getting-started/credits.md @@ -22,6 +22,8 @@ Amaze UI 使用 [WebStorm](http://www.jetbrains.com/webstorm/) 开发,感谢 [ ### v1.0.0 + [@穷穷云](http://www.baidu.com/p/%E7%A9%B7%E7%A9%B7%E4%BA%91)、[@吴亚东](http://t.qq.com/wuyadong2)、[我怀念的是那时的我们](http://t.qq.com/a13572713967) + #### RC1 [@John.Wall](http://t.qq.com/wangzj141)、@ayhome、[@啸沧海](http://t.qq.com/seecool)、[@成都高校联盟](http://www.cdunu.com/)、@Henry、[@Kimi](http://weibo.com/2536228053)、@nswish、 diff --git a/js/ui.pureview.js b/js/ui.pureview.js index 4a6be7a2f56bc788abf5110cf5af9707010f6372..9ff0af3bf101895c0636b8480d5fc47bec8c99a0 100644 --- a/js/ui.pureview.js +++ b/js/ui.pureview.js @@ -251,7 +251,7 @@ define(function(require, exports, module) { if (transition) { $slide.one(transition.end, $.proxy(function() { this.transitioning = 0; - }, this)); + }, this)).emulateTransitionEnd(300); } else { this.transitioning = 0; } diff --git a/less/ui.pureview.less b/less/ui.pureview.less index 9c6390a2b72c584b37adc507a6aca2bc25f6d491..59f2a1de55b7269d686e93a73e6ef42ff95bf5b6 100644 --- a/less/ui.pureview.less +++ b/less/ui.pureview.less @@ -130,7 +130,7 @@ //max-width:100%; //height:auto; opacity: 0; - z-index: 2; + z-index: 200; -webkit-user-drag: none; user-drag: none; .transition(opacity .15s linear); @@ -299,4 +299,4 @@ // body .am-pureview-active { overflow: hidden; -} \ No newline at end of file +}