Update: Improve TouchScreen Support

garysharp · garysharp · commit 760aba9cdf2e · 2013-07-26T00:04:31.000+10:00
diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.1725")]
-[assembly: AssemblyFileVersion("1.2.0725.1725")]
+[assembly: AssemblyVersion("1.2.0725.2249")]
+[assembly: AssemblyFileVersion("1.2.0725.2249")]
diff --git a/Disco.Client/Properties/AssemblyInfo.cs b/Disco.Client/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.1725")]
-[assembly: AssemblyFileVersion("1.2.0725.1725")]
+[assembly: AssemblyVersion("1.2.0725.2102")]
+[assembly: AssemblyFileVersion("1.2.0725.2102")]
diff --git a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.1725")]
-[assembly: AssemblyFileVersion("1.2.0725.1725")]
+[assembly: AssemblyVersion("1.2.0725.2102")]
+[assembly: AssemblyFileVersion("1.2.0725.2102")]
diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.1725")]
-[assembly: AssemblyFileVersion("1.2.0725.1725")]
+[assembly: AssemblyVersion("1.2.0725.2249")]
+[assembly: AssemblyFileVersion("1.2.0725.2249")]
diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.1725")]
-[assembly: AssemblyFileVersion("1.2.0725.1725")]
+[assembly: AssemblyVersion("1.2.0725.2249")]
+[assembly: AssemblyFileVersion("1.2.0725.2249")]
diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.1725")]
-[assembly: AssemblyFileVersion("1.2.0725.1725")]
+[assembly: AssemblyVersion("1.2.0725.2249")]
+[assembly: AssemblyFileVersion("1.2.0725.2249")]
diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0725.1725")]
-[assembly: AssemblyFileVersion("1.2.0725.1725")]
+[assembly: AssemblyVersion("1.2.0725.2249")]
+[assembly: AssemblyFileVersion("1.2.0725.2249")]
diff --git a/Disco.Web/ClientSource/Scripts/Core.js b/Disco.Web/ClientSource/Scripts/Core.js
@@ -39599,54 +39599,70 @@ jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, -1], [10, 20, 50, "All"
 
         // Menu Functionality
         var $menu = $('#menu');
-        var $menuSubVisible = [];
-        $menu.find('li').each(function () {
-            var $menuItem = $(this);
-            var $subMenu = $menuItem.children('ul').first();
-            if ($subMenu.length > 0) {
-                $menuItem.mouseover(function () {
-                    menuShow($menuItem, $subMenu);
-                }).mouseout(function () {
-                    menuHide($menuItem, $subMenu);
-                }).addClass('hasSubmenu');
-
-                // Touch-enabled browser
-                if (Modernizr.touch) {
-                    $menuItem.on('touchstart', function (e) {
-                        // Already Open - allow 'click'
-                        for (var i = 0; i < $menuSubVisible.length; i++)
-                            if ($menuSubVisible[0] === $subMenu)
-                                return;
-
-                        // Show
-                        menuShow($menuItem, $subMenu);
-                        $menuSubVisible.push($subMenu);
-                        $(document).on('click', menuTouchHide)
-                        e.preventDefault();
-                    });
-                }
-            };
-        });
-        function menuTouchHide() {
-            while ($menuSubVisible.length > 0) {
-                var $subMenu = $menuSubVisible.pop();
-                $subMenu.hide();
-            }
-        }
-        function menuShow($menuItem, $subMenu) {
-            var timeoutToken = $menuItem.data('menuTimeoutToken');
-            if (timeoutToken)
-                window.clearTimeout(timeoutToken);
-            if (!$subMenu.is(':visible'))
+        var $menuItems = $menu.find('li');
+        var $menuItemParents = $menuItems.filter('.hasSubMenu');
+        var $menuSubMenus = $menuItems.filter('.subMenu');
+        var menuAllowTouchNavigation = null;
+
+        $menuItemParents.each(function () {
+            var $parent = $(this);
+            var $subMenu = $parent.children('ul.subMenu');
+            $parent.data('menuSubMenu', $subMenu);
+        }).mouseover(function () {
+            var $parent = $(this);
+            var $subMenu = $parent.data('menuSubMenu');
+            var hideToken = $parent.data('menuHideToken');
+            if (hideToken)
+                window.clearTimeout(hideToken);
+            if (!$subMenu.is(':visible')) {
                 $subMenu.show();
-        }
-        function menuHide($menuItem, $subMenu) {
-            var timeoutToken = subMenuHideToken = window.setTimeout(function () {
+                if (menuAllowTouchNavigation !== null)
+                    menuTouchPreventNavigation();
+            }
+        }).mouseout(function () {
+            var $parent = $(this);
+            var $subMenu = $parent.data('menuSubMenu');
+            var hideToken = window.setTimeout(function () {
                 $subMenu.hide();
             }, 250);
-            $menuItem.data('menuTimeoutToken', timeoutToken);
+            $parent.data('menuHideToken', hideToken);
+        });
+
+        if (Modernizr.touch) {
+            menuAllowTouchNavigation = true;
+            $menuItemParents.children('a').on('touchstart', menuTouchStarted);
+        } else if (window.navigator.msPointerEnabled) {
+            menuAllowTouchNavigation = true;
+            $menuItemParents.children('a').on('MSPointerUp', menuTouchMSPointerUp);
+        }
+        function menuTouchPreventNavigation() {
+            // Block Touch Navigation for 350ms
+            allowTouchNavigation = false;
+            window.setTimeout(function () {
+                allowTouchNavigation = true;
+            }, 350);
         }
+        function menuTouchNavigationBlockClick(e) {
+            $(this).off('click', menuTouchNavigationBlockClick);
+            e.preventDefault();
+        }
+        //#region TouchEvents Implementation
+        function menuSubMenuVisible($element) {
+            return $element.closest('li').data('menuSubMenu').is(':visible');
+        }
+        function menuTouchStarted(e) {
+            var $this = $(this);
+            if (!menuSubMenuVisible($this))
+                $this.click(menuTouchNavigationBlockClick);
+        }
+        //#endregion
 
+        //#region MS Pointer Implementation
+        function menuTouchMSPointerUp(e) {
+            if (!allowTouchNavigation && e.originalEvent.pointerType == e.originalEvent.MSPOINTER_TYPE_TOUCH)
+                $(this).click(menuTouchNavigationBlockClick);
+        }
+        //#endregion
 
     });
 })(jQuery, window, document, Modernizr);
diff --git a/Disco.Web/ClientSource/Scripts/Core.min.js b/Disco.Web/ClientSource/Scripts/Core.min.js
diff --git a/Disco.Web/ClientSource/Scripts/Core.min.js.map b/Disco.Web/ClientSource/Scripts/Core.min.js.map
diff --git a/Disco.Web/ClientSource/Scripts/Core/disco.uicore.js b/Disco.Web/ClientSource/Scripts/Core/disco.uicore.js
@@ -14,54 +14,70 @@
 
         // Menu Functionality
         var $menu = $('#menu');
-        var $menuSubVisible = [];
-        $menu.find('li').each(function () {
-            var $menuItem = $(this);
-            var $subMenu = $menuItem.children('ul').first();
-            if ($subMenu.length > 0) {
-                $menuItem.mouseover(function () {
-                    menuShow($menuItem, $subMenu);
-                }).mouseout(function () {
-                    menuHide($menuItem, $subMenu);
-                }).addClass('hasSubmenu');
+        var $menuItems = $menu.find('li');
+        var $menuItemParents = $menuItems.filter('.hasSubMenu');
+        var $menuSubMenus = $menuItems.filter('.subMenu');
+        var menuAllowTouchNavigation = null;
 
-                // Touch-enabled browser
-                if (Modernizr.touch) {
-                    $menuItem.on('touchstart', function (e) {
-                        // Already Open - allow 'click'
-                        for (var i = 0; i < $menuSubVisible.length; i++)
-                            if ($menuSubVisible[0] === $subMenu)
-                                return;
-
-                        // Show
-                        menuShow($menuItem, $subMenu);
-                        $menuSubVisible.push($subMenu);
-                        $(document).on('click', menuTouchHide)
-                        e.preventDefault();
-                    });
-                }
-            };
-        });
-        function menuTouchHide() {
-            while ($menuSubVisible.length > 0) {
-                var $subMenu = $menuSubVisible.pop();
-                $subMenu.hide();
-            }
-        }
-        function menuShow($menuItem, $subMenu) {
-            var timeoutToken = $menuItem.data('menuTimeoutToken');
-            if (timeoutToken)
-                window.clearTimeout(timeoutToken);
-            if (!$subMenu.is(':visible'))
+        $menuItemParents.each(function () {
+            var $parent = $(this);
+            var $subMenu = $parent.children('ul.subMenu');
+            $parent.data('menuSubMenu', $subMenu);
+        }).mouseover(function () {
+            var $parent = $(this);
+            var $subMenu = $parent.data('menuSubMenu');
+            var hideToken = $parent.data('menuHideToken');
+            if (hideToken)
+                window.clearTimeout(hideToken);
+            if (!$subMenu.is(':visible')) {
                 $subMenu.show();
-        }
-        function menuHide($menuItem, $subMenu) {
-            var timeoutToken = subMenuHideToken = window.setTimeout(function () {
+                if (menuAllowTouchNavigation !== null)
+                    menuTouchPreventNavigation();
+            }
+        }).mouseout(function () {
+            var $parent = $(this);
+            var $subMenu = $parent.data('menuSubMenu');
+            var hideToken = window.setTimeout(function () {
                 $subMenu.hide();
             }, 250);
-            $menuItem.data('menuTimeoutToken', timeoutToken);
+            $parent.data('menuHideToken', hideToken);
+        });
+
+        if (Modernizr.touch) {
+            menuAllowTouchNavigation = true;
+            $menuItemParents.children('a').on('touchstart', menuTouchStarted);
+        } else if (window.navigator.msPointerEnabled) {
+            menuAllowTouchNavigation = true;
+            $menuItemParents.children('a').on('MSPointerUp', menuTouchMSPointerUp);
+        }
+        function menuTouchPreventNavigation() {
+            // Block Touch Navigation for 350ms
+            allowTouchNavigation = false;
+            window.setTimeout(function () {
+                allowTouchNavigation = true;
+            }, 350);
+        }
+        function menuTouchNavigationBlockClick(e) {
+            $(this).off('click', menuTouchNavigationBlockClick);
+            e.preventDefault();
         }
+        //#region TouchEvents Implementation
+        function menuSubMenuVisible($element) {
+            return $element.closest('li').data('menuSubMenu').is(':visible');
+        }
+        function menuTouchStarted(e) {
+            var $this = $(this);
+            if (!menuSubMenuVisible($this))
+                $this.click(menuTouchNavigationBlockClick);
+        }
+        //#endregion
 
+        //#region MS Pointer Implementation
+        function menuTouchMSPointerUp(e) {
+            if (!allowTouchNavigation && e.originalEvent.pointerType == e.originalEvent.MSPOINTER_TYPE_TOUCH)
+                $(this).click(menuTouchNavigationBlockClick);
+        }
+        //#endregion
 
     });
 })(jQuery, window, document, Modernizr);
diff --git a/Disco.Web/ClientSource/Style/BundleSite.css b/Disco.Web/ClientSource/Style/BundleSite.css
@@ -1377,8 +1377,8 @@ header nav ul#menu > li > ul li:hover,
 #header nav ul#menu > li > ul li:hover {
   background-color: rgba(249, 228, 210, 0.75);
 }
-header nav ul#menu > li > ul li.hasSubmenu,
-#header nav ul#menu > li > ul li.hasSubmenu {
+header nav ul#menu > li > ul li.hasSubMenu,
+#header nav ul#menu > li > ul li.hasSubMenu {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAAa0lEQVQoz2NgGBRg8uTJO4BYhxIDVgPxHyCeDcQS5BpiAcSHgfgzENcBMRe5BgUC8U0gfgrEiUDMRI4hLEBcA8T/gfgCqZolgLgb6pUDQOxArEY5IJ4CxN9J0gjVPBeIf5GsEckA8jQOCgAAAvdRUNet20oAAAAASUVORK5CYII=) /*Images/SubSubMenuIcon.png*/, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC) /*Images/SubMenuBackground.png*/;
   background-position: center right, top;
   background-repeat: no-repeat, repeat-x;
diff --git a/Disco.Web/ClientSource/Style/BundleSite.min.css b/Disco.Web/ClientSource/Style/BundleSite.min.css
diff --git a/Disco.Web/ClientSource/Style/Site.css b/Disco.Web/ClientSource/Style/Site.css
@@ -199,8 +199,8 @@ header nav ul#menu > li > ul li:hover,
 #header nav ul#menu > li > ul li:hover {
   background-color: rgba(249, 228, 210, 0.75);
 }
-header nav ul#menu > li > ul li.hasSubmenu,
-#header nav ul#menu > li > ul li.hasSubmenu {
+header nav ul#menu > li > ul li.hasSubMenu,
+#header nav ul#menu > li > ul li.hasSubMenu {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAAa0lEQVQoz2NgGBRg8uTJO4BYhxIDVgPxHyCeDcQS5BpiAcSHgfgzENcBMRe5BgUC8U0gfgrEiUDMRI4hLEBcA8T/gfgCqZolgLgb6pUDQOxArEY5IJ4CxN9J0gjVPBeIf5GsEckA8jQOCgAAAvdRUNet20oAAAAASUVORK5CYII=) /*Images/SubSubMenuIcon.png*/, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC) /*Images/SubMenuBackground.png*/;
   background-position: center right, top;
   background-repeat: no-repeat, repeat-x;
diff --git a/Disco.Web/ClientSource/Style/Site.less b/Disco.Web/ClientSource/Style/Site.less
@@ -144,7 +144,7 @@ header, #header
                         background-position: top;
                         background-repeat: repeat-x;
 
-                        &.hasSubmenu
+                        &.hasSubMenu
                         {
                             background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAAa0lEQVQoz2NgGBRg8uTJO4BYhxIDVgPxHyCeDcQS5BpiAcSHgfgzENcBMRe5BgUC8U0gfgrEiUDMRI4hLEBcA8T/gfgCqZolgLgb6pUDQOxArEY5IJ4CxN9J0gjVPBeIf5GsEckA8jQOCgAAAvdRUNet20oAAAAASUVORK5CYII=) /*Images/SubSubMenuIcon.png*/, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC) /*Images/SubMenuBackground.png*/;
                             background-position: center right, top;
diff --git a/Disco.Web/ClientSource/Style/Site.min.css b/Disco.Web/ClientSource/Style/Site.min.css
diff --git a/Disco.Web/Properties/AssemblyInfo.cs b/Disco.Web/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.0725.1725")]
-[assembly: AssemblyFileVersion("1.2.0725.1725")]
+[assembly: AssemblyVersion("1.2.0725.2249")]
+[assembly: AssemblyFileVersion("1.2.0725.2249")]
diff --git a/Disco.Web/Views/Shared/_Layout.cshtml b/Disco.Web/Views/Shared/_Layout.cshtml
@@ -28,13 +28,13 @@
             </div>
             <nav>
                 <ul id="menu">
-                    <li>@Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1")
-                        <ul>
+                    <li class="hasSubMenu">@Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1")
+                        <ul class="subMenu">
                             <li>@Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn())</li>
                             <li>@Html.ActionLink("Device Held Locations", MVC.Job.Locations())</li>
                             <li>@Html.ActionLink("Awaiting User Action", MVC.Job.AwaitingUserAction())</li>
-                            <li>@Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance())
-                                <ul>
+                            <li class="hasSubMenu">@Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance())
+                                <ul class="subMenu">
                                     <li>@Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge())</li>
                                     <li>@Html.ActionLink("Accounting Payment", MVC.Job.AwaitingFinancePayment())</li>
                                     <li>@Html.ActionLink("Agreement Breach", MVC.Job.AwaitingFinanceAgreementBreach())</li>
diff --git a/Disco.Web/Views/Shared/_Layout.generated.cs b/Disco.Web/Views/Shared/_Layout.generated.cs
