156 Commits

Author SHA1 Message Date
Zixaphir
586a048d6e Enable video controls! 2014-04-10 23:40:18 -07:00
Zixaphir
88b0b0b32f Gallery reflows. 2014-04-10 23:25:46 -07:00
Zixaphir
28eebe0183 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
2014-04-10 23:08:43 -07:00
Zixaphir
08aa9b4624 cleanup? 2014-04-10 22:28:27 -07:00
ccd0
43ff113fe9 forgot to add this file 2014-04-10 01:35:37 -07:00
ccd0
ff057d4f29 configure videos opened in new tab 2014-04-10 01:33:11 -07:00
ccd0
60f869d818 add .webm, .pdf support to gallery 2014-04-09 02:55:32 -07:00
ccd0
2af481a68e fix gallery 2014-04-08 20:04:58 -07:00
Zixaphir
79bc4e751d Unnecessary space 2014-04-08 15:04:09 -07:00
Zixaphir
7658f575f3 nitpicking 2014-04-08 15:01:19 -07:00
Zixaphir
bc9ce0a434 Hah, I can't believe that worked. 2014-04-08 14:47:50 -07:00
Zixaphir
b00390b980 Merge branch 'ccd0' into v3
Rebase ImageExpand implemention off ccd0's

Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/Images/ImageExpand.coffee
2014-04-08 14:46:15 -07:00
ccd0
be50e4b1f4 add 'Expand videos' setting 2014-04-07 21:17:19 -07:00
ccd0
f490aab2ab need to change it here too 2014-04-07 21:05:38 -07:00
ccd0
f64fa9e08a disable autoplay when expanding all images 2014-04-07 20:52:36 -07:00
ccd0
bf09a5d008 play clone if original is playing 2014-04-07 20:27:42 -07:00
Zixaphir
e94d92c4a6 indentation 2014-04-07 18:58:43 -07:00
Zixaphir
7fc970f4c4 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
2014-04-07 18:58:17 -07:00
Zixaphir
d9d2ceb9b1 Merge branch 'ccd0' into v3
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/Get.coffee
	src/Images/Gallery.coffee
2014-04-07 18:35:18 -07:00
ccd0
fe1b68a635 change UI for no autoplay, no controls 2014-04-07 18:23:33 -07:00
ccd0
1ef501fc91 set up clones of videos properly 2014-04-07 17:38:00 -07:00
ccd0
e69d6b2e7c gallery thumbnail shouldn't clone contracted image/video 2014-04-07 13:30:12 -07:00
Zixaphir
82314241b7 Clear event listener 2014-04-07 10:49:11 -07:00
Zixaphir
d2727c4054 Implement webm thumbnail replacement. 2014-04-07 10:33:52 -07:00
Mayhem
445edcf867 After contracting, isExpanding should be falsy. 2014-04-07 12:05:44 +02:00
Mayhem
de112fcfa9 Fix EAI loading files in hidden posts. Fix #1542 2014-04-07 11:22:17 +02:00
Mayhem
78c86945f9 Automatically play/pause videos in clones too. 2014-04-07 11:11:39 +02:00
Mayhem
fba314e05a Pause videos when they are not visible. #1538 2014-04-07 11:06:34 +02:00
Mayhem
7f1abad58b Don't add the 'expanding' class when unecessary. 2014-04-07 10:02:15 +02:00
Mayhem
40d8d06266 Wait for the video metadata to be loaded before completing the expansion. 2014-04-07 09:45:33 +02:00
Mayhem
480ffba15c Keep playing .webms in clones. 2014-04-07 09:14:54 +02:00
Zixaphir
e286c247ea Merge branch 'ccd0' into v3
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
2014-04-06 22:45:30 -07:00
Zixaphir
13605179cd WebM Gallery Mode. 2014-04-06 22:40:16 -07:00
ccd0
ddf202397c Allow drag left even when controls are off
Will be helpful if someone activates controls by right-clicking.
2014-04-06 21:54:20 -07:00
ccd0
98514dd986 this should get width fitting working again
hopefully it doesn't break anything else
2014-04-06 21:38:44 -07:00
Zixaphir
68a76a25f2 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
	src/General/UI.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
2014-04-06 20:47:38 -07:00
ccd0
5361e39337 fix here too 2014-04-06 19:58:42 -07:00
ccd0
53f6aac3d7 fix brainfart 2014-04-06 19:45:57 -07:00
ccd0
5f95bf3e3c using el.videoHeight here does help
The whole thing appears to be a hack, though;
we should really be using the image dimensions
from the file info.
2014-04-06 19:17:58 -07:00
ccd0
81f1dbf0fb work around FF forever-loading bug, other tweaks
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-06 16:09:09 -07:00
ccd0
49d76b4177 fix video controls 2014-04-06 16:07:18 -07:00
ccd0
52949b545e fix hover/expand so it works when switching between catalog/paged modes
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-06 16:06:55 -07:00
ccd0
0f770459c0 get new hover working in catalog
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/UI.coffee
	src/Images/ImageHover.coffee
2014-04-06 16:06:11 -07:00
ccd0
74ef633fd7 better approach to hover css
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-06 16:04:36 -07:00
ccd0
113dde4eae remove listeners on contract 2014-04-06 16:03:47 -07:00
Zixaphir
7818dec073 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Index.coffee
	src/Images/ImageHover.coffee
2014-04-06 11:49:45 -07:00
ccd0
d32b923ac5 work around FF forever-loading bug, other tweaks 2014-04-06 09:58:34 -07:00
ccd0
536abebe1f fix video controls 2014-04-06 08:36:31 -07:00
ccd0
938479ea09 fix hover/expand so it works when switching between catalog/paged modes 2014-04-06 02:49:38 -07:00
ccd0
e1c9330250 get new hover working in catalog 2014-04-05 21:59:29 -07:00