diff options
| author | ryderr <r@okfoc.us> | 2014-10-02 16:34:58 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-02 16:34:58 -0400 |
| commit | e6dbfff54e2a97fbb539cab9ef9dd7945d74e0bc (patch) | |
| tree | 21544fd31147879606174b152912612aa81c7551 /public/assets/javascripts/rectangles/models/wall.js | |
| parent | 9ff15bf5fd1d4e59a1475125f8450fb9e19817e9 (diff) | |
| parent | 286ac452b3eae8fe20c7ccf5769b583942d45dd4 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/rectangles/models/wall.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/wall.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index fdf54f0..fdc8d8c 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -53,7 +53,6 @@ /* mousemove: function(e){ var offset = offsetFromPoint(e, mx.el) - var shouldFlip = base.side & (RIGHT | FRONT) if (offset) { var pos = base.mxOffsetToPosition( offset, index ) @@ -69,10 +68,18 @@ }, */ mousedown: function(e){ - if (Scenery.nextMedia) { + if (Scenery.nextText) { + } + else if (Scenery.nextMedia) { + var offset = offsetFromPoint(e, mx.el) + if (! offset) { return } + + var pos = base.mxOffsetToPosition( offset, index ) + var scenery = Scenery.addNextToWall({ wall: base, - index: index + index: index, + position: pos, }) // scenery was not placed |