summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/ui')
-rw-r--r--public/assets/javascripts/ui/_router.js29
-rw-r--r--public/assets/javascripts/ui/editor/EditorToolbar.js1
-rw-r--r--public/assets/javascripts/ui/reader/ReaderView.js3
3 files changed, 24 insertions, 9 deletions
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index fdeafd5..ce18b2a 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -35,7 +35,8 @@ var SiteRouter = Router.extend({
"/project": 'projectPicker',
"/project/new": 'newProject',
"/project/new/:layout": 'projectNewWithLayout',
- "/project/:name": 'projectEditor',
+ "/project/:name": 'project',
+ "/project/:name/view": 'projectViewer',
},
initialize: function(){
@@ -94,21 +95,31 @@ var SiteRouter = Router.extend({
this.editorView.loadLayout(layout)
},
- projectEditor: function(e, name){
- app.mode.editor = true
- app.launch()
-
+ project: function(e, name){
if ($(".aboutRoom").length) {
- this.readerView = new ReaderView()
- this.readerView.load(name)
+ this.projectViewer(e, name)
}
else {
- this.editorView = new EditorView()
- this.editorView.load(name)
+ this.projectEditor(e, name)
}
},
+ projectEditor: function(e, name){
+ app.mode.editor = true
+ app.launch()
+
+ this.editorView = new EditorView()
+ this.editorView.load(name)
+ },
+ projectViewer: function(e, name){
+ app.mode.editor = true
+ app.launch()
+
+ this.readerView = new ReaderView()
+ this.readerView.load(name)
+ },
+
/*
editProject: function(e){
e && e.preventDefault()
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 210ef6c..4a7c3e8 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -87,6 +87,7 @@ var EditorToolbar = View.extend({
var editor = new function(){
this.permissions = new Permissions({
+ 'pick': false,
'move': true,
'resize': false,
'destroy': false,
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 7cd629b..860cc04 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -11,6 +11,9 @@ var ReaderView = View.extend({
},
load: function(name){
+ if (window.location.search.indexOf("noui") !== -1) {
+ $(".logo,.topLinks,#editorView").hide()
+ }
name = sanitize(name)
$.get(this.projectAction + name, $.proxy(this.ready, this))
},