Merge branch 'master' of git://github.com/aeosynth/4chan-x

This commit is contained in:
Nicolas Stepien 2011-05-07 22:17:52 +02:00
commit 94dd966c8f
2 changed files with 5 additions and 20 deletions

View File

@ -180,9 +180,9 @@
}, },
dragstart: function(e) { dragstart: function(e) {
var d, el, rect; var d, el, rect;
e.preventDefault();
ui.el = el = e.target.parentNode; ui.el = el = e.target.parentNode;
d = document; d = document;
d.body.className = 'noselect';
d.addEventListener('mousemove', ui.drag, true); d.addEventListener('mousemove', ui.drag, true);
d.addEventListener('mouseup', ui.dragend, true); d.addEventListener('mouseup', ui.dragend, true);
rect = el.getBoundingClientRect(); rect = el.getBoundingClientRect();
@ -193,6 +193,7 @@
}, },
drag: function(e) { drag: function(e) {
var bottom, el, left, right, top; var bottom, el, left, right, top;
e.preventDefault();
el = ui.el; el = ui.el;
left = e.clientX - ui.dx; left = e.clientX - ui.dx;
if (left < 20) { if (left < 20) {
@ -220,7 +221,6 @@
localStorage["" + id + "Left"] = el.style.left; localStorage["" + id + "Left"] = el.style.left;
localStorage["" + id + "Top"] = el.style.top; localStorage["" + id + "Top"] = el.style.top;
d = document; d = document;
d.body.className = '';
d.removeEventListener('mousemove', ui.drag, true); d.removeEventListener('mousemove', ui.drag, true);
return d.removeEventListener('mouseup', ui.dragend, true); return d.removeEventListener('mouseup', ui.dragend, true);
} }
@ -2345,14 +2345,6 @@
#watcher > div:last-child {\ #watcher > div:last-child {\
padding-bottom: 5px;\ padding-bottom: 5px;\
}\ }\
\
body.noselect {\
-webkit-user-select: none;\
-khtml-user-select: none;\
-moz-user-select: none;\
-o-user-select: none;\
user-select: none;\
}\
' '
}; };
main.init(); main.init();

View File

@ -100,9 +100,10 @@ ui =
(-> el.parentNode.removeChild(el)), true (-> el.parentNode.removeChild(el)), true
el el
dragstart: (e) -> dragstart: (e) ->
#prevent text selection
e.preventDefault()
ui.el = el = e.target.parentNode ui.el = el = e.target.parentNode
d = document d = document
d.body.className = 'noselect'
d.addEventListener 'mousemove', ui.drag, true d.addEventListener 'mousemove', ui.drag, true
d.addEventListener 'mouseup', ui.dragend, true d.addEventListener 'mouseup', ui.dragend, true
#distance from pointer to el edge is constant; calculate it here. #distance from pointer to el edge is constant; calculate it here.
@ -114,6 +115,7 @@ ui =
ui.width = document.body.clientWidth - el.offsetWidth ui.width = document.body.clientWidth - el.offsetWidth
ui.height = document.body.clientHeight - el.offsetHeight ui.height = document.body.clientHeight - el.offsetHeight
drag: (e) -> drag: (e) ->
e.preventDefault()
{el} = ui {el} = ui
left = e.clientX - ui.dx left = e.clientX - ui.dx
if left < 20 then left = '0px' if left < 20 then left = '0px'
@ -136,7 +138,6 @@ ui =
localStorage["#{id}Left"] = el.style.left localStorage["#{id}Left"] = el.style.left
localStorage["#{id}Top"] = el.style.top localStorage["#{id}Top"] = el.style.top
d = document d = document
d.body.className = ''
d.removeEventListener 'mousemove', ui.drag, true d.removeEventListener 'mousemove', ui.drag, true
d.removeEventListener 'mouseup', ui.dragend, true d.removeEventListener 'mouseup', ui.dragend, true
@ -1841,14 +1842,6 @@ main =
#watcher > div:last-child { #watcher > div:last-child {
padding-bottom: 5px; padding-bottom: 5px;
} }
body.noselect {
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-o-user-select: none;
user-select: none;
}
' '
main.init() main.init()