developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tiny scrollbar trigger fixed and devin branch merged

Browse Source
This commit is contained in:
harrybomrah authored and Matt K. Fu committed 2013-04-17 14:31:09 +08:00
1 parent fcfdd562a6
commit 38d5a193e0
3 files changed
+38 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/javascripts/orbitdesktop.js
+35 -22
View File
@@ -574,6 +574,7 @@ var orbitDesktop = function(dom){
});
}else{
$(o.contentHolder).html(o.desktopData[o.currentface]);
<<<<<<< Updated upstream
header_ani();
try {
if(!customload){
@@ -586,6 +587,18 @@ var orbitDesktop = function(dom){
}
}
} catch(EX){}
=======
try{
if(!customload){
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
}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]"));
}
}catch(EX){}
>>>>>>> Stashed changes
cache = true;
if(typeof o.data_method != "undefined"){
if(o.data_method != ""){
@@ -610,31 +623,31 @@ var orbitDesktop = function(dom){
}
}
this.sub_menu_item = function(dom,data){
var sub_data_method = dom.attr('callback-method');
if(sub_data_method){
o.lastlink = dom.attr("href");
$.ajax({
url : dom.attr("href"),
type : "get",
success : function(data){
o.layout_data(data);
if(typeof o.data_method != "undefined"){
if(o.data_method != ""){
if(typeof sub_data_method != "undefined"){
if(sub_data_method != ""){
window.o[o.data_method][sub_data_method]();
}
}
}
var sub_data_method = dom.attr('callback-method');
if(sub_data_method){
o.lastlink = dom.attr("href");
$.ajax({
url : dom.attr("href"),
type : "get",
success : function(data){
o.layout_data(data);
if(typeof o.data_method != "undefined"){
if(o.data_method != ""){
if(typeof sub_data_method != "undefined"){
if(sub_data_method != ""){
window.o[o.data_method][sub_data_method]();
}
}
})
o.highlight_sub_menu_item(dom);
}
}
if(dom.length == 0)
o.layout_data(data);
// $('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
// dom.addClass('thmc1 thmtxt active');
}
})
o.highlight_sub_menu_item(dom);
}
if(dom.length == 0)
o.layout_data(data);
// $('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
// dom.addClass('thmc1 thmtxt active');
}
this.highlight_sub_menu_item = function(no){
$('*[content-type=menu] a').removeClass('thmc1 thmtxt active');