Merge branch 'v3' of github.com:zixaphir/appchan-x into v3

Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	builds/crx/script.js

src/code/misc/header.coffee

@@ -178,7 +178,7 @@ Header =
     (if hide then $.addClass else $.rmClass) Header.nav, 'autohide'
 
   hashScroll: ->
-    return unless post = $.id @location.hash[1..]
+    return unless post = @location.hash[1..]
     return if (Get.postFromRoot post).isHidden
     Header.scrollToPost post
 

src/code/misc/keybinds.coffee

@@ -132,6 +132,7 @@ Keybinds =
     if quote
       QR.quote.call $ 'input', $('.post.highlight', thread) or thread
     QR.nodes.com.focus()
+    $.rmClass $('.qr-shortcut'), 'disabled'
 
   tags: (tag, ta) ->
     value    = ta.value

src/code/posting/qr.coffee

@@ -79,6 +79,7 @@ QR =
     QR.cleanNotifications()
     d.activeElement.blur()
     $.rmClass QR.nodes.el, 'dump'
+    $.toggleClass $('.qr-shortcut'), 'disabled'
     for i in QR.posts
       QR.posts[0].rm()
     QR.cooldown.auto = false
@@ -293,6 +294,8 @@ QR =
     QR.selected.save com
     QR.selected.save thread
 
+    $.rmClass $('.qr-shortcut'), 'disabled'
+
   characterCount: ->
     counter = QR.nodes.charCount
     count   = QR.nodes.com.textLength
@@ -727,7 +730,10 @@ QR =
   dialog: ->
     dialog = UI.dialog 'qr', 'top:0;right:0;', """
     <div class=move>
-      <input type=checkbox id=autohide title=Auto-hide>
+      <label>
+        <input type=checkbox id=autohide title=Auto-hide>
+        Quick Reply
+      </label>
       <a href=javascript:; class=close title=Close>×</a>
       <select data-name=thread title='Create a new thread / Reply'>
         <option value=new>New thread</option>
@@ -752,8 +758,8 @@ QR =
         <span id=qr-filename-container class=field tabindex=60>
           <span id=qr-no-file>No selected file</span>
           <span id=qr-filename></span>
-          <a id=qr-filerm href=javascript:; title='Remove file' tabindex=80>×</a>
         </span>
+        <a id=qr-filerm href=javascript:; title='Remove file' tabindex=80>×</a>
         <input type=submit tabindex=70>
       </div>
       <input type=file multiple>

src/css/style.css

@@ -20,6 +20,8 @@
 .field::-moz-placeholder,
 .field:hover::-moz-placeholder {
   color: #AAA !important;
+  font-size: 13px !important;
+  opacity: 1.0 !important;
 }
 .captch-img:hover,
 .field:hover {
@@ -49,8 +51,6 @@ a[href="javascript:;"] {
 /* 4chan style fixes */
 .opContainer, .op {
   display: block !important;
-}
-.post {
   overflow: visible !important;
 }
 [hidden] {
@@ -63,10 +63,12 @@ a[href="javascript:;"] {
 #qp, #ihover,
 #updater, #thread-stats,
 #navlinks, .fixed #boardNavDesktop,
-#watcher,
 #qr {
   position: fixed;
 }
+#watcher {
+  position: absolute;
+}
 #fourchanx-settings {
   z-index: 999;
 }
@@ -192,6 +194,9 @@ a[href="javascript:;"] {
 .expand-all-shortcut {
   opacity: .45;
 }
+#navtopright a {
+  text-decoration: none;
+}
 
 /* Notifications */
 #notifications {
@@ -276,6 +281,7 @@ a[href="javascript:;"] {
 }
 #fourchanx-settings > nav {
   padding: 2px 2px 0;
+  height: 15px;
 }
 #fourchanx-settings > nav a {
   text-decoration: underline;
@@ -287,10 +293,11 @@ a[href="javascript:;"] {
 .section-container {
   overflow: auto;
   position: absolute;
-  top: 1.7em;
+  top: 2.1em;
   right: 5px;
   bottom: 5px;
   left: 5px;
+  padding-top: 10px;
 }
 .sections-list {
   padding: 0 3px;
@@ -302,14 +309,6 @@ a[href="javascript:;"] {
 .tab-selected {
   font-weight: 700;
 }
-.section-container {
-  overflow: auto;
-  position: absolute;
-  top: 1.7em;
-  right: 5px;
-  bottom: 5px;
-  left: 5px;
-}
 .section-sauce ul,
 .section-rice ul {
   list-style: none;
@@ -554,7 +553,9 @@ a.hide-announcement {
 :root.hide-original-post-form #postForm,
 :root.hide-original-post-form .postingMode,
 :root.hide-original-post-form #togglePostForm,
-#qr.autohide:not(.has-focus):not(:hover) > form {
+#qr.autohide:not(.has-focus):not(:hover) > form,
+.postingMode ~ #qr select,
+#file-n-submit:not(.has-file) #qr-filerm {
   display: none;
 }
 #qr select, #dump-button, .remove, .captcha-img {
@@ -595,10 +596,13 @@ a.hide-announcement {
   border: 1px solid #CCC; 
   width: 10%;
   margin: 0;
+  font: 13px sans-serif;
+  padding: 1px 0px 2px;
 }
-.persona input.field {
-  width: 29.6%;
-  margin: 0 0 0 0.4%;
+.persona .field:not(#dump) {
+  width: 95px;
+  min-width: 30%;
+  max-width: 30%;
 }
 #qr textarea.field {
   height: 14.8em;
@@ -614,30 +618,29 @@ input.field.tripped:not(:hover):not(:focus) {
   resize: both;
 }
 .captcha-img {
-  margin: 1px 0 0;
+  margin: 0px;
   text-align: center;
   background-image: #fff;
+  font-size: 0px;
+  min-height: 59px;
+  min-width: 302px;
 }
 .captcha-input {
   width: 100%;
   margin: 1px 0 0;
 }
 .field,
-.selectrice,
-button,
-input:not([type=radio]) {
+.selectrice {
   -moz-box-sizing: border-box;
-  font-size: 12px;
-  height: 1.6em;
-  margin: 1px 0 0;
-  vertical-align: bottom;
-  padding: 0 1px;
+  margin: 0px;
+  padding: 2px 4px 3px;
 }
 #qr textarea {
   min-width: 100%;
 }
 #qr [type='submit'] {
   width: 25%;
+  vertical-align: top;
 }
 /* Fake File Input */
 #qr-filename,
@@ -647,6 +650,11 @@ input:not([type=radio]) {
 #qr-no-file,
 .has-file #qr-filename {
   display: block;
+  padding: 0px 4px;
+  margin-bottom: 2px;
+}
+#qr-no-file {
+  color: #AAA;
 }
 #qr-filename-container {
   -moz-box-sizing: border-box;
@@ -656,15 +664,23 @@ input:not([type=radio]) {
   min-width: 74.6%;
   max-width: 74.6%;
   margin-right: 0.4%;
+  margin-top: 1px;
   overflow: hidden;
   padding: 2px 1px 0;
 }
+#qr-filename-container:hover {
+  cursor: text;
+}
 #qr-filerm {
-  position: absolute;
-  right: 3px;
-  top: 2px;
+  position: relative;
+  right: 14px;
+  bottom: 6px;
+  margin-right: -8px;
   z-index: 2;
 }
+#file-n-submit {
+  height: 23px;
+}
 #qr input[type=file] {
   display: none;
 }

src/lib/$.coffee

@@ -78,6 +78,7 @@ $.extend $,
   ajax: (url, callbacks, opts={}) ->
     {type, cred, headers, upCallbacks, form, sync} = opts
     r = new XMLHttpRequest()
+    r.overrideMimeType 'text/html'
     type or= form and 'post' or 'get'
     r.open type, url, !sync
     for key, val of headers