From 1b6bfdb80f04f72adf8f917329c59e8670b98ff1 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Fri, 11 Jan 2013 10:55:19 +0800 Subject: [PATCH] modularize personal journal and pull relational setting in desktop/index.rb --- app/assets/javascripts/desktop.js | 1 - app/views/desktop/index.html.erb | 1 + .../personal_journal/app/assets/javascripts/personal_journal.js | 1 + .../javascripts/{ => personal_journal}/desktop/journal_pages.js | 0 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal.js rename vendor/built_in_modules/personal_journal/app/assets/javascripts/{ => personal_journal}/desktop/journal_pages.js (100%) diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index c519e4b08..e5e4a05a0 100644 --- a/app/assets/javascripts/desktop.js +++ b/app/assets/javascripts/desktop.js @@ -14,6 +14,5 @@ //= require orbitdesktopAPI //= require orbitTimeline //= require orbitdesktop -//= require desktop/journal_pages //= require desktop/books_pages //= require desktop/seminar_pages diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 739090c26..019034476 100644 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -102,3 +102,4 @@ var od = new orbitDesktop("#ajax_container"); o.notify("Welcome "+o.currentUsername+"!!","alert",3); +<%= javascript_include_tag "personal_journal" %> diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal.js new file mode 100644 index 000000000..57fc98e4d --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal.js @@ -0,0 +1 @@ +//= require_tree ./personal_journal/desktop diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js similarity index 100% rename from vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop/journal_pages.js rename to vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js