diff options
| author | ryderr <r@okfoc.us> | 2014-10-17 13:00:36 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-17 13:00:36 -0400 |
| commit | c99a5651e30838db43ee6f1b24a9fdc71d7affff (patch) | |
| tree | ac470f7ba26b315d8186e09e90e2311a0a9dc4e7 /public/assets/javascripts/ui/editor/Presets.js | |
| parent | 631da6497b18393daf302e01842a3c0c90b346e3 (diff) | |
| parent | 38a948be224d704589fa203520f224615a81c7d9 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/ui/editor/Presets.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/Presets.js | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js index 0a0e0fe..be86af3 100644 --- a/public/assets/javascripts/ui/editor/Presets.js +++ b/public/assets/javascripts/ui/editor/Presets.js @@ -5,8 +5,6 @@ var Presets = View.extend({ "mousedown": "stopPropagation", "click .presets span": "selectPreset", "click .swatches span": "selectColor", - "change .url": "tileWalls", - "keydown .url": "enterSetUrl", }, presets: { @@ -46,8 +44,6 @@ var Presets = View.extend({ initialize: function(opt){ this.parent = opt.parent - this.$url = this.$(".url") - this.$presets = this.$(".presets") _.keys(this.presets).forEach(function(name){ var $swatch = $("<span>") @@ -91,7 +87,7 @@ var Presets = View.extend({ Walls.setColor[mode](preset[mode].color) } else { - if (! this.lastPreset[mode].length) { + if (preset[mode].length) { Walls.clearWallpaper[mode]() } Walls.setColor[mode](preset[mode]) @@ -102,21 +98,5 @@ var Presets = View.extend({ Walls.setBodyColor() this.lastPreset = preset }, - - tileWalls: function(){ - var url = this.$url.sanitize() - if (url.length && url.indexOf("http://") == 0) { - Walls.setWallpaper.wall({ src: url }) - Walls.setWallpaper.floor({ src: url }) - Walls.setWallpaper.ceiling({ src: url }) - } - app.controller.wallpaperPicker.addUrl(url) - }, - enterSetUrl: function (e) { - e.stopPropagation() - if (e.keyCode == 13) { - setTimeout(this.tileWalls.bind(this), 100) - } - }, })
\ No newline at end of file |