diff --git a/Gemfile.lock b/Gemfile.lock index e3427b5c6..b104ef3ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -234,7 +234,6 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.0.3) - rb-readline (0.4.2) rdoc (3.12.1) json (~> 1.4) redis (3.0.2) @@ -244,7 +243,6 @@ GEM chinese_pinyin (>= 0.3.0) redis (>= 2.1.1) redis-namespace (>= 1.0.2) - ref (1.0.2) resque (1.23.0) multi_json (~> 1.0) redis-namespace (~> 1.0) @@ -330,9 +328,6 @@ GEM sunspot (= 1.3.3) sunspot_solr (1.3.3) terminal-table (1.4.5) - therubyracer (0.11.4) - libv8 (~> 3.11.8.12) - ref thor (0.17.0) tilt (1.3.3) tinymce-rails (3.5.8) @@ -378,7 +373,6 @@ DEPENDENCIES jquery-rails (= 2.1.4) jquery-ui-rails kaminari! - libv8 (~> 3.11.8) mime-types mini_magick mongo_session_store-rails3 (= 3.0.6) @@ -395,7 +389,6 @@ DEPENDENCIES radius rails (~> 3.2.9) rake - rb-readline redis (>= 2.1.1) redis-namespace redis-search @@ -417,7 +410,6 @@ DEPENDENCIES sunspot-rails-tester sunspot_mongo sunspot_solr - therubyracer tinymce-rails uglifier watchr diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 3bf5f91e8..33217d250 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -604,12 +604,12 @@ var orbitDesktop = function(dom){ // } // } // }); - + o.simple_drop_down(); o.tinyscrollbar_ext({ main: '.tinycanvas' }) - o.simple_drop_down(); + // $("div#group_wrapper ul li[data-category=app]").click(function(){ // o.appWindow({ // title : $(this).find("a").attr("href"), @@ -1441,7 +1441,8 @@ var orbitDesktop = function(dom){ } var settings = {"axis":"x"}; - $.map(tinysettings,function(val,i){ settings[i] = val }) + if(typeof tinysettings != "undefined") + $.map(tinysettings,function(val,i){ settings[i] = val }) var count,baseWidth,fillArray,pxs; if( typeof target.fill == 'string' ){