Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 34 insertions, 2 deletions

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index eb445a7..75814dc 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -67,7 +67,39 @@
           }
 				},
 */
+        contextmenu: function(e){
+          if (! (e.ctrlKey || e.metaKey || e.shiftKey) ) {
+            e.preventDefault()
+          }
+          if (Scenery.nextMedia) {
+            e.preventDefault()
+            Scenery.nextMedia = null
+            app.tube('cancel-scenery')
+          }
+          else if (Scenery.nextWallpaper) {
+            e.preventDefault()
+            Scenery.nextWallpaper = null
+            app.tube('cancel-wallpaper')
+          }
+        },
+
 				mousedown: function(e){
+				  
+				  // right-click
+				  if (e.which == 3) {
+				    if (Scenery.nextMedia) {
+				      e.preventDefault()
+              Scenery.nextMedia = null
+              app.tube('cancel-scenery')
+				    }
+				    else if (Scenery.nextWallpaper) {
+				      e.preventDefault()
+              Scenery.nextWallpaper = null
+              app.tube('cancel-wallpaper')
+				    }
+				    return
+				  }
+          
           var offset = offsetFromPoint(e, mx.el)
           if (! offset) { return }
 
@@ -120,7 +152,7 @@
 					else {
 						app.controller.pickWall(base, pos)
 					}
-				}
+				},
 			})
 		})
 
@@ -250,7 +282,7 @@
 	    url = "url(" + url + ")"
 	  }
 		this.mx.forEach(function(mx){
-      mx.el.style.backgroundImage = url
+      if (mx.el) mx.el.style.backgroundImage = url
     })
 	}