diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-30 18:00:09 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-30 18:00:09 -0400 |
| commit | 72270af02efb9609482ea50e918fe6d2ca7785a2 (patch) | |
| tree | 058880c7147b6e4927e2663082faa9a9b4638ba2 /public/assets/javascripts/ui/editor | |
| parent | 1efe4601867053e297e91e70388b48e90b12b61f (diff) | |
| parent | 75f6a29f57f6147c83c8fb60bc5d36d8c6268f72 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor')
| -rw-r--r-- | public/assets/javascripts/ui/editor/ColorControl.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/HelpCursor.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js index 72e9fb1..d1a8c7b 100644 --- a/public/assets/javascripts/ui/editor/ColorControl.js +++ b/public/assets/javascripts/ui/editor/ColorControl.js @@ -101,7 +101,7 @@ var ColorControl = View.extend({ initialState: null, - begin: function(){ + begin: function(){ this.initialState = this.serialize() }, diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js index 7268b32..8ada237 100644 --- a/public/assets/javascripts/ui/editor/HelpCursor.js +++ b/public/assets/javascripts/ui/editor/HelpCursor.js @@ -10,7 +10,7 @@ var HelpCursor = View.extend({ addmedia: "Great, now click a wall to place this image.", resize: "Drag the image to position it, or use the dots to resize.", presets: "These are some basic presets to get you started. Click em! :-)", - wallpaper: "Drag the wallpaper onto the walls, floor, and ceiling.", + wallpaper: "Click the wallpaper you want then apply it to the walls. Feel free to upload your own too!", colors: "Use these colors to change the color of the walls, floor, and ceiling.", settings: "This is where you publish your project. Give it a name, hit save, and you'll have a URL you can share with your friends.", }, |