merging

app/assets/javascripts/desktop.js

@@ -16,3 +16,4 @@
 //= require orbitdesktop
 //= require jquery.gridster
 //= require desktop/books_pages
+//= require jquery.tokeninput

app/assets/javascripts/orbitdesktop.js

@@ -310,11 +310,16 @@ var orbitDesktop = function(dom){
     column_container.empty();
     $("div[container=true]").html(h);
     $("div[container=true] div.overview").html(temp_div.html());
-    o.tinyscrollbar_ext({
-      main : ".tinycanvas",
-      fill : base_width * total_columns
-    })
-    
+    if(isNaN(base_width)){
+       o.tinyscrollbar_ext({
+        main : ".tinycanvas",
+      })
+    }else{
+      o.tinyscrollbar_ext({
+        main : ".tinycanvas",
+        fill : base_width * total_columns
+      })
+    }
   }
   this.menu_item = function(dom,customload,submenuitem){
     if(!customload)customload=false;
@@ -395,8 +400,21 @@ var orbitDesktop = function(dom){
               
             // })
           }
-          $('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
-          dom.addClass('thmc1 thmtxt active');
+          // $('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
+          // dom.addClass('thmc1 thmtxt active');
+          o.highlight_sub_menu_item(dom);
+    }
+    this.highlight_sub_menu_item = function(no){
+      $('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
+      var dom;
+      if(typeof no == "number"){
+        dom = $('*[content-type=menu] a').eq(no);
+        dom.addClass('thmc1 thmtxt active');
+      }else if(typeof no == "object"){
+        dom = no;
+        dom.addClass('thmc1 thmtxt active');
+      }
+      return dom;
     }
 
   this.initializeDesktop = function(target,url,cache){ //this is for initializing main desktops that are sections and tiles