removed turbolinks & fixed grids js

tekvision · Apr 5, 2014 · cbb9e6d · cbb9e6d
1 parent 69aadad
commit cbb9e6d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -19,7 +19,7 @@ gem 'therubyracer', platforms: :ruby
 gem 'jquery-rails'
 
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
+#gem 'turbolinks'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -236,8 +236,6 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (1.3.0)
-      coffee-rails
     tzinfo (0.3.39)
     uglifier (2.5.0)
       execjs (>= 0.3.0)
@@ -282,5 +280,4 @@ DEPENDENCIES
   simple_form
   simplecov
   therubyracer
-  turbolinks
   uglifier (>= 2.5.0)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -13,6 +13,5 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery_nested_form
-//= require turbolinks
 //= require bootstrap
 //= require_tree .
diff --git a/app/assets/javascripts/grid.js b/app/assets/javascripts/grid.js
@@ -26,7 +26,7 @@ function navigateGrid(e) {
   var tab;
   var key = new keyCodes();
   var activeElement = $(":focus");
-  var elementIndex;
+
   switch(e.keyCode) {
     case key.tab: {
       if(tab==null) {
@@ -36,28 +36,29 @@ function navigateGrid(e) {
       break;
     }
     case key.right: {
-      if(activeElement.next.length != 0) {
-        activeElement.next().focus();
+      if(activeElement.parent().next.length != 0) {
+        activeElement.parent().next().children().focus();
       }
 break;
     }
     case key.left: {
-      if(activeElement.prev.length != 0) {
-        activeElement.prev().focus();
+      if(activeElement.parent().prev.length != 0) {
+        activeElement.parent().prev().children().focus();
       }
       break;
     }
     case key.up: {
-      pElement = activeElement.parent().prev();
+      pElement = activeElement.parent().parent().prev();
       if(pElement != "") {
-        pElement.children().eq(activeElement.index()).focus();
+        pElement.children().eq(activeElement.parent().index()).children().focus();
       }
       break;
     }
     case key.down: {
-      nElement = activeElement.parent().next();
+      nElement = activeElement.parent().parent().next();
+      console.log(activeElement)
       if(nElement != "") {
-        nElement.children().eq(activeElement.index()).focus();
+        nElement.children().eq(activeElement.parent().index()).children().focus();
       }
       break;
     }