Merge branch 'develop' of github.com:octobercms/october into develop

CHANGELOG.md

@@ -1,3 +1,6 @@
+* **Build 17x** (2015-01-xx)
+  - The collapsed back-end side navigation now has a less annoying 200ms delay.
+
 * **Build 175** (2015-01-13)
   - The variable `errors` will be included in a CMS page when redirecting via `Redirect::withErrors($validator)`.
   - Added new utility command for compiling back-end assets `october:util compile [assets|js|less]`.

modules/backend/assets/js/october-min.js

@@ -1073,9 +1073,11 @@ this.init()}
 SidePanelTab.prototype.init=function(){var self=this
 this.tabOpenDelay=200
 this.tabOpenTimeout=undefined
-this.$sideNavItems=$('#layout-sidenav ul li')
+this.panelOpenTimeout=undefined
+this.$sideNav=$('#layout-sidenav')
+this.$sideNavItems=$('ul li',this.$sideNav)
 this.$sidePanelItems=$('[data-content-id]',this.$el)
-this.sideNavWidth=$('#layout-sidenav ul li').outerWidth()
+this.sideNavWidth=this.$sideNavItems.outerWidth()
 this.mainNavHeight=$('#layout-mainmenu').outerHeight()
 this.panelVisible=false
 this.visibleItemId=false
@@ -1088,8 +1090,8 @@ return}else
 self.displaySidePanel()}
 self.displayTab(this)
 return false})
-if(!Modernizr.touch){$('#layout-sidenav').mouseenter(function(){if($(window).width()<self.options.breakpoint||!self.panelFixed())
-self.displaySidePanel()})
+if(!Modernizr.touch){self.$sideNav.mouseenter(function(){if($(window).width()<self.options.breakpoint||!self.panelFixed()){self.panelOpenTimeout=setTimeout(function(){self.displaySidePanel()},self.tabOpenDelay)}})
+self.$sideNav.mouseleave(function(){clearTimeout(self.panelOpenTimeout)})
 self.$el.mouseleave(function(){self.hideSidePanel()})
 self.$sideNavItems.mouseenter(function(){if($(window).width()<self.options.breakpoint||!self.panelFixed()){var _this=this
 self.tabOpenTimeout=setTimeout(function(){self.displayTab(_this)},self.tabOpenDelay)}})

modules/backend/assets/js/october.sidepaneltab.js

@@ -14,9 +14,11 @@
         var self = this
         this.tabOpenDelay = 200
         this.tabOpenTimeout = undefined
-        this.$sideNavItems = $('#layout-sidenav ul li')
+        this.panelOpenTimeout = undefined
+        this.$sideNav = $('#layout-sidenav')
+        this.$sideNavItems = $('ul li', this.$sideNav)
         this.$sidePanelItems = $('[data-content-id]', this.$el)
-        this.sideNavWidth = $('#layout-sidenav ul li').outerWidth()
+        this.sideNavWidth = this.$sideNavItems.outerWidth()
         this.mainNavHeight = $('#layout-mainmenu').outerHeight()
         this.panelVisible = false
         this.visibleItemId = false
@@ -43,9 +45,16 @@
         })
 
         if (!Modernizr.touch) {
-            $('#layout-sidenav').mouseenter(function(){
-               if ($(window).width() < self.options.breakpoint || !self.panelFixed())
-                    self.displaySidePanel()
+            self.$sideNav.mouseenter(function(){
+               if ($(window).width() < self.options.breakpoint || !self.panelFixed()) {
+                    self.panelOpenTimeout = setTimeout(function () {
+                        self.displaySidePanel()
+                    }, self.tabOpenDelay)
+               }
+            })
+
+            self.$sideNav.mouseleave(function(){
+                clearTimeout(self.panelOpenTimeout)
             })
 
             self.$el.mouseleave(function(){