Merge branch 'v3'

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-01-17 19:08:56 -07:00
commit 99033cdffa
3 changed files with 3 additions and 3 deletions

View File

@ -8835,7 +8835,7 @@
}
}
};
QR.req = $.ajax($.id('postForm').parentNode.action, options, extra);
QR.req = $.ajax("//sys.4chan.org/" + g.BOARD + "/post", options, extra);
QR.req.uploadStartTime = Date.now();
QR.req.progress = '...';
return QR.status();

View File

@ -8826,7 +8826,7 @@
}
}
};
QR.req = $.ajax($.id('postForm').parentNode.action, options, extra);
QR.req = $.ajax("//sys.4chan.org/" + g.BOARD + "/post", options, extra);
QR.req.uploadStartTime = Date.now();
QR.req.progress = '...';
return QR.status();

View File

@ -593,7 +593,7 @@ QR =
QR.req.progress = "#{Math.round e.loaded / e.total * 100}%"
QR.status()
QR.req = $.ajax $.id('postForm').parentNode.action, options, extra
QR.req = $.ajax "//sys.4chan.org/#{g.BOARD}/post", options, extra
# Starting to upload might take some time.
# Provide some feedback that we're starting to submit.
QR.req.uploadStartTime = Date.now()