+ correctly handle query string when using + or #

floere · Feb 5, 2012 · 1dc88ea · 1dc88ea
1 parent 86e8af2
commit 1dc88ea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 42 deletions.
diff --git a/client/javascripts/picky.min.js b/client/javascripts/picky.min.js
diff --git a/client/javascripts/picky.source.js.tar b/client/javascripts/picky.source.js.tar
diff --git a/client/javascripts/source/picky.controller.js b/client/javascripts/source/picky.controller.js
@@ -16,7 +16,7 @@ var PickyController = function(config) {
   //
   var extractQuery = function(url) {
     var match = url && url.match(/q=([^&]+)/);
-    return match && unescape(match[1] || "");
+    return match && decodeURIComponent(match[1]).replace(/\+/g, ' ').replace(/#/g, '') || "";
   };
   this.extractQuery = extractQuery;
 
@@ -99,16 +99,10 @@ var PickyController = function(config) {
     if (full) { fullSearch(query, params); }
   };
 
-  var clearButtonClicked = function() {
-    clearInterval(liveSearchTimerId);
-    // liveSearchTimer.stop();
-  };
+  var clearButtonClicked = function() { clearInterval(liveSearchTimerId); };
   this.clearButtonClicked = clearButtonClicked;
 
-  var searchTextCleared  = function() {
-    clearInterval(liveSearchTimerId);
-    // liveSearchTimer.stop();
-  };
+  var searchTextCleared  = function() { clearInterval(liveSearchTimerId); };
   this.searchTextCleared = searchTextCleared;
 
   var shouldTriggerSearch = function(event) {
@@ -131,19 +125,13 @@ var PickyController = function(config) {
   };
   this.searchTextEntered = searchTextEntered;
 
-  var searchButtonClicked = function(text) {
-    fullSearch(text);
-  };
+  var searchButtonClicked = function(text) { fullSearch(text); };
   this.searchButtonClicked = searchButtonClicked;
 
-  var allocationChosen = function(text) {
-    fullSearch(text);
-  };
+  var allocationChosen = function(text) { fullSearch(text); };
   this.allocationChosen = allocationChosen;
 
   // Move to a view object.
-  var addinationClicked = function(text, event) {
-    fullSearch(text, { offset: event.data.offset });
-  };
+  var addinationClicked = function(text, event) { fullSearch(text, { offset: event.data.offset }); };
   this.addinationClicked = addinationClicked;
 };
diff --git a/client/test_project/javascripts/picky.controller.js b/client/test_project/javascripts/picky.controller.js
@@ -16,7 +16,7 @@ var PickyController = function(config) {
   //
   var extractQuery = function(url) {
     var match = url && url.match(/q=([^&]+)/);
-    return match && unescape(match[1] || "");
+    return match && decodeURIComponent(match[1]).replace(/\+/g, ' ').replace(/#/g, '') || "";
   };
   this.extractQuery = extractQuery;
 
@@ -99,16 +99,10 @@ var PickyController = function(config) {
     if (full) { fullSearch(query, params); }
   };
 
-  var clearButtonClicked = function() {
-    clearInterval(liveSearchTimerId);
-    // liveSearchTimer.stop();
-  };
+  var clearButtonClicked = function() { clearInterval(liveSearchTimerId); };
   this.clearButtonClicked = clearButtonClicked;
 
-  var searchTextCleared  = function() {
-    clearInterval(liveSearchTimerId);
-    // liveSearchTimer.stop();
-  };
+  var searchTextCleared  = function() { clearInterval(liveSearchTimerId); };
   this.searchTextCleared = searchTextCleared;
 
   var shouldTriggerSearch = function(event) {
@@ -131,19 +125,13 @@ var PickyController = function(config) {
   };
   this.searchTextEntered = searchTextEntered;
 
-  var searchButtonClicked = function(text) {
-    fullSearch(text);
-  };
+  var searchButtonClicked = function(text) { fullSearch(text); };
   this.searchButtonClicked = searchButtonClicked;
 
-  var allocationChosen = function(text) {
-    fullSearch(text);
-  };
+  var allocationChosen = function(text) { fullSearch(text); };
   this.allocationChosen = allocationChosen;
 
   // Move to a view object.
-  var addinationClicked = function(text, event) {
-    fullSearch(text, { offset: event.data.offset });
-  };
+  var addinationClicked = function(text, event) { fullSearch(text, { offset: event.data.offset }); };
   this.addinationClicked = addinationClicked;
 };
diff --git a/generators/prototypes/client/sinatra/javascripts/picky.min.js b/generators/prototypes/client/sinatra/javascripts/picky.min.js