arale-dialog
Advanced tools
Comparing version 1.5.1 to 1.5.2
@@ -5,2 +5,6 @@ # 历史记录 | ||
## 1.5.2 | ||
`fixed` 修复 IE8 下 iframe 模式报错 `未指明的错误` 的问题。 | ||
## 1.5.1 | ||
@@ -7,0 +11,0 @@ |
{ | ||
"name": "arale-dialog", | ||
"version": "1.5.1", | ||
"version": "1.5.2", | ||
"description": "Dialog 是通用对话框容器,提供显隐关闭、遮罩层、内嵌iframe、内容区域自定义以及模态对话框等功能。", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -85,2 +85,3 @@ var $ = require('spm-jquery'), | ||
options = onCancel; | ||
onCancel = null; | ||
} | ||
@@ -87,0 +88,0 @@ |
@@ -109,3 +109,3 @@ var $ = require('spm-jquery'), | ||
// https://github.com/aralejs/base/issues/7 | ||
this.$('[data-role=close]').hide(); | ||
this.$('>[data-role=close]').hide(); | ||
}, | ||
@@ -202,5 +202,5 @@ | ||
if (val === '') { | ||
this.$('[data-role=close]').html(val).hide(); | ||
this.$('>[data-role=close]').html(val).hide(); | ||
} else { | ||
this.$('[data-role=close]').html(val).show(); | ||
this.$('>[data-role=close]').html(val).show(); | ||
} | ||
@@ -395,17 +395,18 @@ }, | ||
var m = new Messenger('parent', 'arale-dialog'); | ||
m.addTarget(this.iframe[0].contentWindow, 'iframe1'); | ||
m.listen(function (data) { | ||
data = JSON.parse(data); | ||
switch (data.event) { | ||
case 'close': | ||
that.hide(); | ||
break; | ||
case 'syncHeight': | ||
that._setHeight(data.height.toString().slice(-2) === 'px' ? data.height : data.height + 'px'); | ||
break; | ||
default: | ||
break; | ||
} | ||
this.iframe.one('load', function () { | ||
m.addTarget(that.iframe[0].contentWindow, 'iframe1'); | ||
m.listen(function (data) { | ||
data = JSON.parse(data); | ||
switch (data.event) { | ||
case 'close': | ||
that.hide(); | ||
break; | ||
case 'syncHeight': | ||
that._setHeight(data.height.toString().slice(-2) === 'px' ? data.height : data.height + 'px'); | ||
break; | ||
default: | ||
break; | ||
} | ||
}); | ||
}); | ||
}, | ||
@@ -412,0 +413,0 @@ |
Sorry, the diff of this file is not supported yet
30679
648