From c84391dcf5eb8a23bcae9e558285975c6b47e7f1 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 17:19:28 +0200
Subject: show media files in date order (most recent first) after an upload is
 completed

---
 lib/scripts/fileuploaderextended.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/scripts')

diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index 0ba7a0525..f5786c387 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -188,6 +188,7 @@ qq.extend(qq.FileUploaderExtended.prototype, {
             if (i) action = action.substr(0, i);
             var button = '<form method="post" action="' + action + '" id="mediamanager__done_form"><div>';
             button += '<input type="hidden" value="' + result.ns + '" name="ns">';
+            button += '<input type="hidden" value="1" name="recent">';
             button += '<input class="button" type="submit" value="' + LANG.media_done_btn + '"></div></form>';
             jQuery('#mediamanager__uploader').append(button);
         }
-- 
cgit v1.2.3


From 2f7a0e94cadfbc1ece3bd1d3ff23483b845cd420 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 10 Sep 2013 22:17:43 -0700
Subject: Fix CodeSniffer whitespace violoations

Removed extraneous whitespace to eliminate errors reported by the
Squiz.WhiteSpace.SuperfluousWhitespace sniff.
---
 lib/scripts/linkwiz.js       | 1 -
 lib/scripts/textselection.js | 2 --
 2 files changed, 3 deletions(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index 875d4a995..f6ac9b032 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -237,7 +237,6 @@ var dw_linkwiz = {
            link = ':' + link;
         }
 
-
         var so = link.length;
         var eo = 0;
         if(dw_linkwiz.val){
diff --git a/lib/scripts/textselection.js b/lib/scripts/textselection.js
index bd80e9341..26b4196f2 100644
--- a/lib/scripts/textselection.js
+++ b/lib/scripts/textselection.js
@@ -104,7 +104,6 @@ function getSelection(textArea) {
             }
         } while ((!before_finished || !selection_finished));
 
-
         // count number of newlines in str to work around stupid IE selection bug
         var countNL = function(str) {
             var m = str.split("\r\n");
@@ -230,4 +229,3 @@ function insertAtCarret(textAreaID, text){
     var selection = getSelection(txtarea);
     pasteText(selection,text,{nosel: true});
 }
-
-- 
cgit v1.2.3


From 75e4dd8a2ec6c181e99877919b5a2b529407752a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 8 Oct 2013 00:06:46 +0200
Subject: Use in cookie a correct path, added DOKU_COOKIEPATH to js constants
 Fixes FS#2837

---
 lib/scripts/cookie.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/cookie.js b/lib/scripts/cookie.js
index 3ad67bfa4..4cb527f26 100644
--- a/lib/scripts/cookie.js
+++ b/lib/scripts/cookie.js
@@ -30,7 +30,7 @@ var DokuCookie = {
                 text.push(encodeURIComponent(key)+'#'+encodeURIComponent(val));
             }
         });
-        jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_BASE});
+        jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_COOKIEPATH});
     },
 
     /**
-- 
cgit v1.2.3


From df5d307ea8bac1f5030d42af363ae9f7469a63f2 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 10 Oct 2013 15:53:03 +0200
Subject: add cookie secure parameter to cookies set by javascript

---
 lib/scripts/cookie.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/cookie.js b/lib/scripts/cookie.js
index 4cb527f26..8417d2064 100644
--- a/lib/scripts/cookie.js
+++ b/lib/scripts/cookie.js
@@ -30,7 +30,7 @@ var DokuCookie = {
                 text.push(encodeURIComponent(key)+'#'+encodeURIComponent(val));
             }
         });
-        jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_COOKIEPATH});
+        jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_COOKIE_PARAM.path, secure: DOKU_COOKIE_PARAM.secure});
     },
 
     /**
-- 
cgit v1.2.3