Merge pull request #2 from solodyagin/master

Small fixes
GedMarc · Aug 1, 2018 · c9dc550 · c9dc550
2 parents af0863f + a0af1e4
commit c9dc550
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 13 deletions.
diff --git a/demos/layout_inside_dialog.html b/demos/layout_inside_dialog.html
@@ -99,7 +99,7 @@
 
 	<script type="text/javascript" src="js/jquery.js"></script> 
 	<script type="text/javascript" src="js/jquery-ui.js"></script> 
-	<script type="text/javascript" src="../source/stable/jquery.layout.js"></script>
+	<script type="text/javascript" src="../source/stable/jquery.layout_and_plugins.js"></script>
 
     <script type="text/javascript" src="js/themeswitchertool.js"></script> 
 	<script type="text/javascript" src="js/debug.js"></script>

diff --git a/demos/layout_inside_tab.html b/demos/layout_inside_tab.html
@@ -91,7 +91,7 @@
 	<script type="text/javascript" src="js/jquery.js"></script>
 	<script type="text/javascript" src="js/jquery-ui.js"></script>
 	<script type="text/javascript" src="js/debug.js"></script>
-	<script type="text/javascript" src="../source/stable/jquery.layout.js"></script>
+	<script type="text/javascript" src="../source/stable/jquery.layout_and_plugins.js"></script>
 	<script type="text/javascript" src="../source/stable/callbacks/jquery.layout.resizeTabLayout.js"></script>
 
 	<script type="text/javascript">

diff --git a/demos/layouts_inside_tabs.html b/demos/layouts_inside_tabs.html
@@ -372,7 +372,7 @@
 
 	<script type="text/javascript" src="js/jquery.js"></script>
 	<script type="text/javascript" src="js/jquery-ui.js"></script>
-	<script type="text/javascript" src="js/jquery.layout.js"></script>
+	<script type="text/javascript" src="js/jquery.layout_and_plugins.js"></script>
 
 	<script type="text/javascript" src="js/jquery.layout.resizeTabLayout.js"></script>
 	<script type="text/javascript" src="js/jquery.layout.resizePaneAccordions.js"></script>

diff --git a/demos/nested.html b/demos/nested.html
@@ -72,7 +72,7 @@
 
 	<script type="text/javascript" src="js/jquery.js"></script>
 	<script type="text/javascript" src="js/jquery-ui.js"></script>
-	<script type="text/javascript" src="../source/stable/jquery.layout.js"></script>
+	<script type="text/javascript" src="../source/stable/jquery.layout_and_plugins.js"></script>
 
 	<script type="text/javascript">
 

diff --git a/demos/tabs_basic.html b/demos/tabs_basic.html
@@ -29,7 +29,7 @@
 	<!--<script src="js/jquery-2.js"></script>-->
 	<script src="js/jquery.js"></script>
 	<script src="js/jquery-ui.js"></script>
-	<script src="../source/stable/jquery.layout.js"></script>
+	<script src="../source/stable/jquery.layout_and_plugins.js"></script>
 
     <script src="js/themeswitchertool.js"></script> 
 

diff --git a/dist/jquery.layout_and_plugins.js b/dist/jquery.layout_and_plugins.js
@@ -3834,14 +3834,17 @@
                     ;
                     if (pane === "center")
                         return; // validate
-                    if (s.isClosed || s.isResizing)
+                    if (s.isClosed || s.isResizing) {
                          // skip if already closed OR in process of resizing
+                    }
                     else if (o.slideTrigger_close === "click")
                         close_NOW(); // close immediately onClick
-                    else if (o.preventQuickSlideClose && s.isMoving)
+                    else if (o.preventQuickSlideClose && s.isMoving) {
                          // handle Chrome quick-close on slide-open
-                    else if (o.preventPrematureSlideClose && evt && $.layout.isMouseOverElem(evt, $Ps[pane]))
+                    }
+                    else if (o.preventPrematureSlideClose && evt && $.layout.isMouseOverElem(evt, $Ps[pane])) {
                          // handle incorrect mouseleave trigger, like when over a SELECT-list in IE
+                    }
                     else if (evt) // trigger = mouseleave - use a delay
                     // 1 sec delay if 'opening', else .3 sec
                         timer.set(pane + "_closeSlider", close_NOW, max(o.slideDelay_close, delay));

diff --git a/dist/jquery.layout_and_plugins.min.js b/dist/jquery.layout_and_plugins.min.js
diff --git a/source/stable/jquery.layout_and_plugins.js b/source/stable/jquery.layout_and_plugins.js
@@ -3834,14 +3834,17 @@
                     ;
                     if (pane === "center")
                         return; // validate
-                    if (s.isClosed || s.isResizing)
+                    if (s.isClosed || s.isResizing) {
                          // skip if already closed OR in process of resizing
+                    }
                     else if (o.slideTrigger_close === "click")
                         close_NOW(); // close immediately onClick
-                    else if (o.preventQuickSlideClose && s.isMoving)
+                    else if (o.preventQuickSlideClose && s.isMoving) {
                          // handle Chrome quick-close on slide-open
-                    else if (o.preventPrematureSlideClose && evt && $.layout.isMouseOverElem(evt, $Ps[pane]))
+                    }
+                    else if (o.preventPrematureSlideClose && evt && $.layout.isMouseOverElem(evt, $Ps[pane])) {
                          // handle incorrect mouseleave trigger, like when over a SELECT-list in IE
+                    }
                     else if (evt) // trigger = mouseleave - use a delay
                     // 1 sec delay if 'opening', else .3 sec
                         timer.set(pane + "_closeSlider", close_NOW, max(o.slideDelay_close, delay));

diff --git a/source/stable/jquery.layout_and_plugins.min.js b/source/stable/jquery.layout_and_plugins.min.js