diff options
| author | Friedrich W. H. Kossebau <friedrich@kogmbh.com> | 2013-09-27 22:50:52 +0400 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <friedrich@kogmbh.com> | 2013-09-27 22:50:52 +0400 |
| commit | 5f932ea3dcdda5ebf2336f8cff563595907a42b8 (patch) | |
| tree | 22e20b75739c26f448604ad21a339d701a9af47d /src | |
| parent | e6794e015ca31660989ec565f753073e81875572 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/patches/otpollLocation.patch | 13 | ||||
| -rwxr-xr-x | src/updateWebODF.sh | 1 |
2 files changed, 0 insertions, 14 deletions
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 |