Merge pull request #10 from fleurWang/master

for-taxi-2
DDFE · Dec 8, 2015 · 42d8daf · 42d8daf
2 parents 05cf95a + 7cfeb0e
commit 42d8daf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "dialog",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "main": "dialog.js",
   "description": "公共弹窗组件",
   "files":[

diff --git a/dialog.js b/dialog.js
@@ -310,7 +310,7 @@ d.alert = function (cfg) {
 /**
  * confirm dialog
  */
-d.confirm = function (cfg , swapBtn) {
+d.confirm = function (cfg) {
 	var opts = {};
 
 	if (typeof arguments[0] === 'string' && arguments[0]) {
@@ -351,7 +351,7 @@ d.confirm = function (cfg , swapBtn) {
 			}
 		};
 
-	if(! swapBtn){
+	if(! cfg.swapBtn){
 		btn.push(cancelObj);
 		btn.push(confirmObj);
 	}else{