developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compatibility page added and tinyscrollbar drag event fixed..

This commit is contained in:
Harry Bomrah 2013-03-12 15:23:38 +08:00 committed by Matt K. Fu
parent df220397b2
commit f9e7cefc94
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile.lock
View File

@ -234,7 +234,6 @@ GEM
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rake (10.0.3) rake (10.0.3)
rb-readline (0.4.2)
rdoc (3.12.1) rdoc (3.12.1)
json (~> 1.4) json (~> 1.4)
redis (3.0.2) redis (3.0.2)
@ -244,7 +243,6 @@ GEM
chinese_pinyin (>= 0.3.0) chinese_pinyin (>= 0.3.0)
redis (>= 2.1.1) redis (>= 2.1.1)
redis-namespace (>= 1.0.2) redis-namespace (>= 1.0.2)
ref (1.0.2)
resque (1.23.0) resque (1.23.0)
multi_json (~> 1.0) multi_json (~> 1.0)
redis-namespace (~> 1.0) redis-namespace (~> 1.0)
@ -330,9 +328,6 @@ GEM
sunspot (= 1.3.3) sunspot (= 1.3.3)
sunspot_solr (1.3.3) sunspot_solr (1.3.3)
terminal-table (1.4.5) terminal-table (1.4.5)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thor (0.17.0) thor (0.17.0)
tilt (1.3.3) tilt (1.3.3)
tinymce-rails (3.5.8) tinymce-rails (3.5.8)
@ -378,7 +373,6 @@ DEPENDENCIES
jquery-rails (= 2.1.4) jquery-rails (= 2.1.4)
jquery-ui-rails jquery-ui-rails
kaminari! kaminari!
libv8 (~> 3.11.8)
mime-types mime-types
mini_magick mini_magick
mongo_session_store-rails3 (= 3.0.6) mongo_session_store-rails3 (= 3.0.6)
@ -395,7 +389,6 @@ DEPENDENCIES
radius radius
rails (~> 3.2.9) rails (~> 3.2.9)
rake rake
rb-readline
redis (>= 2.1.1) redis (>= 2.1.1)
redis-namespace redis-namespace
redis-search redis-search
@ -417,7 +410,6 @@ DEPENDENCIES
sunspot-rails-tester sunspot-rails-tester
sunspot_mongo sunspot_mongo
sunspot_solr sunspot_solr
therubyracer
tinymce-rails tinymce-rails
uglifier uglifier
watchr watchr

5
app/assets/javascripts/orbitdesktop.js
View File

@ -604,12 +604,12 @@ var orbitDesktop = function(dom){
// } // }
// } // }
// }); // });
o.simple_drop_down();
o.tinyscrollbar_ext({ o.tinyscrollbar_ext({
main: '.tinycanvas' main: '.tinycanvas'
}) })
o.simple_drop_down();
// $("div#group_wrapper ul li[data-category=app]").click(function(){ // $("div#group_wrapper ul li[data-category=app]").click(function(){
// o.appWindow({ // o.appWindow({
// title : $(this).find("a").attr("href"), // title : $(this).find("a").attr("href"),
@ -1441,6 +1441,7 @@ var orbitDesktop = function(dom){
} }
var settings = {"axis":"x"}; var settings = {"axis":"x"};
if(typeof tinysettings != "undefined")
$.map(tinysettings,function(val,i){ settings[i] = val }) $.map(tinysettings,function(val,i){ settings[i] = val })
var count,baseWidth,fillArray,pxs; var count,baseWidth,fillArray,pxs;