developers
/
orbit-4-1
Archived
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 401c75c0de
commit b8ee2fd559
7 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/jquery.tinyscrollbar.js
View File

@ -217,6 +217,7 @@
oContent.obj.css( sDirection, -iScroll ); oContent.obj.css( sDirection, -iScroll );
oThumb.obj.css( sDirection, iPosition.now ); oThumb.obj.css( sDirection, iPosition.now );
} }
options.onMove.call(this,get_destance_from_end());
} }
function end() function end()

7
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,7 +1441,8 @@ var orbitDesktop = function(dom){
} }
var settings = {"axis":"x"}; 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; var count,baseWidth,fillArray,pxs;
if( typeof target.fill == 'string' ){ if( typeof target.fill == 'string' ){

4
app/controllers/desktop_controller.rb
View File

@ -10,6 +10,10 @@ class DesktopController< ApplicationController
@title = "Desktop - " + @currentusername @title = "Desktop - " + @currentusername
@section = @desktop.sections.first @section = @desktop.sections.first
end end
def compatibility
render :layout => "compatibility"
end
def desktop def desktop
render :layout => false render :layout => false

1
app/views/desktop/compatibility.html.erb Normal file
View File

@ -0,0 +1 @@
You have a bad browser ...!!!

15
app/views/layouts/compatibility.html.erb Normal file
View File

@ -0,0 +1,15 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Error</title>
<%= stylesheet_link_tag "desktop" %>
<%= yield :page_specific_css %>
<%= csrf_meta_tag %>
</head>
<body>
<%= render 'layouts/orbit_bar' %>
<%= yield %>
</body>
</html>

7
app/views/layouts/desktop.html.erb
View File

@ -1,6 +1,13 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>
<head> <head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<noscript>
<meta http-equiv="refresh" content="0; URL=/compatibility">
</noscript>
<!--[if lte IE 8]>
<meta http-equiv="refresh" content="0; URL=/compatibility" />
<![endif]-->
<meta charset="utf-8"> <meta charset="utf-8">
<title><%= @title || APP_CONFIG['orbit'] %></title> <title><%= @title || APP_CONFIG['orbit'] %></title>
<!--[if lt IE 9]> <!--[if lt IE 9]>

1
config/routes.rb
View File

@ -187,6 +187,7 @@ Orbit::Application.routes.draw do
end end
end end
match "compatibility" => "desktop#compatibility"
match "desktop" => "desktop#index" match "desktop" => "desktop#index"
match "/desktop/desktop" => "desktop#desktop" match "/desktop/desktop" => "desktop#desktop"
match '/desktop/desktop'=>'desktop#desktop' match '/desktop/desktop'=>'desktop#desktop'