From 38d5a193e0957ec662870110d323506f9180949a Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 10 Apr 2013 17:27:34 +0800
Subject: [PATCH] tiny scrollbar trigger fixed and devin branch merged

---
 app/assets/javascripts/orbitdesktop.js        | 57 ++++++++++++-------
 .../desktop/journal_pages_controller.rb       |  1 +
 .../desktop/journal_pages/index.html.erb      |  4 +-
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index b3241fbdb..65105df56 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -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');
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
index a6009ea66..e2c301d2e 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
@@ -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)
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
index 7b43ae2b6..5a4c33dcb 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
@@ -77,8 +77,8 @@
     <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 %>
-    </div>
+    </div>
\ No newline at end of file