diff --git a/dist/cli/out.js b/dist/cli/out.js index f440915..ff0ae6f 100644 --- a/dist/cli/out.js +++ b/dist/cli/out.js @@ -6,7 +6,7 @@ Output routines for HackMyResume. */ (function() { - var Class, EXTEND, FS, HANDLEBARS, HME, LO, M2C, OutputHandler, PATH, YAML, _, chalk, dbgStyle, pad, printf; + var EXTEND, FS, HANDLEBARS, HME, LO, M2C, OutputHandler, PATH, YAML, _, chalk, dbgStyle, pad, printf; chalk = require('chalk'); @@ -14,8 +14,6 @@ Output routines for HackMyResume. _ = require('underscore'); - Class = require('../utils/class.js'); - M2C = require('../utils/md2chalk.js'); PATH = require('path'); @@ -39,19 +37,26 @@ Output routines for HackMyResume. /** A stateful output module. All HMR console output handled here. */ - OutputHandler = module.exports = Class.extend({ - init: function(opts) { + module.exports = OutputHandler = (function() { + function OutputHandler(opts) { + this.init(opts); + return; + } + + OutputHandler.prototype.init = function(opts) { this.opts = EXTEND(true, this.opts || {}, opts); this.msgs = YAML.load(PATH.join(__dirname, 'msg.yml')).events; - }, - log: function(msg) { + }; + + OutputHandler.prototype.log = function(msg) { var finished; msg = msg || ''; printf = require('printf'); finished = printf.apply(printf, arguments); return this.opts.silent || console.log(finished); - }, - "do": function(evt) { + }; + + OutputHandler.prototype["do"] = function(evt) { var L, WRAP, info, msg, numFormats, output, rawTpl, sty, style, suffix, template, that, themeName, tot; that = this; L = function() { @@ -151,8 +156,11 @@ Output routines for HackMyResume. return L(M2C(this.msgs.afterPeek.msg, 'yellow'), evt.requested, evt.file); } } - } - }); + }; + + return OutputHandler; + + })(); }).call(this); diff --git a/dist/utils/class.js b/dist/utils/class.js deleted file mode 100644 index d49493d..0000000 --- a/dist/utils/class.js +++ /dev/null @@ -1,72 +0,0 @@ -/** -Definition of John Resig's `Class` class. -@module class.js -*/ - -/* Simple JavaScript Inheritance - * By John Resig http://ejohn.org/ - * MIT Licensed. - * http://ejohn.org/blog/simple-javascript-inheritance/ - */ -// Inspired by base2 and Prototype -(function(){ - var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/; - - // The base Class implementation (does nothing) - this.Class = function(){}; - module.exports = Class; - - // Create a new Class that inherits from this class - Class.extend = function(prop) { - var _super = this.prototype; - - // Instantiate a base class (but only create the instance, - // don't run the init constructor) - initializing = true; - var prototype = new this(); - initializing = false; - - // Copy the properties over onto the new prototype - for (var name in prop) { - // Check if we're overwriting an existing function - prototype[name] = typeof prop[name] == "function" && - typeof _super[name] == "function" && fnTest.test(prop[name]) ? - (function(name, fn){ - return function() { - var tmp = this._super; - - // Add a new ._super() method that is the same method - // but on the super-class - this._super = _super[name]; - - // The method only need to be bound temporarily, so we - // remove it when we're done executing - var ret = fn.apply(this, arguments); - this._super = tmp; - - return ret; - }; - })(name, prop[name]) : // jshint ignore:line - prop[name]; - } - - // The dummy class constructor - function Class() { - // All construction is actually done in the init method - if ( !initializing && this.init ) - this.init.apply(this, arguments); - } - - // Populate our constructed prototype object - Class.prototype = prototype; - - // Enforce the constructor to be what we expect - Class.prototype.constructor = Class; - - // And make this class extendable - Class.extend = arguments.callee; - - return Class; - }; - -})(); diff --git a/src/cli/out.coffee b/src/cli/out.coffee index 98fec6f..9eeb0e7 100644 --- a/src/cli/out.coffee +++ b/src/cli/out.coffee @@ -9,7 +9,6 @@ Output routines for HackMyResume. chalk = require('chalk') HME = require('../core/event-codes') _ = require('underscore') -Class = require('../utils/class.js') M2C = require('../utils/md2chalk.js') PATH = require('path') LO = require('lodash') @@ -22,11 +21,20 @@ pad = require('string-padding') dbgStyle = 'cyan'; -###* A stateful output module. All HMR console output handled here. ### -OutputHandler = module.exports = Class.extend - init: ( opts ) -> - @opts = EXTEND( true, this.opts || { }, opts ) +###* A stateful output module. All HMR console output handled here. ### +module.exports = class OutputHandler + + + + constructor: ( opts ) -> + @init opts + return + + + + init: (opts) -> + @opts = EXTEND( true, @opts || { }, opts ) @msgs = YAML.load(PATH.join( __dirname, 'msg.yml' )).events return @@ -39,6 +47,7 @@ OutputHandler = module.exports = Class.extend @opts.silent || console.log( finished ) + do: ( evt ) -> that = @ diff --git a/src/utils/class.js b/src/utils/class.js deleted file mode 100644 index d49493d..0000000 --- a/src/utils/class.js +++ /dev/null @@ -1,72 +0,0 @@ -/** -Definition of John Resig's `Class` class. -@module class.js -*/ - -/* Simple JavaScript Inheritance - * By John Resig http://ejohn.org/ - * MIT Licensed. - * http://ejohn.org/blog/simple-javascript-inheritance/ - */ -// Inspired by base2 and Prototype -(function(){ - var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/; - - // The base Class implementation (does nothing) - this.Class = function(){}; - module.exports = Class; - - // Create a new Class that inherits from this class - Class.extend = function(prop) { - var _super = this.prototype; - - // Instantiate a base class (but only create the instance, - // don't run the init constructor) - initializing = true; - var prototype = new this(); - initializing = false; - - // Copy the properties over onto the new prototype - for (var name in prop) { - // Check if we're overwriting an existing function - prototype[name] = typeof prop[name] == "function" && - typeof _super[name] == "function" && fnTest.test(prop[name]) ? - (function(name, fn){ - return function() { - var tmp = this._super; - - // Add a new ._super() method that is the same method - // but on the super-class - this._super = _super[name]; - - // The method only need to be bound temporarily, so we - // remove it when we're done executing - var ret = fn.apply(this, arguments); - this._super = tmp; - - return ret; - }; - })(name, prop[name]) : // jshint ignore:line - prop[name]; - } - - // The dummy class constructor - function Class() { - // All construction is actually done in the init method - if ( !initializing && this.init ) - this.init.apply(this, arguments); - } - - // Populate our constructed prototype object - Class.prototype = prototype; - - // Enforce the constructor to be what we expect - Class.prototype.constructor = Class; - - // And make this class extendable - Class.extend = arguments.callee; - - return Class; - }; - -})();