diff options
| author | Julie Lala <jules@okfoc.us> | 2014-06-04 02:14:06 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-06-04 02:14:06 -0400 |
| commit | 9fee5d3d3e6bb98f364f03e2ee750203c49d01e9 (patch) | |
| tree | d574c886ea2aef6f3e1c182da847fc6c721325f4 /public/assets | |
| parent | 26d1b0f11818867501b08e77dde46f18c8c518fc (diff) | |
thinkin about where i wanna put all the ui code
Diffstat (limited to 'public/assets')
| -rw-r--r-- | public/assets/javascripts/app.js | 27 | ||||
| -rw-r--r-- | public/assets/javascripts/mx/extensions/mx.movements.js | 4 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/share.js | 25 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/signin.js | 0 |
4 files changed, 27 insertions, 29 deletions
diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js index 1f7fc7d..65378ee 100644 --- a/public/assets/javascripts/app.js +++ b/public/assets/javascripts/app.js @@ -18,7 +18,6 @@ var scene, var viewHeight = window.viewHeight || 150 var app = new function(){} -app.dragging = false app.init = function () { @@ -90,30 +89,4 @@ app.position = function(obj){ } } -var share = { - init: function(){ - share.bind() - }, - bind: function(){ - $("#facebook").click(share.facebook) - $("#twitter").click(share.twitter) - }, - url: "http://vvalls.com/", - facebook_msg: "", - twitter_msg: "", - openLink: function (url) { - window.open(url, "_blank"); - }, - facebook: function () { - var url = "https://www.facebook.com/share.php?u=" + encodeURIComponent(share.url) + "&t=" + encodeURIComponent(share.facebook_msg); - share.openLink(url); - return false; - }, - twitter: function () { - var url = "https://twitter.com/home?status=" + encodeURIComponent(share.url + " " + share.twitter_msg); - share.openLink(url); - return false; - } -} - document.addEventListener('DOMContentLoaded', app.init) diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js index 074ca9a..d02b2d2 100644 --- a/public/assets/javascripts/mx/extensions/mx.movements.js +++ b/public/assets/javascripts/mx/extensions/mx.movements.js @@ -171,7 +171,7 @@ MX.Movements = function (cam, viewHeight) { }) document.addEventListener('mousemove', function (e) { - if (locked || ! dragging || app.dragging) return + if (locked || ! dragging) return var dx = (e.pageX - mouseX) / window.innerWidth * Math.PI/3 var dy = (e.pageY - mouseY) / window.innerHeight * Math.PI/3 cam.rotationY = rotY + dx @@ -179,7 +179,7 @@ MX.Movements = function (cam, viewHeight) { }) document.addEventListener('mouseup', function (e) { - app.dragging = dragging = false + dragging = false }) window.addEventListener('blur', reset) diff --git a/public/assets/javascripts/ui/share.js b/public/assets/javascripts/ui/share.js new file mode 100644 index 0000000..d31aa89 --- /dev/null +++ b/public/assets/javascripts/ui/share.js @@ -0,0 +1,25 @@ +var share = { + init: function(){ + share.bind() + }, + bind: function(){ + $("#facebook").click(share.facebook) + $("#twitter").click(share.twitter) + }, + url: "http://vvalls.com/", + facebook_msg: "", + twitter_msg: "", + openLink: function (url) { + window.open(url, "_blank"); + }, + facebook: function () { + var url = "https://www.facebook.com/share.php?u=" + encodeURIComponent(share.url) + "&t=" + encodeURIComponent(share.facebook_msg); + share.openLink(url); + return false; + }, + twitter: function () { + var url = "https://twitter.com/home?status=" + encodeURIComponent(share.url + " " + share.twitter_msg); + share.openLink(url); + return false; + } +} diff --git a/public/assets/javascripts/ui/signin.js b/public/assets/javascripts/ui/signin.js new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/public/assets/javascripts/ui/signin.js |
