From f93257a920d42fc9b8829679d742b5d8ad9ae899 Mon Sep 17 00:00:00 2001
From: eric ma <924402086@qq.com>
Date: Thu, 4 Sep 2014 17:31:48 +0800
Subject: [PATCH 1/7] =?UTF-8?q?dialog-plus.js=E4=BF=AE=E6=94=B9=E4=BA=8610?=
=?UTF-8?q?9=E8=A1=8C=20=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AAdrag=E5=B1=9E?=
=?UTF-8?q?=E6=80=A7=E6=9D=A5=E6=8E=A7=E5=88=B6=E6=8B=96=E6=8B=BD=E7=9A=84?=
=?UTF-8?q?=E5=BC=80=E5=90=AF=E5=92=8C=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
dialog-plus.js修改了109行 添加一个drag属性来控制拖拽的开启和关闭
---
src/dialog-plus.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dialog-plus.js b/src/dialog-plus.js
index e16f88f..4fcc8ba 100644
--- a/src/dialog-plus.js
+++ b/src/dialog-plus.js
@@ -105,8 +105,8 @@ dialog.oncreate = function (api) {
// 拖拽支持
$(api.node).on(drag.types.start, '[i=title]', function (event) {
- // 排除气泡类型的对话框
- if (!api.follow) {
+ // 排除气泡类型的对话框 并且api.drag是true
+ if (!api.follow && api.drag ===true) {
api.focus();
drag.create(api.node, event);
}
From 99f955b58f3a3247e6f9a06f4c86a47a98adc1bf Mon Sep 17 00:00:00 2001
From: eric ma <924402086@qq.com>
Date: Fri, 5 Sep 2014 11:49:02 +0800
Subject: [PATCH 2/7] =?UTF-8?q?dialog.js=2070=E8=A1=8C=20=E8=87=AA?=
=?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F=20=E5=9C=A8=E5=8E=9F?=
=?UTF-8?q?=E6=9C=89=E5=9F=BA=E6=9C=AC=E6=A0=B7=E5=BC=8F=E7=9A=84=E5=9F=BA?=
=?UTF-8?q?=E7=A1=80=E4=B8=8A=E8=BF=9B=E8=A1=8C=E7=AA=97=E4=BD=93=E9=A3=8E?=
=?UTF-8?q?=E6=A0=BC=E7=9A=84=E4=BF=AE=E6=94=B9=20=E6=9C=80=E5=A5=BD?=
=?UTF-8?q?=E9=85=8D=E5=90=88skin=E5=B1=9E=E6=80=A7=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
dialog.js 70行 自定义样式 在原有基本样式的基础上进行窗体风格的修改 最好配合skin属性使用
---
src/dialog.js | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/dialog.js b/src/dialog.js
index 777a644..cebffd3 100644
--- a/src/dialog.js
+++ b/src/dialog.js
@@ -67,6 +67,19 @@ var artDialog = function (options, ok, cancel) {
options.fixed = false;
}
+ // 自定义样式 在原有基本样式的基础上进行窗体风格的修改 最好配合skin属性使用
+ if(typeof options.cssUri === 'string' && options.cssUri !=='' && (options.cssUri !== css) ){
+ var fn = require[require.toUrl ? 'toUrl' : 'resolve'];
+ if (fn) {
+ var myCss = fn(options.cssUri);
+ myCss = '';
+ if ($('base')[0]) {
+ $('base').before(myCss);
+ } else {
+ $('head').append(myCss);
+ }
+ }
+ }
// 快捷关闭支持：点击对话框外快速关闭对话框
if (options.quickClose) {
From ab5f00d5fff1d7d96efbd84d74d28b87595fd3c8 Mon Sep 17 00:00:00 2001
From: eric ma <924402086@qq.com>
Date: Fri, 5 Sep 2014 11:55:52 +0800
Subject: [PATCH 3/7] =?UTF-8?q?dialog-plus.js=E4=BF=AE=E6=94=B9=E4=BA=8610?=
=?UTF-8?q?9=E8=A1=8C=20=E4=BF=AE=E6=94=B9=E6=8E=A7=E5=88=B6=E6=8B=96?=
=?UTF-8?q?=E6=8B=BD=E7=9A=84=E5=BC=80=E5=90=AF=E5=92=8C=E5=85=B3=E9=97=AD?=
=?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
dialog-plus.js修改了109行 修改控制拖拽的开启和关闭的判断条件
---
src/dialog-plus.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dialog-plus.js b/src/dialog-plus.js
index 4fcc8ba..4879381 100644
--- a/src/dialog-plus.js
+++ b/src/dialog-plus.js
@@ -105,8 +105,8 @@ dialog.oncreate = function (api) {
// 拖拽支持
$(api.node).on(drag.types.start, '[i=title]', function (event) {
- // 排除气泡类型的对话框 并且api.drag是true
- if (!api.follow && api.drag ===true) {
+ // 排除气泡类型的对话框 并且api.drag不是false
+ if (!api.follow && api.drag !== false) {
api.focus();
drag.create(api.node, event);
}
From b3beb53ac322e35035d427892fdf580dd66976fa Mon Sep 17 00:00:00 2001
From: eric ma
Date: Tue, 11 Nov 2014 14:50:38 +0800
Subject: [PATCH 4/7] no1
---
Gruntfile.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index c8889fb..d05a2a3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,7 @@ module.exports = function (grunt) {
globalBase: './src/global_modules',
name: 'dialog',
namespace: 'window',
- banner: '<%= meta.banner %>'
+ banner: '<%= meta.banner %>很'
},
'dialog.js': {
src: './src/dialog.js',
From 096f4a56c7910e5e06c6b2a95a3b5c188c7f277d Mon Sep 17 00:00:00 2001
From: eric ma
Date: Tue, 11 Nov 2014 14:54:24 +0800
Subject: [PATCH 5/7] no1
---
Gruntfile.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index d05a2a3..c8889fb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,7 @@ module.exports = function (grunt) {
globalBase: './src/global_modules',
name: 'dialog',
namespace: 'window',
- banner: '<%= meta.banner %>很'
+ banner: '<%= meta.banner %>'
},
'dialog.js': {
src: './src/dialog.js',
From 03cc47d2b8da99c3ae35699b699681ca53d1101f Mon Sep 17 00:00:00 2001
From: eric ma
Date: Tue, 11 Nov 2014 14:55:32 +0800
Subject: [PATCH 6/7] no1
---
Gruntfile.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index c8889fb..47de153 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,7 @@ module.exports = function (grunt) {
globalBase: './src/global_modules',
name: 'dialog',
namespace: 'window',
- banner: '<%= meta.banner %>'
+ banner: '<%= meta.banner %单个>'
},
'dialog.js': {
src: './src/dialog.js',
From f31a11c858a8943ea8945915af5c896ce0b2a7a0 Mon Sep 17 00:00:00 2001
From: eric ma
Date: Tue, 11 Nov 2014 14:57:21 +0800
Subject: [PATCH 7/7] no1
---
Gruntfile.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index 47de153..c8889fb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,7 @@ module.exports = function (grunt) {
globalBase: './src/global_modules',
name: 'dialog',
namespace: 'window',
- banner: '<%= meta.banner %单个>'
+ banner: '<%= meta.banner %>'
},
'dialog.js': {
src: './src/dialog.js',