Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v3'

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/appchan-x.user.js
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.uploadStartTime = Date.now();
QR.req.progress = '...'; QR.req.progress = '...';
return QR.status(); return QR.status();

2
builds/crx/script.js
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.uploadStartTime = Date.now();
QR.req.progress = '...'; QR.req.progress = '...';
return QR.status(); return QR.status();

2
src/Posting/QR.coffee
View File

@ -593,7 +593,7 @@ QR =
QR.req.progress = "#{Math.round e.loaded / e.total * 100}%" QR.req.progress = "#{Math.round e.loaded / e.total * 100}%"
QR.status() 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. # Starting to upload might take some time.
# Provide some feedback that we're starting to submit. # Provide some feedback that we're starting to submit.
QR.req.uploadStartTime = Date.now() QR.req.uploadStartTime = Date.now()