Commit f16b549b authored by hbcui1984's avatar hbcui1984
parent 64f5d730
...@@ -1593,7 +1593,7 @@ var mui = (function(document, undefined) { ...@@ -1593,7 +1593,7 @@ var mui = (function(document, undefined) {
return; return;
} }
var target = session.target; var target = session.target;
if (!target || (target.disabled || target.classList.contains('mui-disabled'))) { if (!target || (target.disabled || (target.classList && target.classList.contains('mui-disabled')))) {
return; return;
} }
if (touch.distance < options.tapMaxDistance && touch.deltaTime < options.tapMaxTime) { if (touch.distance < options.tapMaxDistance && touch.deltaTime < options.tapMaxTime) {
...@@ -1925,7 +1925,7 @@ var mui = (function(document, undefined) { ...@@ -1925,7 +1925,7 @@ var mui = (function(document, undefined) {
* @returns {Object} * @returns {Object}
*/ */
$.showOptions = function(options) { $.showOptions = function(options) {
return $.extend(defaultShow, options); return $.extend(true,{},defaultShow, options);
}; };
/** /**
* 窗口默认配置 * 窗口默认配置
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1593,7 +1593,7 @@ var mui = (function(document, undefined) { ...@@ -1593,7 +1593,7 @@ var mui = (function(document, undefined) {
return; return;
} }
var target = session.target; var target = session.target;
if (!target || (target.disabled || target.classList.contains('mui-disabled'))) { if (!target || (target.disabled || (target.classList && target.classList.contains('mui-disabled')))) {
return; return;
} }
if (touch.distance < options.tapMaxDistance && touch.deltaTime < options.tapMaxTime) { if (touch.distance < options.tapMaxDistance && touch.deltaTime < options.tapMaxTime) {
...@@ -1925,7 +1925,7 @@ var mui = (function(document, undefined) { ...@@ -1925,7 +1925,7 @@ var mui = (function(document, undefined) {
* @returns {Object} * @returns {Object}
*/ */
$.showOptions = function(options) { $.showOptions = function(options) {
return $.extend(defaultShow, options); return $.extend(true,{},defaultShow, options);
}; };
/** /**
* 窗口默认配置 * 窗口默认配置
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
return; return;
} }
var target = session.target; var target = session.target;
if (!target || (target.disabled || target.classList.contains($.className('disabled')))) { if (!target || (target.disabled || (target.classList && target.classList.contains($.className('disabled'))))) {
return; return;
} }
if (touch.distance < options.tapMaxDistance && touch.deltaTime < options.tapMaxTime) { if (touch.distance < options.tapMaxDistance && touch.deltaTime < options.tapMaxTime) {
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
* @returns {Object} * @returns {Object}
*/ */
$.showOptions = function(options) { $.showOptions = function(options) {
return $.extend(defaultShow, options); return $.extend(true,{},defaultShow, options);
}; };
/** /**
* 窗口默认配置 * 窗口默认配置
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment