new page add and timeline changes
This commit is contained in:
1 parent
4aa155a44d
commit
7151102a86
8 files changed
+53
-10
No files matched your search
@@ -14,11 +14,17 @@ var orbitTimeline = function(dom){
|
||||
t.dom.html(t.timelineHtml);
|
||||
$("div.scrollbar").hide();
|
||||
t.constructTimeScale(function(timelineScale){
|
||||
console.log(timelineScale);
|
||||
$("#timeline_scale").html(timelineScale);
|
||||
var totalyearwidth =timelineScale.find(".year").length * 100;
|
||||
var totalul = 0;
|
||||
for(eve in t.events){
|
||||
|
||||
t.makeBubble(t.events[eve]);
|
||||
totalul = $("#scale_wrapper ul").length
|
||||
$(".t_scale").width((totalul*350) + totalyearwidth);
|
||||
}
|
||||
|
||||
$('.tinycanvas').tinyscrollbar({ axis: 'x'});
|
||||
});
|
||||
}
|
||||
this.constructTimeScale = function(callbackFn){
|
||||
@@ -31,7 +37,8 @@ var orbitTimeline = function(dom){
|
||||
var cur_mon = paper.created_at.substr(5,2);
|
||||
var cur_year = dt.getFullYear();
|
||||
var cdt = paper.created_at.substr(0,7).replace("-","");
|
||||
var bubbleData = {"fulldate" : t.monthList[parseInt(cur_mon)] +", " + dt.getDate() + ", " + cur_year,"title":paper.title,"jtitle":journal.title,"coauthors":paper.coauthors,"abstract":paper.abstract,"timestamp":cdt}
|
||||
var formname = (cur_mon.charAt(0) == "0"?cur_mon.charAt(1) : cur_mon)
|
||||
var bubbleData = {"fulldate" : t.monthList[parseInt(formname)] +", " + dt.getDate() + ", " + cur_year,"title":paper.title,"jtitle":journal.title,"coauthors":paper.coauthors,"abstract":paper.abstract,"timestamp":cdt}
|
||||
t.events.push(bubbleData);
|
||||
if(cur_year != year){
|
||||
year = cur_year;
|
||||
@@ -39,7 +46,8 @@ var orbitTimeline = function(dom){
|
||||
}
|
||||
if(cur_mon != mon){
|
||||
mon = cur_mon;
|
||||
scale.append($("<div class='scale_region month' data-content='"+cdt+"'><div class='month_heading'>"+t.monthList[parseInt(mon)]+"</div><div class='bubble_list'></div></div>"))
|
||||
console.log(parseInt(cur_mon));
|
||||
scale.append($("<div class='scale_region month' data-content='"+cdt+"'><div class='month_heading'>"+t.monthList[parseInt(formname)]+"</div><div class='bubble_list'></div></div>"))
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
@@ -907,7 +907,6 @@ var orbitDesktop = function(dom){
|
||||
var bindHandlers = function(){
|
||||
var timeline = new orbitTimeline("timeline");
|
||||
timeline.initialize();
|
||||
$('.tinycanvas').tinyscrollbar({ axis: 'x'});
|
||||
}
|
||||
if(!o.desktopData[o.currentface]){
|
||||
$(o.contentHolder).empty().load("/desktop_orbit/"+target,function(){
|
||||
@@ -1143,7 +1142,10 @@ var orbitDesktop = function(dom){
|
||||
switch(tfunc){
|
||||
case 'widgets':
|
||||
widgets();
|
||||
break;
|
||||
break;
|
||||
case 'onlinestore':
|
||||
onlinestore();
|
||||
break;
|
||||
}
|
||||
$('.s_menu a').removeClass('thmc1 thmtxt active');
|
||||
$(this).addClass('thmc1 thmtxt active');
|
||||
@@ -1288,15 +1290,22 @@ var orbitDesktop = function(dom){
|
||||
})
|
||||
})
|
||||
}
|
||||
var onlinestore = function(){
|
||||
var bindHandlers = function(){
|
||||
|
||||
}
|
||||
$("div#apps_store div#panel_r").load("/desktop_appstore/onlinestore",function(){
|
||||
bindHandlers();
|
||||
})
|
||||
}
|
||||
if(!o.desktopData[o.currentface]){
|
||||
$(o.contentHolder).empty().load("/desktop_appstore/"+target,function(){
|
||||
widgets();
|
||||
onlinestore();
|
||||
bindHandlers();
|
||||
});
|
||||
}else{
|
||||
$(o.contentHolder).html(o.desktopData[o.currentface]);
|
||||
widgets();
|
||||
onlinestore();
|
||||
bindHandlers();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user