Merge pull request #1 from Spittie/url

Url

CHANGELOG.md

@@ -1,3 +1,13 @@
+### v1.3.6 
+*2014-02-13*
+
+**Spittie**
+- Upload images directly from urls
+ ![Upload from url](src/General/img/changelog/1.3.6.png)
+- Add gfycat.com embedding
+- Replace some icons with fontawesome
+- Add Metro favicons (lel)
+
 ### v1.3.5 
 *2014-02-10*
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.3.5 - 2014-02-11
+* 4chan X - Version 1.3.6 - 2014-02-13
 *
 * Licensed under the MIT license.
 * https://github.com/Spittie/4chan-x/blob/master/LICENSE

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.3.5
+// @version      1.3.6
 // @minGMVer     1.13
 // @minFFVer     26
 // @namespace    4chan-X
@@ -18,5 +18,5 @@
 // @run-at       document-start
 // @updateURL 	 https://github.com/Spittie/4chan-x/raw/stable/builds/4chan-X.meta.js
 // @downloadURL  https://github.com/Spittie/4chan-x/raw/stable/builds/4chan-X.user.js
-// @icon         data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
+// @icon         data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAF5JREFUeNrtkTESABAQxPD/R6tsE2dUGYUtFJvLDKf93KevHJAjpBorAQWSBIKqFASC4G0pCAkm4GfaEvgYXl0T6HBaE97f0vmnfYHbZOMLZCx9ISdKWwjOWZSC8GYm4SUGwfYgqI4AAAAASUVORK5CYII=
 // ==/UserScript==

builds/crx/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan X",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "manifest_version": 2,
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "icons": {

latest.js

@@ -1 +1 @@
-postMessage({version:'1.3.5'},'*')
+postMessage({version:'1.3.6'},'*')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan-X",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",

src/General/html/Features/QuickReply.html

@@ -21,7 +21,6 @@
   <div id=dump-list-container>
     <div id=dump-list></div>
     <a id=add-post href=javascript:; title="Add a post" tabindex=50>+</a>
-    </div>
   </div>
   <div id=file-n-submit>
     <span id=qr-filename-container class=field tabindex=60>
@@ -42,4 +41,4 @@
 </form>
 <datalist id="list-name"></datalist>
 <datalist id="list-email"></datalist>
-<datalist id="list-sub"></datalist> 
+<datalist id="list-sub"></datalist> 

src/Linkification/Linkify.coffee

@@ -334,6 +334,12 @@ Linkify =
         div = $.el 'iframe',
           src: "http://pastebin.com/embed_iframe.php?i=#{a.dataset.uid}"
 
+    gfycat:
+      regExp: /.*gfycat.com\/(?:iframe\/)?(\S*)/
+      el: (a) ->
+        div = $.el 'iframe',
+          src: "http://gfycat.com/iframe/#{a.dataset.uid}"
+
     SoundCloud:
       regExp: /.*(?:soundcloud.com\/|snd.sc\/)([^#\&\?]*).*/
       style: 'height: auto; width: 500px; display: inline-block;'

src/Posting/QR.captcha.coffee

@@ -17,7 +17,7 @@ QR.captcha =
       placeholder: 'Focus to load reCAPTCHA'
       autocomplete: 'off'
       spellcheck: false
-      tabIndex: 55
+      tabIndex: 45
     @nodes =
       img:       imgContainer.firstChild
       input:     input

src/Posting/QR.coffee

@@ -267,49 +267,69 @@ QR =
     QR.open()
     QR.handleFiles files
     $.addClass QR.nodes.el, 'dump'
+    
+  handleBlob: (blob) ->
+    return if blob.type is null
+      QR.error "Unsupported file type."
+    return unless blob.type in QR.mimeTypes
+      QR.error "Unsupported file type."
+    QR.handleFiles([blob])
 
   handleUrl:  ->
-    <% if (type === 'crx') { %>
     url = prompt("Insert an url:")
-    return if url == null
-    
+    return if url is null
+    <% if (type === 'crx') { %>
     xhr = new XMLHttpRequest();
     xhr.open('GET', url, true)
     xhr.responseType = 'blob'
-    
     xhr.onload = (e) ->
-      if this.readyState == this.DONE && xhr.status == 200
-        urlBlob = new Blob([this.response], {type : this.getResponseHeader('content-type')})
-        console.log(urlBlob.type)
-        return if urlBlob.type == null
-        unless urlBlob.type in QR.mimeTypes
-          QR.error "Unsupported file type."
-        QR.handleFiles([urlBlob])
+      if @readyState is @DONE && xhr.status is 200
+        urlBlob = new Blob([@response], {type : @getResponseHeader('content-type')})
+        urlBlob.name = url.substr(url.lastIndexOf('/')+1, url.length)
+        QR.handleBlob(urlBlob)
         return
       else
         QR.error "Can't load image."
         return
-        
+
     xhr.onerror = (e) ->
       QR.error "Can't load image."
       return
-    
+
     xhr.send()
     return
     <% } %>
-    <% if (type === 'currently-not-working-userscript') { %>
+
+    <% if (type === 'userscript') { %>
     GM_xmlhttpRequest {
       method: "GET",
       url: url,
-      responseType: 'blob',
+      overrideMimeType: "text/plain; charset=x-user-defined",
       onload: (xhr) ->
-        urlBlob = new Blob([xhr.response], {type: 'image/png'})
-        QR.handleFiles([urlBlob])
+        r = xhr.responseText
+        data = new Uint8Array(r.length)
+        i = 0
+        while i < r.length
+          data[i] = r.charCodeAt(i)
+          i++
+        #QUALITY coding at work
+        header = xhr.responseHeaders
+        start = header.indexOf("Content-Type: ") + 14
+        end = header.substr(start, header.length).indexOf("\n") - 1
+        mime = header.substr(start, end)
+        return if mime is null
+
+        urlBlob = new Blob([data], {type: mime})
+
+        urlBlob.name = url.substr(url.lastIndexOf('/')+1, url.length)
+        QR.handleBlob(urlBlob)
         return
+
+        onerror: (xhr) ->
+          QR.error "Can't load image."
     }
     return
     <% } %>
-  
 
   handleFiles: (files) ->
     if @ isnt QR # file input

src/Posting/QR.post.coffee

@@ -157,7 +157,7 @@ QR.post = class
     return
 
   setFile: (@file) ->
-    @filename = file.name || "File from url"
+    @filename = file.name
     @filesize = $.bytesToString file.size
     @nodes.label.hidden = false if QR.spoiler
     URL.revokeObjectURL @URL
@@ -262,4 +262,4 @@ QR.post = class
     (if oldIndex < newIndex then $.after else $.before) @, el
     post = QR.posts.splice(oldIndex, 1)[0]
     QR.posts.splice newIndex, 0, post
-    QR.status()
+    QR.status()