diff options
Diffstat (limited to 'public/assets/javascripts/ui/editor')
5 files changed, 58 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js index df7a974..6be068b 100644 --- a/public/assets/javascripts/ui/editor/EditorToolbar.js +++ b/public/assets/javascripts/ui/editor/EditorToolbar.js @@ -37,9 +37,11 @@ var EditorToolbar = View.extend({ }, toggleWallpaper: function(){ + this.parent.wallpaperPicker.toggle() }, toggleLightControl: function(){ + this.parent.lightControl.toggle() }, editWallText: function(){ diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js index 1093c76..8422619 100644 --- a/public/assets/javascripts/ui/editor/EditorView.js +++ b/public/assets/javascripts/ui/editor/EditorView.js @@ -13,6 +13,8 @@ var EditorView = View.extend({ this.settings = new EditorSettings ({ parent: this }) this.mediaViewer = new MediaViewer ({ parent: this }) this.mediaUpload = new MediaUpload ({ parent: this }) + this.wallpaperPicker = new WallpaperPicker ({ parent: this }) + this.lightControl = new LightControl ({ parent: this }) }, load: function(name){ diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js new file mode 100644 index 0000000..1385820 --- /dev/null +++ b/public/assets/javascripts/ui/editor/LightControl.js @@ -0,0 +1,15 @@ + +var LightControl = View.extend({ + el: ".lightcontrol", + + events: { + }, + + toggle: function(){ + this.$el.toggleClass("active"); + + // toggle the class that makes the cursor a paintbucket + // $("body").removeClass("pastePaper"); + }, + +}) diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js index 96d7cf7..3911d3b 100644 --- a/public/assets/javascripts/ui/editor/MediaViewer.js +++ b/public/assets/javascripts/ui/editor/MediaViewer.js @@ -4,6 +4,25 @@ var MediaViewer = ModalView.extend({ createAction: "/api/docs/new", updateAction: "/api/docs/edit", destroyAction: "/api/docs/destroy", + + events: { + 'click .foundToggle': "foundToggle", + 'click .yourMedia': "userToggle", + }, + + foundToggle: function(){ + $(".foundMedia").addClass("active"); + $(".myMedia").addClass("inactive"); + $('a').removeClass("active"); + $('.foundToggle').addClass("active"); + }, + + userToggle: function(){ + this.$(".foundMedia").removeClass("active"); + this.$(".myMedia").removeClass("inactive"); + this.$('a').removeClass("active"); + this.$('.yourMedia').addClass("active"); + }, show: function(){ if (! this.loaded) { @@ -13,14 +32,19 @@ var MediaViewer = ModalView.extend({ this.__super__.show.call(this) } }, + + hide: function(){ + this.__super__.hide.call(this) + this.parent.mediaUpload.hide() + }, load: function(){ $.get("/api/media/user", $.proxy(this.populate, this)) }, populate: function(data){ + this.loaded = true data.forEach($.proxy(this.add, this)) - this.__super__.show.call(this) }, diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js new file mode 100644 index 0000000..59dc7dd --- /dev/null +++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js @@ -0,0 +1,14 @@ + +var WallpaperPicker = View.extend({ + el: ".wallpaper", + + events: { + }, + + toggle: function(){ + this.$el.toggleClass("active"); + // toggle the class that makes the cursor a paintbucket + // $("body").removeClass("pastePaper"); + }, + +}) |