Merge branch 'v3'

Also add Backlink Icons from OneeChan

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js

src/General/Config.coffee

@@ -532,6 +532,10 @@ Config =
         false
         'Hides lines between threads.'
       ]
+      'Backlink Icons': [
+        false
+        'Replaces backlink text with a small, compact icon.'
+      ]
 
     Aesthetics:
       '4chan SS Navigation': [

src/General/css/layout.css

@@ -1212,7 +1212,7 @@ nav a,
   font-size: 80%;
 }
 div.post div.postInfo {
-  padding: 3px 3px 0;
+  padding: 1px 3px;
   display: block !important;
 }
 .postInfo > span {
@@ -1463,9 +1463,9 @@ a.useremail:last-of-type {
 /* Checkboxes */
 .rice {
   cursor: pointer;
-  width: 9px;
+  width: .7em;
-  height: 9px;
+  height: .7em;
-  margin: 2px 3px 3px;
+  margin: 2px 3px;
   display: inline-block;
   vertical-align: bottom;
 }

src/General/css/theme.css

@@ -286,6 +286,12 @@ a {
 .backlink {
   color: #{theme["Backlinks"]};
 }
+.backlink-icons .backlink {
+  background-image: url("data:image/svg+xml,<svg viewBox='0 0 30 30' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(#{bLink.rgb()})' d='M12.981,9.073V6.817l-12.106,6.99l12.106,6.99v-2.422c3.285-0.002,9.052,0.28,9.052,2.269c0,2.78-6.023,4.263-6.023,4.263v2.132c0,0,13.53,0.463,13.53-9.823C29.54,9.134,17.952,8.831,12.981,9.073z'/></svg>");  font-size: 0px !important;
+  padding: 12px 12px 1px 1px;
+  opacity: 0.6;
+  vertical-align: super;
+}
 .qiQuote,
 .quotelink {
   color: #{theme["Quotelinks"]};

src/General/lib/$.coffee

@@ -351,11 +351,13 @@ do ->
   timeout = {}
   setArea = (area) ->
     data = items[area]
-    return if !Object.keys(data).length or timeout[area] > Date.now()
+    keys = Object.keys data
+    return if !keys.length or timeout[area] > Date.now()
     chrome.storage[area].set data, ->
       if chrome.runtime.lastError
         c.error chrome.runtime.lastError.message
-        for key, val of data when key not of items[area]
+        for key in keys when !items[area][key]
+          val = data[key]
           if area is 'sync' and chrome.storage.sync.QUOTA_BYTES_PER_ITEM < JSON.stringify(val).length + key.length
             c.error chrome.runtime.lastError.message, key, val
             continue

src/Linkification/Linkify.coffee

@@ -76,7 +76,7 @@ Linkify =
     | # This should account for virtually all links posted without http:
     [-a-z\d]+[.](
       aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[a-z]{2}
-    )(/|(?!.))
+    )([:/]|(?!.))
     | # IPv4 Addresses
     [\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}
     | # E-mails

src/Theming/Style.coffee

@@ -124,6 +124,7 @@ Style =
   theme: (theme) ->
     bgColor  = new Color backgroundC = theme["Background Color"]
     replybg  = new Color theme["Reply Background"]
+    bLink    = new Color theme["Backlinks"]
     replyRGB = "rgb(#{replybg.shiftRGB parseInt(Conf['Silhouette Contrast'], 10), true})"
 
     Style.lightTheme = bgColor.isLight()