jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5

This commit is contained in:
Harry Bomrah 2013-10-15 19:00:38 +08:00 committed by saurabhbhatia
parent 279ac774d4
commit fbea249782
7 changed files with 57 additions and 46 deletions

View File

@ -11,8 +11,8 @@ gem "net-ldap", "~> 0.3.1"
gem 'devise', '1.5.3' gem 'devise', '1.5.3'
gem 'exception_notification' # Send error trace gem 'exception_notification' # Send error trace
gem 'execjs' gem 'execjs'
gem 'jquery-rails', '2.1.4' gem 'jquery-rails', '3.0.4'
gem 'jquery-ui-rails' gem 'jquery-ui-rails', "4.0.5"
gem "select2-rails", '3.3.1' gem "select2-rails", '3.3.1'
gem 'kaminari' gem 'kaminari'
gem 'time_difference' gem 'time_difference'

View File

@ -6,7 +6,7 @@
// //
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery_ujs
//= require jquery-ui //= require jquery.ui.all
//= require desktop/jquery.form //= require desktop/jquery.form
//= require desktop/jquery.tinyscrollbar //= require desktop/jquery.tinyscrollbar
//= require desktop/jquery.miniColors.min //= require desktop/jquery.miniColors.min

View File

@ -168,7 +168,7 @@ var orbitDesktop = function(dom){
o.loadIconCache(); o.loadIconCache();
var custom_load = window.location.hash; var custom_load = window.location.hash;
if(!custom_load){ if(!custom_load){
$(o.contentHolder).empty().load("/desktop/desktop",function(){ $(o.contentHolder).empty().load("/desktop/desktop_container",function(){
o.desktopData["d_desktop"] = ""; o.desktopData["d_desktop"] = "";
o.initializeDesktop("d_desktop","",false); o.initializeDesktop("d_desktop","",false);
}) })
@ -605,10 +605,11 @@ var orbitDesktop = function(dom){
this.menu_item = function(dom,customload,submenuitem){ this.menu_item = function(dom,customload,submenuitem){
if(!customload)customload=false; if(!customload)customload=false;
var target = dom.attr("id"); var target = dom.attr("id"),
var url = dom.attr("href"); url = dom.attr("href"),
submenu_pass = ( dom.attr("sub-menu") ? true : false);
if(!url)return false; if(!url)return false;
o.data_method = dom.attr("callback-method"); o.data_method = dom.attr("callback-method");
if(o.currenthtml!=target){ if(o.currenthtml!=target){
if(o.desktopData[o.currentface] == "undefined"){ if(o.desktopData[o.currentface] == "undefined"){
@ -629,33 +630,37 @@ var orbitDesktop = function(dom){
window.o[o.data_method](target,url,cache); window.o[o.data_method](target,url,cache);
} }
} }
try { if( submenu_pass ){
if(!customload){ try {
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data); if(!customload){
} else {
if(submenuitem){
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"));
} else {
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data); o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
} else {
if(submenuitem){
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"));
} else {
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
}
} }
} } catch(EX){}
} catch(EX){} }
header_ani(); header_ani();
}); });
}else{ }else{
$(o.contentHolder).html(o.desktopData[o.currentface]); $(o.contentHolder).html(o.desktopData[o.currentface]);
try{ if( submenu_pass ){
if(!customload){ try{
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]); if(!customload){
}else{ o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]);
if(submenuitem) }else{
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"),o.desktopData[o.currentface]); if(submenuitem)
else o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"),o.desktopData[o.currentface]);
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]); else
} o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]);
}catch(EX){} }
}catch(EX){}
}
cache = (o.lastlink == "/desktop/app_manager" ? false : true); // cache = (o.lastlink == "/desktop/app_manager" ? false : true);
if(typeof o.data_method != "undefined"){ if(typeof o.data_method != "undefined"){
if(o.data_method != ""){ if(o.data_method != ""){
window.o[o.data_method](target,url,cache); window.o[o.data_method](target,url,cache);
@ -1095,7 +1100,7 @@ var orbitDesktop = function(dom){
data : options, data : options,
success : function(data){ success : function(data){
if(data.success == "true"){ if(data.success == "true"){
if(dom.is(":checked")){ console.log("true"); if(dom.is(":checked")){
elementSettingsData[$e.data("id")].sections.push({"id" : dom.data("section"),"name":sectionDetails.name}); elementSettingsData[$e.data("id")].sections.push({"id" : dom.data("section"),"name":sectionDetails.name});
o.notify("Added to " + sectionDetails.name,"success"); o.notify("Added to " + sectionDetails.name,"success");
}else{ }else{
@ -1119,20 +1124,16 @@ var orbitDesktop = function(dom){
var info_open = function(){ var info_open = function(){
if($appinfo.is(":hidden")){ if($appinfo.is(":hidden")){
$('.overview').stop().animate({'width': '+=480'},0 , function(){ $('.overview').stop().animate({'width': '+=480'},0 , function(){
$('.tinycanvas').tinyscrollbar_update(); // $('.tinycanvas').tinyscrollbar_update('relative');
}); });
$appinfo $appinfo
.css({ .css({
'display': 'block',
'margin-left': -480 'margin-left': -480
}) }).fadeIn(200)
.delay(300)
.animate({ .animate({
'margin-left': 0 'margin-left': 0
}, 500, 'easeInOutQuint'); }, 500, 'easeInOutQuint');
} else { }
$('.tinycanvas').tinyscrollbar_update();
}
} }
var info_close = function(){ var info_close = function(){
@ -1143,13 +1144,11 @@ var orbitDesktop = function(dom){
'margin-left': -480 'margin-left': -480
},500 , 'easeInOutQuint', function(){ },500 , 'easeInOutQuint', function(){
$('.overview').animate({'width': '-=480'}, 0, function(){ $('.overview').animate({'width': '-=480'}, 0, function(){
$('.tinycanvas').tinyscrollbar_update(); // $('.tinycanvas').tinyscrollbar_update();
}); });
$(this).attr("style",""); $(this).fadeOut(300).attr("style","");
}); });
} else { }
$('.tinycanvas').tinyscrollbar_update();
}
} }
$(window).on('keydown', function(){ $(window).on('keydown', function(){
if($('#searchbox').val() == 'Search'){ if($('#searchbox').val() == 'Search'){

View File

@ -19,7 +19,7 @@ class DesktopController< ApplicationController
render :layout => "compatibility" render :layout => "compatibility"
end end
def desktop def desktop_container
render :layout => false render :layout => false
end end

View File

@ -2,7 +2,7 @@
<div id="side"> <div id="side">
<div id="rwidget" class="wh2 thmc4"> <div id="rwidget" class="wh2 thmc4">
<ul class="docklist"> <ul class="docklist">
<li class="d_cate"><a callback-method='initializeDesktop' href="desktop/desktop" class="widget_fn wh2 hh2" id='home' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a> <li class="d_cate"><a callback-method='initializeDesktop' href="desktop/desktop_container" class="widget_fn wh2 hh2" id='home' onclick="return false;" sub-menu="false"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
<ul class="dock_child hh2 thmc4" style="width: 120px;"> <ul class="dock_child hh2 thmc4" style="width: 120px;">
<li class="dock_item"><a callback-method='initializeAppManager' href="<%= desktop_app_manager_path %>" class="widget_fn wh2 hh2" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li> <li class="dock_item"><a callback-method='initializeAppManager' href="<%= desktop_app_manager_path %>" class="widget_fn wh2 hh2" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
<li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh2 hh2" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li> <li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh2 hh2" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
@ -92,10 +92,22 @@
orbitDesktop.prototype.sectionId = "<%= @section.id %>"; orbitDesktop.prototype.sectionId = "<%= @section.id %>";
orbitDesktop.prototype.currentLanguage = "<%= I18n.locale %>"; orbitDesktop.prototype.currentLanguage = "<%= I18n.locale %>";
orbitDesktop.prototype.currentUsername = "<%= @currentusername %>"; orbitDesktop.prototype.currentUsername = "<%= @currentusername %>";
//uselessfunction();
var od = new orbitDesktop("#ajax_container"); var od = new orbitDesktop("#ajax_container");
if($.browser.msie){ var getInternetExplorerVersion = function(){
if($.browser.version < 9){ var rv = -1; // Return value assumes failure.
if (navigator.appName == 'Microsoft Internet Explorer')
{
var ua = navigator.userAgent;
var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})");
if (re.exec(ua) != null)
rv = parseFloat( RegExp.$1 );
}
return rv;
}
var version = getInternetExplorerVersion();
if( version != -1){
if(version < 9){
$.fx.off = true; $.fx.off = true;
o.notify("We turn off the animation (javascript) for you, but still you can turn it on",10); o.notify("We turn off the animation (javascript) for you, but still you can turn it on",10);
} }

View File

@ -273,7 +273,7 @@ Orbit::Application.routes.draw do
match "/desktop/compatibility" => "desktop#compatibility" match "/desktop/compatibility" => "desktop#compatibility"
match "desktop" => "desktop#index" match "desktop" => "desktop#index"
match "/desktop/desktop" => "desktop#desktop" match "/desktop/desktop_container" => "desktop#desktop_container"
match '/desktop/appactivation'=>'desktop#appactivation' match '/desktop/appactivation'=>'desktop#appactivation'
match '/desktop/app_manager'=>'desktop#app_manager' match '/desktop/app_manager'=>'desktop#app_manager'
match '/desktop/allsections'=>'desktop#allsections' match '/desktop/allsections'=>'desktop#allsections'