Merge branch 'mayhem' into v3

Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/FileInfo.coffee
	src/Posting/QR.coffee

CHANGELOG.md

@@ -1,5 +1,13 @@
+<<<<<<< HEAD
 **duckness**:
 - Merge changes from Mayhem fork
+=======
+## 3.20.0 - *2014-04-05*
+
+- Add support for .webm files.
+
+### 3.19.5 - *2014-04-03*
+>>>>>>> mayhem
 
 **MayhemYDG**:
 - Fix captcha submission:

package.json

@@ -28,15 +28,15 @@
   },
   "devDependencies": {
     "font-awesome": "~4.0.3",
-    "grunt": "~0.4.2",
+    "grunt": "~0.4.4",
     "grunt-bump": "~0.0.13",
     "grunt-concurrent": "~0.5.0",
     "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-coffee": "~0.10.0",
+    "grunt-contrib-coffee": "~0.10.1",
     "grunt-contrib-compress": "~0.7.0",
-    "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-concat": "~0.4.0",
     "grunt-contrib-copy": "~0.5.0",
-    "grunt-contrib-watch": "~0.6.0",
+    "grunt-contrib-watch": "~0.6.1",
     "grunt-shell": "~0.6.4",
     "load-grunt-tasks": "~0.4.0"
   },

src/Filtering/Filter.coffee

@@ -149,7 +149,8 @@ Filter =
       return post.file.name
     false
   dimensions: (post) ->
-    if post.file and post.file.isImage
+    {file} = post
+    if file and (file.isImage or file.isVideo)
       return post.file.dimensions
     false
   filesize: (post) ->

src/General/Build.coffee

@@ -7,8 +7,9 @@ Build =
     # OPs have a +10 characters threshold.
     # The file extension is not taken into account.
     threshold = if isReply then 30 else 40
-    if filename.length - 4 > threshold
+    ext = filename.match(/\.[^.]+$/)[0]
-      "#{filename[...threshold - 5]}(...).#{filename[-3..]}"
+    if filename.length - ext.length > threshold
+      "#{filename[...threshold - 5]}(...)#{ext}"
     else
       filename
   thumbRotate: do ->

src/General/Settings.coffee

@@ -388,6 +388,7 @@ Settings =
         sizeInBytes: 276 * 1024
         dimensions: '1280x720'
         isImage: true
+        isVideo: false
         isSpoiler: true
     funk = FileInfo.createFunc @value
     @nextElementSibling.innerHTML = funk FileInfo, data

src/General/css/style.css

@@ -108,7 +108,7 @@ div.center:not(.ad-cnt) {
 /* fixed, z-index */
 #overlay,
 #fourchanx-settings,
-#qp, .ihover,
+#qp, #ihover,
 #navlinks, .fixed #header-bar,
 :root.float #updater,
 :root.float #thread-stats,
@@ -124,7 +124,7 @@ div.center:not(.ad-cnt) {
 #notifications {
   z-index: 70;
 }
-#qp, .ihover {
+#qp, #ihover {
   z-index: 60;
 }
 #menu {
@@ -840,7 +840,7 @@ span.hide-announcement {
 :root.gecko.fit-width .full-image {
   width: 100%;
 }
-.ihover {
+#ihover {
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   max-height: 100%;

src/General/lib/post.class

@@ -116,7 +116,7 @@ class Post
 
   parseFile: (that) ->
     return unless (fileEl = $ '.file', @nodes.post) and thumb = $ 'img[data-md5]', fileEl
-    # Supports JPG/PNG/GIF/PDF.
+    # Supports JPG/PNG/GIF/WEBM/PDF.
     # Flash files are not supported.
     anchor   = thumb.parentNode
     fileText = fileEl.firstElementChild

src/Images/AutoGIF.coffee

@@ -32,4 +32,3 @@ AutoGIF =
       else
         thumb.src = URL
     gif.src = URL
-

src/Images/ImageExpand.coffee

@@ -14,7 +14,7 @@ ImageExpand =
       name: 'Image Expansion'
       cb: @node
   node: ->
-    return unless @file?.isImage or @file?.isVideo
+    return unless @file and (@file.isImage or @file.isVideo)
     {thumb} = @file
     $.on thumb.parentNode, 'click', ImageExpand.cb.toggle
     if @isClone and $.hasClass thumb, 'expanding'
@@ -46,7 +46,7 @@ ImageExpand =
         for post in [post].concat post.clones
           {file} = post
           return unless file and (file.isImage or file.isVideo) and doc.contains post.nodes.root
-          if ImageExpand.on and
+          if ImageExpand.on and !post.isHidden and
             (!Conf['Expand spoilers'] and file.isSpoiler or
             Conf['Expand from here'] and Header.getTopOf(file.thumb) < 0)
               return
@@ -87,10 +87,10 @@ ImageExpand =
     ImageExpand.contract post
 
   contract: (post) ->
-    post.file.fullImage?.pause() if post.file.isVideo
     $.rmClass post.nodes.root, 'expanded-image'
     $.rmClass post.file.thumb, 'expanding'
     post.file.isExpanded = false
+    post.file.fullImage.pause() if post.file.isVideo
     post.file.videoControls?.map($.rm)
     delete post.file.videoControls
 
@@ -99,41 +99,37 @@ ImageExpand =
     {thumb, isVideo} = post.file
     return if post.isHidden or post.file.isExpanded or $.hasClass thumb, 'expanding'
     $.addClass thumb, 'expanding'
-    naturalHeight = if isVideo then 'videoHeight' else 'naturalHeight'
+    if post.file.fullImage
-    if img = post.file.fullImage
       # Expand already-loaded/ing picture.
-      $.rmClass img, 'ihover'
+      $.asap (-> post.file.isVideo or post.file.fullImage.naturalHeight), ->
-      $.addClass img, 'full-image'
-      img.controls = (img.parentNode isnt thumb.parentNode)
-      $.asap (-> img[naturalHeight]), ->
         ImageExpand.completeExpand post
       return
-    post.file.fullImage = img = $.el (if isVideo then 'video' else 'img'),
+    file = 
-      className: 'full-image'
+      $.el (if post.file.isImage then 'img' else 'video'),
-      src: src or post.file.URL
+        className: 'full-image'
+        src: src or post.file.URL
+    post.file.fullImage = file
     if isVideo
-      img.loop = true
+      file.loop     = true
-      img.controls = Conf['Show Controls']
+      file.controls = Conf['Show Controls']
-    $.on img, 'error', ImageExpand.error
+    $.on file, 'error', ImageExpand.error
-    $.asap (-> post.file.fullImage[naturalHeight]), ->
+    $.asap (-> post.file.isVideo or post.file.fullImage.naturalHeight), ->
       ImageExpand.completeExpand post
-    $.after (if img.controls then thumb.parentNode else thumb), img
+    $.after (if file.controls then thumb.parentNode else thumb), file
 
   completeExpand: (post) ->
     {thumb} = post.file
     return unless $.hasClass thumb, 'expanding' # contracted before the image loaded
     post.file.isExpanded = true
     ImageExpand.setupVideo post if post.file.isVideo
+    $.addClass post.nodes.root, 'expanded-image'
+    $.rmClass  post.file.thumb, 'expanding'
     unless post.nodes.root.parentNode
       # Image might start/finish loading before the post is inserted.
       # Don't scroll when it's expanded in a QP for example.
-      $.addClass post.nodes.root, 'expanded-image'
-      $.rmClass  post.file.thumb, 'expanding'
       return
     {bottom} = post.nodes.root.getBoundingClientRect()
     $.queueTask ->
-      $.addClass post.nodes.root, 'expanded-image'
-      $.rmClass  post.file.thumb, 'expanding'
       return unless bottom <= 0
       window.scrollBy 0, post.nodes.root.getBoundingClientRect().bottom - bottom
 
@@ -153,9 +149,9 @@ ImageExpand =
       # drag left to contract
       file.mousedown = false
       $.on video, 'mousedown', (e) -> file.mousedown = true  if e.button is 0
-      $.on video, 'mouseup', (e) -> file.mousedown = false if e.button is 0
+      $.on video, 'mouseup',   (e) -> file.mousedown = false if e.button is 0
       $.on video, 'mouseover', (e) -> file.mousedown = false
-      $.on video, 'mouseout', (e) ->
+      $.on video, 'mouseout',  (e) ->
         if file.mousedown and e.clientX <= video.getBoundingClientRect().left
           ImageExpand.contract post
     if Conf['Autoplay']

src/Images/ImageHover.coffee

@@ -9,45 +9,36 @@ ImageHover =
         name: 'Image Hover'
         cb:   @catalogNode
   node: ->
-    return unless @file?.isImage or @file?.isVideo
+    return unless @file and (@file.isImage or @file.isVideo)
     $.on @file.thumb, 'mouseover', ImageHover.mouseover
   catalogNode: ->
-    return unless @thread.OP.file?.isImage
+    return unless @thread.OP.file and (@thread.OP.file.isImage or @thread.OP.file.isVideo)
     $.on @nodes.thumb, 'mouseover', ImageHover.mouseover
   mouseover: (e) ->
     post = if $.hasClass @, 'thumb'
       g.posts[@parentNode.dataset.fullID]
     else
       Get.postFromNode @
-    {isVideo} = post.file
+    el = if post.file.isImage
-    if post.file.fullImage
+      $.el 'img',
-      el = post.file.fullImage
+        id: 'ihover'
-      $.rmClass el, 'full-image'
-      $.addClass el, 'ihover'
-    else
-      el = $.el (if isVideo then 'video' else 'img'),
-        className: 'ihover'
         src: post.file.URL
-      post.file.fullImage = el
+    else
-      {thumb} = post.file
+      $.el 'video',
-      $.after (if isVideo and Conf['Show Controls'] then thumb.parentNode else thumb), el
+        controls: false
+        id: 'ihover'
+        src: post.file.URL
+        autoplay: Conf['Autoplay']
+        muted: !Conf['Allow Sound']
+        loop: true
+    $.add Header.hover, el
     el.dataset.fullID = post.fullID
-    if isVideo
-      el.loop = true
-      el.controls = false
-      el.muted = not Conf['Allow Sound']
-      el.play() if Conf['Autoplay']
-    naturalHeight = if post.file.isVideo then 'videoHeight' else 'naturalHeight'
     UI.hover
       root: @
       el: el
       latestEvent: e
       endEvents: 'mouseout click'
-      asapTest: -> el[naturalHeight]
+      asapTest: -> post.file.isVideo or el.naturalHeight
-      cb: ->
-        el.pause() if isVideo
-        $.rmClass el, 'ihover'
-        $.addClass el, 'full-image'
     $.on el, 'error', ImageHover.error
   error: ->
     return unless doc.contains @

src/Miscellaneous/FileInfo.coffee

@@ -47,4 +47,4 @@ FileInfo =
     B: -> FileInfo.convertUnit @file.sizeInBytes, 'B'
     K: -> FileInfo.convertUnit @file.sizeInBytes, 'KB'
     M: -> FileInfo.convertUnit @file.sizeInBytes, 'MB'
-    r: -> if @file.isImage or @file.isVideo then @file.dimensions else 'PDF'
+    r: -> @file.dimensions or 'PDF'

src/Posting/QR.coffee

@@ -1,7 +1,4 @@
 QR =
-  # Add empty mimeType to avoid errors with URLs selected in Window's file dialog.
-  mimeTypes: ['image/jpeg', 'image/png', 'image/gif', 'application/pdf', 'application/x-shockwave-flash', 'video/webm', '']
-
   init: ->
     return if !Conf['Quick Reply']
 
@@ -390,23 +387,15 @@ QR =
     if file.size > max
       QR.error "#{file.name}: File too large (file: #{$.bytesToString file.size}, max: #{$.bytesToString max})."
       return
-    else unless file.type in QR.mimeTypes
-      unless /^text/.test file.type
-        QR.error "#{file.name}: Unsupported file type."
-        return
-      if isSingle
-        post = QR.selected
-      else if (post = QR.posts[QR.posts.length - 1]).com
-        post = new QR.post()
-      post.pasteText file
-      return
     if isSingle
       post = QR.selected
     else if (post = QR.posts[QR.posts.length - 1]).file
       post = new QR.post()
-    post.setFile file
+    if /^text/.test file.type
-
+      post.pasteText file
-  openFileInput: (e) ->
+    else
+      post.setFile file
+  openFileInput: ->
     e.stopPropagation()
     if e.shiftKey and e.type is 'click'
       return QR.selected.rmFile()
@@ -416,7 +405,6 @@ QR =
       return $.on QR.nodes.filename, 'blur', -> $.rmClass QR.nodes.filename, 'edit'
     return if e.target.nodeName is 'INPUT' or (e.keyCode and e.keyCode not in [32, 13]) or e.ctrlKey
     e.preventDefault()
-    QR.nodes.fileInput.click()
 
   generatePostableThreadsList: ->
     return unless QR.nodes