compatibility page added and tinyscrollbar drag event fixed..
This commit is contained in:
parent
401c75c0de
commit
b8ee2fd559
app
assets/javascripts
controllers
views
config
|
@ -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()
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,10 @@ class DesktopController< ApplicationController
|
||||||
@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
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
You have a bad browser ...!!!
|
|
@ -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>
|
|
@ -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]>
|
||||||
|
|
|
@ -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'
|
||||||
|
|
Loading…
Reference in New Issue