update

TerryZ · Jul 24, 2017 · dd7e5ac · dd7e5ac
1 parent 592f6af
commit dd7e5ac
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/b.dialog.bootstrap3.css b/b.dialog.bootstrap3.css
@@ -75,6 +75,7 @@ div.bDialog.fullWidth {
 	-webkit-border-radius: 0px;
     -moz-border-radius: 0px;
     border-radius: 0px;
+    padding-right: 0px;
 }
 div.bDialog.fullWidth  div.modal-header {
 	-webkit-border-radius: 0px;

diff --git a/b.dialog.js b/b.dialog.js
@@ -197,16 +197,18 @@
 				$(this).remove();
 				if($('[dialog="bDialog"]',$(topBody)).size() > 0) $('[dialog="bDialog"]:last',$(topBody)).addClass('dialogInActive');
 			});
-			$top('div.bDialog:last',$top(topBody)).off('click.bDialog').on('click.bDialog',function(e){
-				var srcEl = e.target || e.srcElement;
-				if($(srcEl).is('div.bDialog')){
-					var that = $top('div.bDialog:last',$top(topBody));
-					$top(that).removeClass('animated').removeClass('shake');
-					setTimeout(function () {
-						that.addClass('animated').addClass('shake');
-					}, 0);
-				}
-			});
+			if(!p.fullWidth){
+				$top('div.bDialog:last',$top(topBody)).off('click.bDialog').on('click.bDialog',function(e){
+					var srcEl = e.target || e.srcElement;
+					if($(srcEl).is('div.bDialog')){
+						var that = $top('div.bDialog:last',$top(topBody));
+						$top(that).removeClass('animated').removeClass('shake');
+						setTimeout(function () {
+							that.addClass('animated').addClass('shake');
+						}, 0);
+					}
+				});
+			}
 	        //浏览器窗口尺寸变化时，自动对窗口位置进行调整
 	        $top(window.top).bind('resize.bDialog', function() {
 	            // clear a previously set timeout
@@ -293,6 +295,8 @@
 				var bodyFrameCss = {'height':frameHeight,'max-height':frameHeight};
 				$("iframe.bDialogBodyFrame",$(dialog)).css(bodyFrameCss);
 			}
+			if(p.fullWidth) $(dialog).css('padding-right','0px');
+
 			//清除所有已弹出窗口的当前激活样式
 			$('[dialog="bDialog"]',$(topBody)).removeClass('dialogInActive');
 			$(dialog).addClass('dialogInActive');