Changed filterJson to filterJSON

kapilkashyap · kapilkashyap · commit 00e5899f9102 · 2012-10-15T15:06:51.000+05:30
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ matched values or the parent object of the matched values. You even have the opt
 
 Below is a basic usage:
 ````javascript
-$.fn.filterJson({ json object }, {
+$.fn.filterJSON({ json object }, {
                         property: ["prop1", "prop2", ... n],
                         wrapper: true,
                         value: "user one",
diff --git a/demos/demo.html b/demos/demo.html
@@ -6,7 +6,7 @@
 		<title>jQuery Filter JSON Plugin</title>
 		<script type="text/javascript" src="http://code.jquery.com/jquery-1.6.min.js"></script>
 		<script type="text/javascript" src="http://ajax.cdnjs.com/ajax/libs/json2/20110223/json2.js"></script>
-		<script type="text/javascript" src="../src/filterJson.plugin.min.js"></script>
+		<script type="text/javascript" src="../src/filterJSON.plugin.min.js"></script>
 		<script type="text/javascript" src="assets/sample.json"></script>
 		<link rel="stylesheet" type="text/css" href="assets/style.css" />
 	</head>
@@ -73,7 +73,7 @@
 			</tr>
 			<tr class="input-row">
 				<td colspan="2">
-					<button id="filterJson" name="Apply">Filter JSON</button>
+					<button id="filterJSON" name="Apply">Filter JSON</button>
 				</td>
 			</tr>
 			<tr class="input-row">
@@ -93,7 +93,7 @@
 			// selecting the first json sample
 			$( ":input[name='sample-select']:first" ).click();
 			
-			$( "#filterJson" ).click(function() {
+			$( "#filterJSON" ).click(function() {
 				var startTime = new Date().getTime(),
 					json = $.parseJSON( $( "#json" ).val() ),
 					property = $( "#property" ).val(),
@@ -116,7 +116,7 @@
 							matchCase: matchCase,
 							avoidDuplicates: avoidDuplicates
 						},
-						o = $.fn.filterJson(json, config).toArray();
+						o = $.fn.filterJSON(json, config).toArray();
 
 					$( "#filteredJson" ).val( (o != null && o.length > 0) ? JSON.stringify( o ) : "" );
 					$( "#info" ).html("Returned " + o.length + " results in " + (new Date().getTime() - startTime) + " milliseconds.");
diff --git a/demos/downloads.html b/demos/downloads.html
@@ -6,7 +6,7 @@
 	</head>
 	<body>
 		<div class="downlaod-heading">Filter JSON Plugin</div>
-		<div class="download-link">-&nbsp;<a href="../src/filterJson.plugin.js" target="_blank">Uncompressed Code</a> (5.86KB)</div>
-		<div class="download-link">-&nbsp;<a href="../src/filterJson.plugin.min.js" target="_blank">Minified Code</a> (2.07KB)</div>
+		<div class="download-link">-&nbsp;<a href="../src/filterJSON.plugin.js" target="_blank">Uncompressed Code</a> (5.86KB)</div>
+		<div class="download-link">-&nbsp;<a href="../src/filterJSON.plugin.min.js" target="_blank">Minified Code</a> (2.07KB)</div>
 	</body>
 </html>
diff --git a/demos/home.html b/demos/home.html
@@ -22,7 +22,7 @@
 
 				Below is a basic usage:
 <pre class="prettyprint">
-$.fn.filterJson({ json object }, {
+$.fn.filterJSON({ json object }, {
                         property: ["prop1", "prop2", ... n],
                         wrapper: true,
                         value: "user one",
diff --git a/src/filterJson.plugin.js b/src/filterJson.plugin.js
@@ -11,7 +11,7 @@
  */
 (function($) {
 	$.extend($.fn, {
-		filterJson: function( json, _config ) {
+		filterJSON: function( json, _config ) {
 			var config = {
 					property: null,
 					value: "",
@@ -21,10 +21,10 @@
 					matchCase: false,
 					avoidDuplicates: false
 				},
-				filterJsonLoop = function(json, config) {
+				filterJSONLoop = function(json, config) {
 					var errorMsg = null;
 					if($.isEmptyObject( config.property ) || !config.property[0]) {
-						errorMsg = "config.property is required to filter the json object.";
+						errorMsg = "config.property is required to filter the JSON object.";
 					}
 					if(!$.isEmptyObject(errorMsg)) {
 						if(window.console) {
@@ -47,12 +47,12 @@
 										
 										if(config.avoidDuplicates) {
 											// avoiding duplicate objects in case of multiple property check.
-											if($.inArray(_value, ret.filteredJson) == -1) {
-												ret.filteredJson.push( _value );
+											if($.inArray(_value, ret.filteredJSON) == -1) {
+												ret.filteredJSON.push( _value );
 											}
 										}
 										else {
-											ret.filteredJson.push( _value );
+											ret.filteredJSON.push( _value );
 										}
 									};
 
@@ -110,7 +110,7 @@
 											}
 											else if(type === "[object Object]") {
 												$.extend(internalConfig, config, {value: valueToCompare});
-												filterJsonLoop(originalValue, internalConfig);
+												filterJSONLoop(originalValue, internalConfig);
 											}
 										};
 
@@ -120,14 +120,14 @@
 									constructReturnObject(json, j);
 								}
 							}
-							filterJsonLoop(j, config);
+							filterJSONLoop(j, config);
 						});
 					}
 					return ret;
 				},
-				ret = {filteredJson: []},
+				ret = {filteredJSON: []},
 				returnObject = null,
-				filteredJson = null,
+				filteredJSON = null,
 				prop = null;
 
 			// extend the default config with the ones passed in by the user.
@@ -152,13 +152,13 @@
 					&& _config.avoidDuplicates == undefined) {
 				config.avoidDuplicates = true;
 			}
-			returnObject = filterJsonLoop(json, config);
+			returnObject = filterJSONLoop(json, config);
 
-			if(returnObject && returnObject.filteredJson) {
-				filteredJson = returnObject.filteredJson.length > 0 ? returnObject.filteredJson : returnObject.filteredJson[0];
+			if(returnObject && returnObject.filteredJSON) {
+				filteredJSON = returnObject.filteredJSON.length > 0 ? returnObject.filteredJSON : returnObject.filteredJSON[0];
 			}
 
-			return $(filteredJson);
+			return $(filteredJSON);
 		}
 	});
 })(jQuery);
diff --git a/src/filterJson.plugin.min.js b/src/filterJson.plugin.min.js
