From 5f932ea3dcdda5ebf2336f8cff563595907a42b8 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Fri, 27 Sep 2013 20:50:52 +0200 Subject: [PATCH] Remove unneeded patch for webodf/editor/server/owncloud/ServerFactory.js that is a special class for ownCloud (Documents) and thus already has the patch applied upstream --- src/patches/otpollLocation.patch | 13 ------------- src/updateWebODF.sh | 1 - 2 files changed, 14 deletions(-) delete mode 100644 src/patches/otpollLocation.patch diff --git a/src/patches/otpollLocation.patch b/src/patches/otpollLocation.patch deleted file mode 100644 index 78370812..00000000 --- a/src/patches/otpollLocation.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js b/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js -index 3158808..bf3a32c 100644 ---- a/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js -+++ b/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js -@@ -51,7 +51,7 @@ define("webodf/editor/server/owncloud/ServerFactory", [ - this.createServer = function (args) { - var server; - args = args || {}; -- args.url = "./documents/ajax/otpoll.php"; -+ args.url = OC.filePath('documents', 'ajax', 'otpoll.php'); - args.sessionStateToFileUrl = OC.Router.generate('documents_session_save'); - - server = new PullBoxServer(args); diff --git a/src/updateWebODF.sh b/src/updateWebODF.sh index 830668f7..608888bd 100755 --- a/src/updateWebODF.sh +++ b/src/updateWebODF.sh @@ -35,4 +35,3 @@ cp "$WEBODF_BUILDDIR"/programs/editor/editor.css ./css/3rdparty/webodf # patches against upstream patch -p1 -i src/patches/fontsCssPath.patch patch -p1 -i src/patches/hideCaretAvatar.patch -patch -p1 -i src/patches/otpollLocation.patch