DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace OC.Router.generate() with OC.generateUrl()

Browse Source
This commit is contained in:
Thomas Müller 2014-03-02 23:42:38 +01:00
parent 8b71362d0e
commit c9f5e23c92
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js vendored
View File

@ -41,12 +41,12 @@ define("webodf/editor/server/owncloud/ServerFactory", [
var server;
args = args || {};
args.url = OC.filePath('documents', 'ajax', 'otpoll.php');
args.sessionStateToFileUrl = OC.Router.generate('documents_session_save');
args.sessionStateToFileUrl = OC.generateUrl('apps/documents/ajax/session/save');
server = new PullBoxServer(args);
server.getGenesisUrl = function(sid) {
// what a dirty hack :)
return OC.Router.generate('documents_genesis') + '/' + sid;
return OC.generateUrl('apps/documents/ajax/genesis/{es_id}', {es_id: sid});
};
return server;
};

39
js/documents.js
View File

@ -241,9 +241,9 @@ var documentsMain = {
console.log('joining session '+fileId);
var url;
if (documentsMain.isGuest){
url = OC.Router.generate('documents_session_joinasguest') + '/' + fileId;
url = OC.generateUrl('apps/documents/ajax/session/joinasguest/{token}') + '/' + fileId;
} else {
url = OC.Router.generate('documents_session_joinasuser') + '/' + fileId;
url = OC.generateUrl('apps/documents/ajax/session/joinasuser/{file_id}', {file_id: fileId});
}
$.post(
url,
@ -270,7 +270,7 @@ var documentsMain = {
docElem.insertAfter('.documentslist .template');
docElem.show();
$.post(
OC.Router.generate('documents_documents_create'),
OC.generateUrl('apps/documents/ajax/documents/create'),
{},
documentsMain.show
);
@ -301,7 +301,7 @@ var documentsMain = {
},
renameDocument: function(name) {
var url = OC.Router.generate('documents_rename') + '/' + documentsMain.fileId;
var url = OC.generateUrl('apps/documents/ajax/documents/rename/{file_id}', {file_id: documentsMain.fileId});
$.post(
url,
{ name : name },
@ -421,13 +421,14 @@ var documentsMain = {
}
documentsMain.webodfEditorInstance.destroy(documentsMain.UI.hideEditor);
var url = '';
if (documentsMain.isGuest){
var url = OC.Router.generate('documents_user_disconnectGuest');
url = OC.generateUrl('apps/documents/ajax/user/disconnectGuest/{member_id}', {member_id: documentsMain.memberId});
} else {
var url = OC.Router.generate('documents_user_disconnect');
url = OC.generateUrl('apps/documents/ajax/user/disconnect/{member_id}', {member_id: documentsMain.memberId});
}
$.post(url + '/' + documentsMain.memberId, {esId: documentsMain.esId});
$.post(url, {esId: documentsMain.esId});
documentsMain.show();
// });
@ -453,18 +454,16 @@ var documentsMain = {
loadDocuments: function () {
var self = this;
var def = new $.Deferred();
OC.Router.registerLoadedCallback(function () {
jQuery.getJSON(OC.Router.generate('documents_documents_list'))
.done(function (data) {
self._documents = data.documents;
self._sessions = data.sessions;
self._members = data.members;
def.resolve();
})
.fail(function(data){
console.log(t('documents','Failed to load documents.'));
});
});
jQuery.getJSON(OC.generateUrl('apps/documents/ajax/documents/list'))
.done(function (data) {
self._documents = data.documents;
self._sessions = data.sessions;
self._members = data.members;
def.resolve();
})
.fail(function(data){
console.log(t('documents','Failed to load documents.'));
});
return def;
},
@ -482,7 +481,7 @@ var documentsMain = {
docElem.attr('data-id', document.fileid);
var a = docElem.find('a');
a.attr('href', OC.Router.generate('download',{file:document.path}));
a.attr('href', OC.generateUrl('apps/files/download{file}',{file:document.path}));
a.find('label').text(document.name);
a.css('background-image', 'url("'+document.icon+'")');