From d45b248bfff7e1f2a5fab04c342b32dfad3ef7a1 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 16 Dec 2010 19:03:54 +0100 Subject: [PATCH] extract type checks into a separate module --- plugins/pilot/commands/basic.js | 11 +++-- plugins/pilot/typecheck.js | 80 +++++++++++++++++++++++++++++++++ plugins/pilot/util.js | 40 ----------------- 3 files changed, 85 insertions(+), 46 deletions(-) create mode 100644 plugins/pilot/typecheck.js diff --git a/plugins/pilot/commands/basic.js b/plugins/pilot/commands/basic.js index ae16a47e..68b34fa8 100644 --- a/plugins/pilot/commands/basic.js +++ b/plugins/pilot/commands/basic.js @@ -37,8 +37,7 @@ define(function(require, exports, module) { - -var util = require('pilot/util'); +var checks = require("pilot/typecheck"); var canon = require('pilot/canon'); /** @@ -165,11 +164,11 @@ var evalCommandSpec = { var type = ''; var x; - if (util.isFunction(result)) { + if (checks.isFunction(result)) { // converts the function to a well formated string msg = (result + '').replace(/\n/g, '
').replace(/ /g, ' '); type = 'function'; - } else if (util.isObject(result)) { + } else if (checks.isObject(result)) { if (Array.isArray(result)) { type = 'array'; } else { @@ -181,9 +180,9 @@ var evalCommandSpec = { for (x in result) { if (result.hasOwnProperty(x)) { - if (util.isFunction(result[x])) { + if (checks.isFunction(result[x])) { value = '[function]'; - } else if (util.isObject(result[x])) { + } else if (checks.isObject(result[x])) { value = '[object]'; } else { value = result[x]; diff --git a/plugins/pilot/typecheck.js b/plugins/pilot/typecheck.js new file mode 100644 index 00000000..40ea1630 --- /dev/null +++ b/plugins/pilot/typecheck.js @@ -0,0 +1,80 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Skywriter. + * + * The Initial Developer of the Original Code is + * Mozilla. + * Portions created by the Initial Developer are Copyright (C) 2009 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Joe Walker (jwalker@mozilla.com) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { + +var objectToString = Object.prototype.toString; + +/** + * Return true if it is a String + */ +exports.isString = function(it) { + return it && objectToString.call(it) === "[object String]"; +}; + +/** + * Returns true if it is a Boolean. + */ +exports.isBoolean = function(it) { + return it && objectToString.call(it) === "[object Boolean]"; +}; + +/** + * Returns true if it is a Number. + */ +exports.isNumber = function(it) { + return it && objectToString.call(it) === "[object Number]" && isFinite(it); +}; + +/** + * Hack copied from dojo. + */ +exports.isObject = function(it) { + return it !== undefined && + (it === null || typeof it == "object" || + Array.isArray(it) || exports.isFunction(it)); +}; + +/** + * Is the passed object a function? + * From dojo.isFunction() + */ +exports.isFunction = function(it) { + return it && objectToString.call(it) === "[object Function]"; +}; + +}); \ No newline at end of file diff --git a/plugins/pilot/util.js b/plugins/pilot/util.js index 6c1dc027..6d9a0c29 100644 --- a/plugins/pilot/util.js +++ b/plugins/pilot/util.js @@ -140,46 +140,6 @@ exports.rateLimit = function(maxRate, scope, func) { } }; -var objectToString = Object.prototype.toString; - -/** - * Return true if it is a String - */ -exports.isString = function(it) { - return it && objectToString.call(it) === "[object String]"; -}; - -/** - * Returns true if it is a Boolean. - */ -exports.isBoolean = function(it) { - return it && objectToString.call(it) === "[object Boolean]"; -}; - -/** - * Returns true if it is a Number. - */ -exports.isNumber = function(it) { - return it && objectToString.call(it) === "[object Number]" && isFinite(it); -}; - -/** - * Hack copied from dojo. - */ -exports.isObject = function(it) { - return it !== undefined && - (it === null || typeof it == "object" || - Array.isArray(it) || exports.isFunction(it)); -}; - -/** - * Is the passed object a function? - * From dojo.isFunction() - */ -exports.isFunction = function(it) { - return it && objectToString.call(it) === "[object Function]"; -}; - /** * A la Prototype endsWith(). Takes a regex excluding the '$' end marker */