Merge branch 'auto-collaps-for-kmapsTree-fix-typeahead-hint-css/MANU-…

…5257/drc2r'
shanti-uva · Sep 12, 2018 · b464628 · b464628
2 parents 175d5f5 + a613144
commit b464628
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/assets/javascripts/kmaps_engine/jquery.kmapstree.js b/app/assets/javascripts/kmaps_engine/jquery.kmapstree.js
@@ -30,7 +30,8 @@
             // baseUrl: "http://subjects.kmaps.virginia.edu/"
             sortNodes: true,
             sortNodesBy: "header",
-            view: ""
+            view: "",
+            autoCollapse: false
         };
 
     // copied from jquery.fancytree.js to support moved loadKeyPath function
@@ -125,6 +126,7 @@
                 quicksearch: false,
                 checkbox: false,
                 selectMode: 2,
+                autoCollapse: plugin.settings.autoCollapse,
                 minExpandLevel: 1, // TODO: reconcile this with lazy loading.  Only "1" is supported currently.
                 theme: 'bootstrap',
                 debugLevel: 0,
@@ -1005,4 +1007,4 @@
     };
 
 
-})(jQuery, window, document);
+})(jQuery, window, document);
diff --git a/app/assets/stylesheets/kmaps_engine/kmaps_typeahead.css.scss b/app/assets/stylesheets/kmaps_engine/kmaps_typeahead.css.scss
@@ -11,3 +11,6 @@
  *= require kmaps_typeahead/kmaps-typeahead
  */
 
+.advanced-view .kmaps-tt-hint{
+  padding-left: 30px;
+}
diff --git a/lib/kmaps_engine/version.rb b/lib/kmaps_engine/version.rb
@@ -1,3 +1,3 @@
 module KmapsEngine
-  VERSION = '5.3.3'
+  VERSION = '5.3.4'
 end