saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tiny scrollbar trigger fixed and devin branch merged

This commit is contained in:
Harry Bomrah 2013-04-10 17:27:34 +08:00 committed by Matt K. Fu
parent fcfdd562a6
commit 38d5a193e0
3 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/orbitdesktop.js
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 != ""){

1
vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendored
View File

@ -16,6 +16,7 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
end
if @view_by.nil?
@view_by = " "
@writing_journals = @writing_journals.asc(:paper_title)
else
@writing_journals = @writing_journals.asc(@view_by).asc(:paper_title)

2
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendored
View File

@ -77,7 +77,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<div class="overview" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<% @writing_journals.each do |w| %>
<%= publication_record w, @view_by%>
<% end %>