Jelajahi Sumber

#3783 - Minor fixes

roman.lesnikov@gmail.com 4 tahun lalu
induk
melakukan
73f56bfbbb

+ 27 - 25
modules/boonex/decorous/data/template/system/_header_js_toolbar.html

@@ -1,30 +1,32 @@
 <script type="text/javascript" language="javascript">
     $(document).ready(function () {
-        var mq = bx_check_mq();
-        if (mq != 'mobile')
-            $("#bx-logo-container").prependTo("#bx-sliding-menu-sys_site .bx-sliding-menu-main-cnt");
-	
-        if(mq == 'mobile') {
-            // hide toolbar on scrolldown, show - on scroll up
-            new Headroom($('#bx-toolbar').get(0), {
-                tolerance: {
-                    down: 10,
-                    up: 20
-                },
-                offset: 200,
-                classes: {
-                    initial: "bx-toolbar-anim",
-                    pinned: "bx-toolbar-reset",
-                    unpinned: "bx-toolbar-up"
-                },
-                onUnpin: function() {
-                    bx_menu_slide_close_all_opened();
+		if (aDolOptions.sys_fixed_header !== undefined && aDolOptions.sys_fixed_header != 'on'){
+			var mq = bx_check_mq();
+			if (mq != 'mobile')
+				$("#bx-logo-container").prependTo("#bx-sliding-menu-sys_site .bx-sliding-menu-main-cnt");
 
-                    var sidebar = $('.cd-side-nav');
-                    if(sidebar.hasClass('nav-is-visible'))
-                        sidebar.toggleClass('nav-is-visible');
-                }
-            }).init();
-        }
+			if(mq == 'mobile') {
+				// hide toolbar on scrolldown, show - on scroll up
+				new Headroom($('#bx-toolbar').get(0), {
+					tolerance: {
+						down: 10,
+						up: 20
+					},
+					offset: 200,
+					classes: {
+						initial: "bx-toolbar-anim",
+						pinned: "bx-toolbar-reset",
+						unpinned: "bx-toolbar-up"
+					},
+					onUnpin: function() {
+						bx_menu_slide_close_all_opened();
+
+						var sidebar = $('.cd-side-nav');
+						if(sidebar.hasClass('nav-is-visible'))
+							sidebar.toggleClass('nav-is-visible');
+					}
+				}).init();
+			}
+		}
     });
 </script>

+ 28 - 27
modules/boonex/lucid/data/template/system/_header_js_toolbar.html

@@ -2,34 +2,35 @@
     var iToolbarSubmenuTopOffset = -2;
 
     $(document).ready(function () {
+		if (aDolOptions.sys_fixed_header !== undefined && aDolOptions.sys_fixed_header != 'on'){
+			// hide toolbar on scrolldown, show - on scroll up
+			new Headroom($('#bx-toolbar').get(0), {
+				tolerance: {
+					down: 10,
+					up: 20
+				},
+				offset: 200,
+				classes: {
+					initial: "bx-toolbar-anim",
+					pinned: "bx-toolbar-reset",
+					unpinned: "bx-toolbar-up"
+				},
+				onUnpin: function() {
+					bx_menu_slide_close_all_opened();
+				}
+			}).init();
 
-        // hide toolbar on scrolldown, show - on scroll up
-        new Headroom($('#bx-toolbar').get(0), {
-            tolerance: {
-                down: 10,
-                up: 20
-            },
-            offset: 200,
-            classes: {
-                initial: "bx-toolbar-anim",
-                pinned: "bx-toolbar-reset",
-                unpinned: "bx-toolbar-up"
-            },
-            onUnpin: function() {
-                bx_menu_slide_close_all_opened();
-            }
-        }).init();
+			var mq = bx_check_mq();
+			if(mq == 'mobile') {
+				//process submenu in top menu
+				$('.bx-menu-floating-blocks-big:visible > li:has(.bx-sliding-smenu-submenu) > a').bind('click', function() {
+					var sActive = 'bx-sliding-smenu-tab-active';
+					$(this).parents('.bx-menu-floating-blocks-big:visible:first').find('li.' + sActive).removeClass(sActive);
+					$(this).parent('li:first').toggleClass(sActive);
 
-        var mq = bx_check_mq();
-        if(mq == 'mobile') {
-            //process submenu in top menu
-            $('.bx-menu-floating-blocks-big:visible > li:has(.bx-sliding-smenu-submenu) > a').bind('click', function() {
-                var sActive = 'bx-sliding-smenu-tab-active';
-                $(this).parents('.bx-menu-floating-blocks-big:visible:first').find('li.' + sActive).removeClass(sActive);
-                $(this).parent('li:first').toggleClass(sActive);
-
-                return false;
-            });
-        }
+					return false;
+				});
+			}
+		}
     });
 </script>

+ 20 - 18
template/_header_js_toolbar.html

@@ -1,22 +1,24 @@
 <script language="javascript">
     $(document).ready(function () {
-        // hide toolbar on scrolldown, show - on scroll up
-        var oToolbar = $('#bx-toolbar');
-        if(oToolbar && oToolbar.length > 0)
-            new Headroom(oToolbar.get(0), {
-                tolerance: {
-                    down: 10,
-                    up: 20
-                },
-                offset: 200,
-                classes: {
-                    initial: "bx-toolbar-anim",
-                    pinned: "bx-toolbar-reset",
-                    unpinned: "bx-toolbar-up"
-                },
-                onUnpin: function() {
-                    bx_menu_slide_close_all_opened();
-                }
-            }).init();
+		if (aDolOptions.sys_fixed_header !== undefined && aDolOptions.sys_fixed_header != 'on'){
+			// hide toolbar on scrolldown, show - on scroll up
+			var oToolbar = $('#bx-toolbar');
+			if(oToolbar && oToolbar.length > 0)
+				new Headroom(oToolbar.get(0), {
+					tolerance: {
+						down: 10,
+						up: 20
+					},
+					offset: 200,
+					classes: {
+						initial: "bx-toolbar-anim",
+						pinned: "bx-toolbar-reset",
+						unpinned: "bx-toolbar-up"
+					},
+					onUnpin: function() {
+						bx_menu_slide_close_all_opened();
+					}
+				}).init();
+		}
     });
 </script>