diff --git a/Gemfile.lock b/Gemfile.lock
index 93e49c01b..703f9d919 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,7 +141,6 @@ GEM
jquery-rails
railties (>= 3.1.0)
json (1.7.7)
- libv8 (3.11.8.13)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -225,7 +224,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)
@@ -235,7 +233,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)
@@ -319,9 +316,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)
@@ -366,7 +360,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)
@@ -383,7 +376,6 @@ DEPENDENCIES
radius
rails (~> 3.2.9)
rake
- rb-readline
redis (>= 2.1.1)
redis-namespace
redis-search
@@ -405,7 +397,6 @@ DEPENDENCIES
sunspot-rails-tester
sunspot_mongo
sunspot_solr
- therubyracer
tinymce-rails
uglifier
watchr
diff --git a/app/assets/javascripts/jquery.tinyscrollbar.js b/app/assets/javascripts/jquery.tinyscrollbar.js
index d0e843c6e..125c89d4a 100644
--- a/app/assets/javascripts/jquery.tinyscrollbar.js
+++ b/app/assets/javascripts/jquery.tinyscrollbar.js
@@ -217,6 +217,7 @@
oContent.obj.css( sDirection, -iScroll );
oThumb.obj.css( sDirection, iPosition.now );
}
+ options.onMove.call(this,get_destance_from_end());
}
function end()
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' ){
diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb
index cf732c5a6..c995689d3 100644
--- a/app/controllers/desktop_controller.rb
+++ b/app/controllers/desktop_controller.rb
@@ -10,6 +10,10 @@ class DesktopController< ApplicationController
@title = "Desktop - " + @currentusername
@section = @desktop.sections.first
end
+
+ def compatibility
+ render :layout => "compatibility"
+ end
def desktop
render :layout => false
diff --git a/app/views/desktop/compatibility.html.erb b/app/views/desktop/compatibility.html.erb
new file mode 100644
index 000000000..94f6d7ee8
--- /dev/null
+++ b/app/views/desktop/compatibility.html.erb
@@ -0,0 +1 @@
+You have a bad browser ...!!!
\ No newline at end of file
diff --git a/app/views/layouts/compatibility.html.erb b/app/views/layouts/compatibility.html.erb
new file mode 100644
index 000000000..a8c0f9ecb
--- /dev/null
+++ b/app/views/layouts/compatibility.html.erb
@@ -0,0 +1,15 @@
+
+
+
+
+ Error
+ <%= stylesheet_link_tag "desktop" %>
+ <%= yield :page_specific_css %>
+
+ <%= csrf_meta_tag %>
+
+
+ <%= render 'layouts/orbit_bar' %>
+ <%= yield %>
+
+
diff --git a/app/views/layouts/desktop.html.erb b/app/views/layouts/desktop.html.erb
index 628c0b3f0..2d14d5115 100644
--- a/app/views/layouts/desktop.html.erb
+++ b/app/views/layouts/desktop.html.erb
@@ -1,6 +1,13 @@
+
+
+
<%= @title || APP_CONFIG['orbit'] %>