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

Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP 

* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit:
  routes fixed
This commit is contained in:
Rueshyna 2012-11-21 17:48:03 +08:00
parent 24bb56416e 91005bb00a
commit 262df57298
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/orbitdesktop.js
View File

@ -63,7 +63,7 @@ var orbitDesktop = function(dom){
o.bindDesktopEvents(); o.bindDesktopEvents();
o.loadIconCache(); o.loadIconCache();
$(o.contentHolder).empty().load("desktop",function(){ $(o.contentHolder).empty().load("/desktop/desktop",function(){
o.desktopData["d_desktop"] = ""; o.desktopData["d_desktop"] = "";
o.initializeDesktop("d_desktop","",false); o.initializeDesktop("d_desktop","",false);
}) })

4
config/routes.rb
View File

@ -147,9 +147,9 @@ Orbit::Application.routes.draw do
post 'upload' post 'upload'
end end
end end
match "desktop" => "desktop#index"
namespace :desktop do namespace :desktop do
match "/" => "desktop#index" match "desktop" => "desktop#desktop"
match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json' match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
match '/desktop'=>'desktop#desktop' match '/desktop'=>'desktop#desktop'
match '/app_manager'=>'desktop#app_manager' match '/app_manager'=>'desktop#app_manager'