Merge branch 'v3'

Conflicts: builds/appchan-x.user.js
2014-03-06 20:18:33 -07:00 · 2014-03-06 20:18:33 -07:00 · c440c236ad
commit c440c236ad
parent fe8c67e03e bc15231170
3 changed files with 5 additions and 5 deletions
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@ -433,7 +433,7 @@ QR =
    QR.nodes = nodes =
      el: dialog = UI.dialog 'qr', 'top:0;right:0;', <%= importHTML('Features/QuickReply') %>

-    setNode = (query, name) ->
+    setNode = (name, query) ->
      nodes[name] = $ query, dialog

    setNode 'move',          '.move'