From c9f5e23c923098e87adbefb44aa08f671825c4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Sun, 2 Mar 2014 23:42:38 +0100
Subject: [PATCH] Replace OC.Router.generate() with OC.generateUrl()

---
 .../editor/server/owncloud/ServerFactory.js   |  4 +-
 js/documents.js                               | 41 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js b/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js
index 0d6b2b43..2c25c49b 100644
--- a/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js
+++ b/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js
@@ -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;
             };
diff --git a/js/documents.js b/js/documents.js
index 8e32fc55..34f24281 100644
--- a/js/documents.js
+++ b/js/documents.js
@@ -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 },
@@ -420,14 +420,15 @@ var documentsMain = {
 				$('header,footer').show();
 			}
 			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+'")');