Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v3' into Av2

Browse Source 
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/UI.coffee
This commit is contained in:
Zixaphir 2013-05-05 15:09:27 -07:00
commit 443e48d280
6 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ tmp-userjs/
tmp-userscript/ tmp-userscript/
builds/4chan-X.zip builds/4chan-X.zip
Gruntfile.js Gruntfile.js
4chan-x*

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.0.0 - 2013-05-03 * appchan x - Version 2.0.0 - 2013-05-05
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

9
builds/appchan-x.js
View File

@ -19,7 +19,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.0.0 - 2013-05-03 * appchan x - Version 2.0.0 - 2013-05-05
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -4741,6 +4741,7 @@
} }
}); });
$.on(root, endEvents, o.hoverend); $.on(root, endEvents, o.hoverend);
$.on(d, 'keydown', o.hoverend);
return $.on(root, 'mousemove', o.hover); return $.on(root, 'mousemove', o.hover);
}; };
hover = function(e) { hover = function(e) {
@ -4757,9 +4758,13 @@
style.left = left; style.left = left;
return style.right = right; return style.right = right;
}; };
hoverend = function() { hoverend = function(e) {
if (e.type === 'keydown' && e.keyCode !== 13) {
return;
}
$.rm(this.el); $.rm(this.el);
$.off(this.root, this.endEvents, this.hoverend); $.off(this.root, this.endEvents, this.hoverend);
$.off(d, 'keydown', this.hoverend);
$.off(this.root, 'mousemove', this.hover); $.off(this.root, 'mousemove', this.hover);
if (this.cb) { if (this.cb) {
return this.cb.call(this); return this.cb.call(this);

9
builds/appchan-x.user.js
View File

@ -19,7 +19,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.0.0 - 2013-05-03 * appchan x - Version 2.0.0 - 2013-05-05
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -4737,6 +4737,7 @@
} }
}); });
$.on(root, endEvents, o.hoverend); $.on(root, endEvents, o.hoverend);
$.on(d, 'keydown', o.hoverend);
return $.on(root, 'mousemove', o.hover); return $.on(root, 'mousemove', o.hover);
}; };
hover = function(e) { hover = function(e) {
@ -4753,9 +4754,13 @@
style.left = left; style.left = left;
return style.right = right; return style.right = right;
}; };
hoverend = function() { hoverend = function(e) {
if (e.type === 'keydown' && e.keyCode !== 13) {
return;
}
$.rm(this.el); $.rm(this.el);
$.off(this.root, this.endEvents, this.hoverend); $.off(this.root, this.endEvents, this.hoverend);
$.off(d, 'keydown', this.hoverend);
$.off(this.root, 'mousemove', this.hover); $.off(this.root, 'mousemove', this.hover);
if (this.cb) { if (this.cb) {
return this.cb.call(this); return this.cb.call(this);

9
builds/crx/script.js
View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.0.0 - 2013-05-03 * appchan x - Version 2.0.0 - 2013-05-05
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -4738,6 +4738,7 @@
} }
}); });
$.on(root, endEvents, o.hoverend); $.on(root, endEvents, o.hoverend);
$.on(d, 'keydown', o.hoverend);
return $.on(root, 'mousemove', o.hover); return $.on(root, 'mousemove', o.hover);
}; };
hover = function(e) { hover = function(e) {
@ -4754,9 +4755,13 @@
style.left = left; style.left = left;
return style.right = right; return style.right = right;
}; };
hoverend = function() { hoverend = function(e) {
if (e.type === 'keydown' && e.keyCode !== 13) {
return;
}
$.rm(this.el); $.rm(this.el);
$.off(this.root, this.endEvents, this.hoverend); $.off(this.root, this.endEvents, this.hoverend);
$.off(d, 'keydown', this.hoverend);
$.off(this.root, 'mousemove', this.hover); $.off(this.root, 'mousemove', this.hover);
if (this.cb) { if (this.cb) {
return this.cb.call(this); return this.cb.call(this);

5
src/General/UI.coffee
View File

@ -323,6 +323,7 @@ UI = do ->
o.hover o.latestEvent if el.parentNode o.hover o.latestEvent if el.parentNode
$.on root, endEvents, o.hoverend $.on root, endEvents, o.hoverend
$.on d, 'keydown', o.hoverend
$.on root, 'mousemove', o.hover $.on root, 'mousemove', o.hover
hover = (e) -> hover = (e) ->
@ -348,9 +349,11 @@ UI = do ->
style.left = left style.left = left
style.right = right style.right = right
hoverend = -> hoverend = (e) ->
return if e.type is 'keydown' and e.keyCode isnt 13
$.rm @el $.rm @el
$.off @root, @endEvents, @hoverend $.off @root, @endEvents, @hoverend
$.off d, 'keydown', @hoverend
$.off @root, 'mousemove', @hover $.off @root, 'mousemove', @hover
@cb.call @ if @cb @cb.call @ if @cb