revert: fix(location): fix parameter handling on search()

IgorMinar · IgorMinar · commit 9c53d0769e04 · 2013-08-01T09:34:56.000-07:00
This reverts commit 90532f5. The commit contains references to minErr that are not available in the stable branch.
diff --git a/docs/content/error/location/wpt.ngdoc b/docs/content/error/location/wpt.ngdoc
diff --git a/src/ng/location.js b/src/ng/location.js
@@ -349,24 +349,17 @@ LocationUrl.prototype = {
    * @return {string} search
    */
   search: function(search, paramValue) {
-    switch (arguments.length) {
-      case 0:
-        return this.$$search;
-      case 1:
-        if (isString(search)) {
-          this.$$search = parseKeyValue(search);
-        } else if (isObject(search)) {
-          this.$$search = search;
-        } else {
-          throw $locationMinErr('wpt', 'First parameter of function must be string or an object.');
-        }
-        break;
-      default:
-        if (paramValue == undefined || paramValue == null) {
-          delete this.$$search[search];
-        } else {
-          this.$$search[search] = paramValue;
-        }
+    if (isUndefined(search))
+      return this.$$search;
+
+    if (isDefined(paramValue)) {
+      if (paramValue === null) {
+        delete this.$$search[search];
+      } else {
+        this.$$search[search] = paramValue;
+      }
+    } else {
+      this.$$search = isString(search) ? parseKeyValue(search) : search;
     }
 
     this.$$compose();
diff --git a/test/ng/locationSpec.js b/test/ng/locationSpec.js
@@ -78,35 +78,6 @@ describe('$location', function() {
     });
 
 
-    it('search() should handle multiple value', function() {
-      url.search('a&b');
-      expect(url.search()).toEqual({a: true, b: true});
-
-      url.search('a', null);
-
-      expect(url.search()).toEqual({b: true});
-
-      url.search('b', undefined);
-      expect(url.search()).toEqual({});
-    });
-
-
-    it('search() should handle single value', function() {
-      url.search('ignore');
-      expect(url.search()).toEqual({ignore: true});
-    });
-
-
-    it('search() should throw error an incorrect argument', function() {
-      expect(function() {
-        url.search(null);
-      }).toThrow('[$location:wpt] First parameter of function must be string or an object.');
-      expect(function() {
-        url.search(undefined);
-      }).toThrow('[$location:wpt] First parameter of function must be string or an object.');
-    });
-
-
     it('hash() should change hash fragment', function() {
       url.hash('new-hash');
       expect(url.hash()).toBe('new-hash');
