fauxton commit: updated refs/heads/master to 01650f6

[ro...@apache.org]

Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 5f52818fd -> 01650f62c


fix login/logout with IE

disable caching for IE which prevents IE from logging in/out.

as IE starts to add cachebust-get-parameters when we disable ajax-
caching, i had to adjust the dev-server.

PR: #509
PR-URL: https://github.com/apache/couchdb-fauxton/pull/509
Reviewed-By: Benjamin Keen <be...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/01650f62
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/01650f62
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/01650f62

Branch: refs/heads/master
Commit: 01650f62cacbb7110b35d368080a44c9d7d93fda
Parents: 5f52818
Author: Robert Kowalski <ro...@apache.org>
Authored: Mon Aug 31 14:35:16 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Tue Sep 1 17:30:10 2015 +0200

----------------------------------------------------------------------
 app/main.js          | 5 +++++
 tasks/couchserver.js | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/01650f62/app/main.js
----------------------------------------------------------------------
diff --git a/app/main.js b/app/main.js
index 15c585c..a313b30 100644
--- a/app/main.js
+++ b/app/main.js
@@ -25,6 +25,11 @@ function (app, FauxtonAPI, LoadAddons) {
   // root folder to '/' by default.  Change in app.js.
   Backbone.history.start({ pushState: false, root: app.root });
 
+  // feature detect IE
+  if ('ActiveXObject' in window) {
+    $.ajaxSetup({ cache: false });
+  }
+
 
   // All navigation that is relative should be passed through the navigate
   // method, to be processed by the router. If the link has a `data-bypass`

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/01650f62/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/tasks/couchserver.js b/tasks/couchserver.js
index 8ea4e9f..1cee4d8 100644
--- a/tasks/couchserver.js
+++ b/tasks/couchserver.js
@@ -67,12 +67,14 @@ module.exports = function (grunt) {
       } else if (!!url.match(/mocha|\/test\/core\/|test\.config/)) {
         filePath = path.join('./test', url.replace('/test/', ''));
       } else if (!!url.match(/fonts/)) {
+        url = url.replace(/\?.*/, ''); // IE
         filePath = path.join(dist_dir, url.split('?v=')[0]);
       } else if (!!url.match(/\.css|img/)) {
         url = url.replace(/\?.*/, '');
         filePath = path.join(dist_dir, url);
-      } else if (!!url.match(/\.js$|\.html$/)) {
+      } else if (!!url.match(/\.js(\?_.*)?$|\.html(\?_.*)?$/)) {
         // server js from app directory
+        url = url.replace(/\?_.*/, '');
         filePath = path.join(app_dir, url.replace('/_utils/fauxton/', ''));
       } else if (!!url.match(/ZeroClipboard/)) {
         filePath = "./assets/js/plugins/zeroclipboard/ZeroClipboard.swf";