Move inline script to menu.js

t3framework · Feb 2, 2013 · 3603e2c · 3603e2c
1 parent eef13b3
commit 3603e2c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/source/plg_system_t3/base/js/menu.js b/source/plg_system_t3/base/js/menu.js
@@ -0,0 +1,32 @@
+/** 
+ *------------------------------------------------------------------------------
+ * @package       T3 Framework for Joomla!
+ *------------------------------------------------------------------------------
+ * @copyright     Copyright (C) 2004-2013 JoomlArt.com. All Rights Reserved.
+ * @license       GNU General Public License version 2 or later; see LICENSE.txt
+ * @authors       JoomlArt, JoomlaBamboo, (contribute to this project at github 
+ *                & Google group to become co-author)
+ * @Google group: https://groups.google.com/forum/#!forum/t3fw
+ * @Link:         https://github.com/t3framework/ 
+ *------------------------------------------------------------------------------
+ */
+
+!function($){		
+	var isTouch = 'ontouchstart' in window && !(/hp-tablet/gi).test(navigator.appVersion);
+
+	if(!isTouch{
+		$(document).ready(function($){
+			$('.nav > li').hover(function(event) {
+				var $this = $(this);
+				clearTimeout ($this.data('hoverTimeout'));
+				$this.addClass ('open');
+			},
+			function(event) {
+				var $this = $(this);
+				$this.data('hoverTimeout', 
+					setTimeout(function(){$this.removeClass ('open')}, 100));
+			});
+		});
+	}
+
+}(jQuery);
diff --git a/source/plg_system_t3/includes/core/template.php b/source/plg_system_t3/includes/core/template.php
@@ -470,6 +470,12 @@ function addHead () {
 		$this->addScript (T3_URL.'/js/touch.js');
 		$this->addScript (T3_URL.'/js/script.js');
 
+		//menu control script
+		if ($this->getParam ('navigation_trigger') == 'hover'){
+			$this->addScript (T3_URL.'/js/menu.js');
+		}
+
+		//reponsive script
 		if ($responsive) {
 			$this->addScript (T3_URL.'/js/responsive.js');
 		}

diff --git a/source/tpl_t3_blank/tpls/blocks/mainnav.php b/source/tpl_t3_blank/tpls/blocks/mainnav.php
@@ -29,21 +29,4 @@
     </div>
   </div>
 </nav>
-
-<?php if ($this->getParam ('navigation_trigger') == 'hover') :?>
-  <script type="text/javascript">
-    jQuery(document).ready(function($){
-      $('.nav > li').hover(function(event) {
-          var $this = $(this);
-          clearTimeout ($this.data('hoverTimeout'));
-          $this.addClass ('open');
-      },
-      function(event) {
-          var $this = $(this);
-          $this.data('hoverTimeout', 
-              setTimeout(function(){$this.removeClass ('open')}, 100));
-      });
-    });
-  </script>
-<?php endif ?>
 <!-- //MAIN NAVIGATION -->