From 49de0afc4144674c4f7854dacef819b634b960a6 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 21:19:16 -0800 Subject: [PATCH 01/15] Added rollup for browser package Originally made for nodejs runtime can now be run in browsers --- rollup.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 rollup.js diff --git a/rollup.js b/rollup.js new file mode 100644 index 0000000..ed04fad --- /dev/null +++ b/rollup.js @@ -0,0 +1,17 @@ +var rollup = require( 'rollup' ); +var coffeescript = require('rollup-plugin-coffee-script') +var cache; + +rollup.rollup({ + entry: 'src/event-kit.coffee', + plugins: [ + coffeescript() + ], + cache: cache +}).then( function ( bundle ) { + bundle.write({ + format: 'iife', + watch: true, + dest: 'lib/browser/event-kit.js' + }); +}); From 8e46a5298a1a97001692abf565825cfce916fbb6 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:05:27 -0800 Subject: [PATCH 02/15] Changed .gitignore to include lib --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7ebf6a3..53b7910 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ node_modules/ -lib/ .DS_Store npm-debug.log *.swp From aa7c55d88137593217e75756169c7d2587a88797 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:08:37 -0800 Subject: [PATCH 03/15] Updated to ES5 format --- src/disposable.coffee | 4 +++- src/emitter.coffee | 5 +++-- src/event-kit.coffee | 10 +++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/disposable.coffee b/src/disposable.coffee index cc880de..e9ebe29 100644 --- a/src/disposable.coffee +++ b/src/disposable.coffee @@ -1,6 +1,6 @@ # Essential: A handle to a resource that can be disposed. For example, # {Emitter::on} returns disposables representing subscriptions. -module.exports = + class Disposable disposed: false @@ -34,3 +34,5 @@ class Disposable @disposalAction?() @disposalAction = null return + +export default Disposable \ No newline at end of file diff --git a/src/emitter.coffee b/src/emitter.coffee index cba595f..c1be92a 100644 --- a/src/emitter.coffee +++ b/src/emitter.coffee @@ -1,4 +1,4 @@ -Disposable = require './disposable' +import './disposable.coffee' # Essential: Utility class to be used when implementing event-based APIs that # allows for handlers registered via `::on` to be invoked with calls to @@ -21,7 +21,6 @@ Disposable = require './disposable' # @emitter.emit 'did-change-name', name # @name # ``` -module.exports = class Emitter @exceptionHandlers: [] @@ -161,3 +160,5 @@ class Emitter for eventName in Object.keys(@handlersByEventName) result += @handlersByEventName[eventName].length result + +export default Emitter \ No newline at end of file diff --git a/src/event-kit.coffee b/src/event-kit.coffee index b041fb7..2115e61 100644 --- a/src/event-kit.coffee +++ b/src/event-kit.coffee @@ -1,3 +1,7 @@ -exports.Emitter = require './emitter' -exports.Disposable = require './disposable' -exports.CompositeDisposable = require './composite-disposable' +import './emitter.coffee' +# import './disposable.coffee' +# import './composite-disposable.coffee' + +window.Emitter = Emitter +# window.Disposable = Disposable +# window.CompositeDisposable = CompositeDisposable \ No newline at end of file From 431941e4bb35eef7b41bde85e8598ed41f0c66a1 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:09:28 -0800 Subject: [PATCH 04/15] Added rollup and it's deps --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index ba80916..8ba5efd 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,8 @@ "grunt-shell": "^0.2.2", "jasmine-focused": "^1.0.4", "rimraf": "^2.2.2", + "rollup": "^0.41.4", + "rollup-plugin-coffee-script": "^1.1.0", "temp": "^0.6.0" } } From 3a9c92787f8786e843a47e01aa09b2e3d14570f4 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:10:32 -0800 Subject: [PATCH 05/15] Compiled src and ready for bower platform --- debug.log | 2 + lib/browser/event-kit.js | 192 ++++++++++++++++++++++++++++++++++++ lib/composite-disposable.js | 78 +++++++++++++++ lib/disposable.js | 34 +++++++ lib/emitter.js | 158 +++++++++++++++++++++++++++++ lib/event-kit.js | 8 ++ 6 files changed, 472 insertions(+) create mode 100644 debug.log create mode 100644 lib/browser/event-kit.js create mode 100644 lib/composite-disposable.js create mode 100644 lib/disposable.js create mode 100644 lib/emitter.js create mode 100644 lib/event-kit.js diff --git a/debug.log b/debug.log new file mode 100644 index 0000000..bc26726 --- /dev/null +++ b/debug.log @@ -0,0 +1,2 @@ +[0219/212305:ERROR:tcp_listen_socket.cc(76)] Could not bind socket to 127.0.0.1:6004 +[0219/212305:ERROR:node_debugger.cc(86)] Cannot start debugger server diff --git a/lib/browser/event-kit.js b/lib/browser/event-kit.js new file mode 100644 index 0000000..5f6b808 --- /dev/null +++ b/lib/browser/event-kit.js @@ -0,0 +1,192 @@ +(function () { +'use strict'; + +var Disposable$1; + +Disposable$1 = (function() { + Disposable.prototype.disposed = false; + + Disposable.isDisposable = function(object) { + return typeof (object != null ? object.dispose : void 0) === "function"; + }; + + + /* + Section: Construction and Destruction + */ + + function Disposable(disposalAction) { + this.disposalAction = disposalAction; + } + + Disposable.prototype.dispose = function() { + if (!this.disposed) { + this.disposed = true; + if (typeof this.disposalAction === "function") { + this.disposalAction(); + } + this.disposalAction = null; + } + }; + + return Disposable; + +})(); + +var Emitter$1; + +Emitter$1 = (function() { + Emitter.exceptionHandlers = []; + + Emitter.onEventHandlerException = function(exceptionHandler) { + if (this.exceptionHandlers.length === 0) { + this.dispatch = this.exceptionHandlingDispatch; + } + this.exceptionHandlers.push(exceptionHandler); + return new Disposable((function(_this) { + return function() { + _this.exceptionHandlers.splice(_this.exceptionHandlers.indexOf(exceptionHandler), 1); + if (_this.exceptionHandlers.length === 0) { + return _this.dispatch = _this.simpleDispatch; + } + }; + })(this)); + }; + + Emitter.simpleDispatch = function(handler, value) { + return handler(value); + }; + + Emitter.exceptionHandlingDispatch = function(handler, value) { + var exception, exceptionHandler, i, len, ref, results; + try { + return handler(value); + } catch (error) { + exception = error; + ref = this.exceptionHandlers; + results = []; + for (i = 0, len = ref.length; i < len; i++) { + exceptionHandler = ref[i]; + results.push(exceptionHandler(exception)); + } + return results; + } + }; + + Emitter.dispatch = Emitter.simpleDispatch; + + Emitter.prototype.disposed = false; + + + /* + Section: Construction and Destruction + */ + + function Emitter() { + this.clear(); + } + + Emitter.prototype.clear = function() { + return this.handlersByEventName = {}; + }; + + Emitter.prototype.dispose = function() { + this.handlersByEventName = null; + return this.disposed = true; + }; + + + /* + Section: Event Subscription + */ + + Emitter.prototype.on = function(eventName, handler, unshift) { + var currentHandlers; + if (unshift == null) { + unshift = false; + } + if (this.disposed) { + throw new Error("Emitter has been disposed"); + } + if (typeof handler !== 'function') { + throw new Error("Handler must be a function"); + } + if (currentHandlers = this.handlersByEventName[eventName]) { + if (unshift) { + this.handlersByEventName[eventName] = [handler].concat(currentHandlers); + } else { + this.handlersByEventName[eventName] = currentHandlers.concat(handler); + } + } else { + this.handlersByEventName[eventName] = [handler]; + } + return new Disposable(this.off.bind(this, eventName, handler)); + }; + + Emitter.prototype.preempt = function(eventName, handler) { + return this.on(eventName, handler, true); + }; + + Emitter.prototype.off = function(eventName, handlerToRemove) { + var handler, i, len, newHandlers, oldHandlers; + if (this.disposed) { + return; + } + if (oldHandlers = this.handlersByEventName[eventName]) { + newHandlers = []; + for (i = 0, len = oldHandlers.length; i < len; i++) { + handler = oldHandlers[i]; + if (handler !== handlerToRemove) { + newHandlers.push(handler); + } + } + if (newHandlers.length > 0) { + this.handlersByEventName[eventName] = newHandlers; + } else { + delete this.handlersByEventName[eventName]; + } + } + }; + + + /* + Section: Event Emission + */ + + Emitter.prototype.emit = function(eventName, value) { + var handler, handlers, i, len, ref; + if (handlers = (ref = this.handlersByEventName) != null ? ref[eventName] : void 0) { + for (i = 0, len = handlers.length; i < len; i++) { + handler = handlers[i]; + this.constructor.dispatch(handler, value); + } + } + }; + + Emitter.prototype.getEventNames = function() { + return Object.keys(this.handlersByEventName); + }; + + Emitter.prototype.listenerCountForEventName = function(eventName) { + var ref, ref1; + return (ref = (ref1 = this.handlersByEventName[eventName]) != null ? ref1.length : void 0) != null ? ref : 0; + }; + + Emitter.prototype.getTotalListenerCount = function() { + var eventName, i, len, ref, result; + result = 0; + ref = Object.keys(this.handlersByEventName); + for (i = 0, len = ref.length; i < len; i++) { + eventName = ref[i]; + result += this.handlersByEventName[eventName].length; + } + return result; + }; + + return Emitter; + +})(); + +window.Emitter = Emitter; + +}()); diff --git a/lib/composite-disposable.js b/lib/composite-disposable.js new file mode 100644 index 0000000..4af0ac5 --- /dev/null +++ b/lib/composite-disposable.js @@ -0,0 +1,78 @@ +(function() { + var CompositeDisposable, Disposable, assertDisposable; + + Disposable = null; + + module.exports = CompositeDisposable = (function() { + CompositeDisposable.prototype.disposed = false; + + + /* + Section: Construction and Destruction + */ + + function CompositeDisposable() { + var disposable, _i, _len; + this.disposables = new Set; + for (_i = 0, _len = arguments.length; _i < _len; _i++) { + disposable = arguments[_i]; + this.add(disposable); + } + } + + CompositeDisposable.prototype.dispose = function() { + if (!this.disposed) { + this.disposed = true; + this.disposables.forEach(function(disposable) { + return disposable.dispose(); + }); + this.disposables = null; + } + }; + + + /* + Section: Managing Disposables + */ + + CompositeDisposable.prototype.add = function() { + var disposable, _i, _len; + if (!this.disposed) { + for (_i = 0, _len = arguments.length; _i < _len; _i += 1) { + disposable = arguments[_i]; + assertDisposable(disposable); + this.disposables.add(disposable); + } + } + }; + + CompositeDisposable.prototype.remove = function(disposable) { + if (!this.disposed) { + this.disposables["delete"](disposable); + } + }; + + CompositeDisposable.prototype["delete"] = function(disposable) { + this.remove(disposable); + }; + + CompositeDisposable.prototype.clear = function() { + if (!this.disposed) { + this.disposables.clear(); + } + }; + + return CompositeDisposable; + + })(); + + assertDisposable = function(disposable) { + if (Disposable == null) { + Disposable = require('./disposable'); + } + if (!Disposable.isDisposable(disposable)) { + throw new TypeError('Arguments to CompositeDisposable.add must have a .dispose() method'); + } + }; + +}).call(this); diff --git a/lib/disposable.js b/lib/disposable.js new file mode 100644 index 0000000..1895fc8 --- /dev/null +++ b/lib/disposable.js @@ -0,0 +1,34 @@ +(function() { + var Disposable; + + module.exports = Disposable = (function() { + Disposable.prototype.disposed = false; + + Disposable.isDisposable = function(object) { + return typeof (object != null ? object.dispose : void 0) === "function"; + }; + + + /* + Section: Construction and Destruction + */ + + function Disposable(disposalAction) { + this.disposalAction = disposalAction; + } + + Disposable.prototype.dispose = function() { + if (!this.disposed) { + this.disposed = true; + if (typeof this.disposalAction === "function") { + this.disposalAction(); + } + this.disposalAction = null; + } + }; + + return Disposable; + + })(); + +}).call(this); diff --git a/lib/emitter.js b/lib/emitter.js new file mode 100644 index 0000000..646d7b3 --- /dev/null +++ b/lib/emitter.js @@ -0,0 +1,158 @@ +(function() { + var Disposable, Emitter; + + Disposable = require('./disposable'); + + module.exports = Emitter = (function() { + Emitter.exceptionHandlers = []; + + Emitter.onEventHandlerException = function(exceptionHandler) { + if (this.exceptionHandlers.length === 0) { + this.dispatch = this.exceptionHandlingDispatch; + } + this.exceptionHandlers.push(exceptionHandler); + return new Disposable((function(_this) { + return function() { + _this.exceptionHandlers.splice(_this.exceptionHandlers.indexOf(exceptionHandler), 1); + if (_this.exceptionHandlers.length === 0) { + return _this.dispatch = _this.simpleDispatch; + } + }; + })(this)); + }; + + Emitter.simpleDispatch = function(handler, value) { + return handler(value); + }; + + Emitter.exceptionHandlingDispatch = function(handler, value) { + var exception, exceptionHandler, _i, _len, _ref, _results; + try { + return handler(value); + } catch (_error) { + exception = _error; + _ref = this.exceptionHandlers; + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + exceptionHandler = _ref[_i]; + _results.push(exceptionHandler(exception)); + } + return _results; + } + }; + + Emitter.dispatch = Emitter.simpleDispatch; + + Emitter.prototype.disposed = false; + + + /* + Section: Construction and Destruction + */ + + function Emitter() { + this.clear(); + } + + Emitter.prototype.clear = function() { + return this.handlersByEventName = {}; + }; + + Emitter.prototype.dispose = function() { + this.handlersByEventName = null; + return this.disposed = true; + }; + + + /* + Section: Event Subscription + */ + + Emitter.prototype.on = function(eventName, handler, unshift) { + var currentHandlers; + if (unshift == null) { + unshift = false; + } + if (this.disposed) { + throw new Error("Emitter has been disposed"); + } + if (typeof handler !== 'function') { + throw new Error("Handler must be a function"); + } + if (currentHandlers = this.handlersByEventName[eventName]) { + if (unshift) { + this.handlersByEventName[eventName] = [handler].concat(currentHandlers); + } else { + this.handlersByEventName[eventName] = currentHandlers.concat(handler); + } + } else { + this.handlersByEventName[eventName] = [handler]; + } + return new Disposable(this.off.bind(this, eventName, handler)); + }; + + Emitter.prototype.preempt = function(eventName, handler) { + return this.on(eventName, handler, true); + }; + + Emitter.prototype.off = function(eventName, handlerToRemove) { + var handler, newHandlers, oldHandlers, _i, _len; + if (this.disposed) { + return; + } + if (oldHandlers = this.handlersByEventName[eventName]) { + newHandlers = []; + for (_i = 0, _len = oldHandlers.length; _i < _len; _i++) { + handler = oldHandlers[_i]; + if (handler !== handlerToRemove) { + newHandlers.push(handler); + } + } + if (newHandlers.length > 0) { + this.handlersByEventName[eventName] = newHandlers; + } else { + delete this.handlersByEventName[eventName]; + } + } + }; + + + /* + Section: Event Emission + */ + + Emitter.prototype.emit = function(eventName, value) { + var handler, handlers, _i, _len, _ref; + if (handlers = (_ref = this.handlersByEventName) != null ? _ref[eventName] : void 0) { + for (_i = 0, _len = handlers.length; _i < _len; _i++) { + handler = handlers[_i]; + this.constructor.dispatch(handler, value); + } + } + }; + + Emitter.prototype.getEventNames = function() { + return Object.keys(this.handlersByEventName); + }; + + Emitter.prototype.listenerCountForEventName = function(eventName) { + var _ref, _ref1; + return (_ref = (_ref1 = this.handlersByEventName[eventName]) != null ? _ref1.length : void 0) != null ? _ref : 0; + }; + + Emitter.prototype.getTotalListenerCount = function() { + var eventName, result, _i, _len, _ref; + result = 0; + _ref = Object.keys(this.handlersByEventName); + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + eventName = _ref[_i]; + result += this.handlersByEventName[eventName].length; + } + return result; + }; + + return Emitter; + + })(); + +}).call(this); diff --git a/lib/event-kit.js b/lib/event-kit.js new file mode 100644 index 0000000..8250ea0 --- /dev/null +++ b/lib/event-kit.js @@ -0,0 +1,8 @@ +(function() { + exports.Emitter = require('./emitter'); + + exports.Disposable = require('./disposable'); + + exports.CompositeDisposable = require('./composite-disposable'); + +}).call(this); From bee238ba0e632052495217eb01abe9fa485e643c Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:22:51 -0800 Subject: [PATCH 06/15] Added bower.json --- bower.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..91b28db --- /dev/null +++ b/bower.json @@ -0,0 +1,19 @@ +{ + "name": "event-kit", + "description": "Simple library for implementing and consuming evented APIs", + "main": [ + "lib/event-kit.js" + ], + "keywords": [ + "event", + "kit" + ], + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ] +} \ No newline at end of file From ef3bdb2fa41c147e6be2bbb1574c6ecd34d4e038 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:23:53 -0800 Subject: [PATCH 07/15] Included composite disposable as well --- src/composite-disposable.coffee | 3 ++- src/event-kit.coffee | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/composite-disposable.coffee b/src/composite-disposable.coffee index 51ccbf4..a62c6e2 100644 --- a/src/composite-disposable.coffee +++ b/src/composite-disposable.coffee @@ -20,7 +20,6 @@ Disposable = null # destroy: -> # @disposables.dispose() # ``` -module.exports = class CompositeDisposable disposed: false @@ -85,3 +84,5 @@ assertDisposable = (disposable) -> unless Disposable.isDisposable(disposable) throw new TypeError('Arguments to CompositeDisposable.add must have a .dispose() method') return + +export default CompositeDisposable \ No newline at end of file diff --git a/src/event-kit.coffee b/src/event-kit.coffee index 2115e61..8aece90 100644 --- a/src/event-kit.coffee +++ b/src/event-kit.coffee @@ -1,7 +1,7 @@ import './emitter.coffee' -# import './disposable.coffee' -# import './composite-disposable.coffee' +import './disposable.coffee' +import './composite-disposable.coffee' window.Emitter = Emitter -# window.Disposable = Disposable -# window.CompositeDisposable = CompositeDisposable \ No newline at end of file +window.Disposable = Disposable +window.CompositeDisposable = CompositeDisposable \ No newline at end of file From e75c4476e1396a4ad2188c14637c5591e6605135 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:28:20 -0800 Subject: [PATCH 08/15] Included v2.3.0 CompositeDisposable as well From e783331289101922ef842a1c25c7e898007177ea Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:38:34 -0800 Subject: [PATCH 09/15] Fix ReferenceError due to buggy import --- lib/browser/event-kit.js | 102 ++++++++++++++++++++++++++++++++++++--- src/emitter.coffee | 2 +- src/event-kit.coffee | 6 +-- 3 files changed, 99 insertions(+), 11 deletions(-) diff --git a/lib/browser/event-kit.js b/lib/browser/event-kit.js index 5f6b808..e62b03c 100644 --- a/lib/browser/event-kit.js +++ b/lib/browser/event-kit.js @@ -1,9 +1,9 @@ (function () { 'use strict'; -var Disposable$1; +var Disposable; -Disposable$1 = (function() { +Disposable = (function() { Disposable.prototype.disposed = false; Disposable.isDisposable = function(object) { @@ -33,9 +33,11 @@ Disposable$1 = (function() { })(); -var Emitter$1; +var Disposable$1 = Disposable; -Emitter$1 = (function() { +var Emitter; + +Emitter = (function() { Emitter.exceptionHandlers = []; Emitter.onEventHandlerException = function(exceptionHandler) { @@ -43,7 +45,7 @@ Emitter$1 = (function() { this.dispatch = this.exceptionHandlingDispatch; } this.exceptionHandlers.push(exceptionHandler); - return new Disposable((function(_this) { + return new Disposable$1((function(_this) { return function() { _this.exceptionHandlers.splice(_this.exceptionHandlers.indexOf(exceptionHandler), 1); if (_this.exceptionHandlers.length === 0) { @@ -120,7 +122,7 @@ Emitter$1 = (function() { } else { this.handlersByEventName[eventName] = [handler]; } - return new Disposable(this.off.bind(this, eventName, handler)); + return new Disposable$1(this.off.bind(this, eventName, handler)); }; Emitter.prototype.preempt = function(eventName, handler) { @@ -187,6 +189,92 @@ Emitter$1 = (function() { })(); -window.Emitter = Emitter; +var Emitter$1 = Emitter; + +var CompositeDisposable; +var Disposable$2; +var assertDisposable; + +Disposable$2 = null; + +CompositeDisposable = (function() { + CompositeDisposable.prototype.disposed = false; + + + /* + Section: Construction and Destruction + */ + + function CompositeDisposable() { + var disposable, i, len; + this.disposables = new Set; + for (i = 0, len = arguments.length; i < len; i++) { + disposable = arguments[i]; + this.add(disposable); + } + } + + CompositeDisposable.prototype.dispose = function() { + if (!this.disposed) { + this.disposed = true; + this.disposables.forEach(function(disposable) { + return disposable.dispose(); + }); + this.disposables = null; + } + }; + + + /* + Section: Managing Disposables + */ + + CompositeDisposable.prototype.add = function() { + var disposable, i, len; + if (!this.disposed) { + for (i = 0, len = arguments.length; i < len; i += 1) { + disposable = arguments[i]; + assertDisposable(disposable); + this.disposables.add(disposable); + } + } + }; + + CompositeDisposable.prototype.remove = function(disposable) { + if (!this.disposed) { + this.disposables["delete"](disposable); + } + }; + + CompositeDisposable.prototype["delete"] = function(disposable) { + this.remove(disposable); + }; + + CompositeDisposable.prototype.clear = function() { + if (!this.disposed) { + this.disposables.clear(); + } + }; + + return CompositeDisposable; + +})(); + +assertDisposable = function(disposable) { + if (Disposable$2 == null) { + Disposable$2 = require('./disposable'); + } + if (!Disposable$2.isDisposable(disposable)) { + throw new TypeError('Arguments to CompositeDisposable.add must have a .dispose() method'); + } +}; + +var CompositeDisposable$1 = CompositeDisposable; + +window.Emitter = Emitter$1; + +window.Disposable = Disposable$1; + +window.CompositeDisposable = CompositeDisposable$1; }()); diff --git a/src/emitter.coffee b/src/emitter.coffee index c1be92a..81e7c15 100644 --- a/src/emitter.coffee +++ b/src/emitter.coffee @@ -1,4 +1,4 @@ -import './disposable.coffee' +import Disposable from './disposable.coffee' # Essential: Utility class to be used when implementing event-based APIs that # allows for handlers registered via `::on` to be invoked with calls to diff --git a/src/event-kit.coffee b/src/event-kit.coffee index 8aece90..2868588 100644 --- a/src/event-kit.coffee +++ b/src/event-kit.coffee @@ -1,6 +1,6 @@ -import './emitter.coffee' -import './disposable.coffee' -import './composite-disposable.coffee' +import Emitter from './emitter.coffee' +import Disposable from './disposable.coffee' +import CompositeDisposable from './composite-disposable.coffee' window.Emitter = Emitter window.Disposable = Disposable From ea3de37ca16f23761298b57ee92407a026f9686a Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:40:51 -0800 Subject: [PATCH 10/15] v2.3.1 Fixed ReferenceError showing up in browser's due to improper import From c7786e6df4908686e7156bbd7742560e9fba8013 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:50:46 -0800 Subject: [PATCH 11/15] Update bower version --- bower.json | 1 + 1 file changed, 1 insertion(+) diff --git a/bower.json b/bower.json index 91b28db..d4d6dab 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,6 @@ { "name": "event-kit", + "version": "2.3.1", "description": "Simple library for implementing and consuming evented APIs", "main": [ "lib/event-kit.js" From 2407c1296ee771d3a6b3ba7fb714fb3b06fd897c Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Sun, 19 Feb 2017 23:51:54 -0800 Subject: [PATCH 12/15] v2.3.3 From e12b7388bc819f61b466e5206d6077010cc48787 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Mon, 20 Feb 2017 02:09:45 -0800 Subject: [PATCH 13/15] Changed to UMD bundle for cross-compatibility --- rollup.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/rollup.js b/rollup.js index ed04fad..8340666 100644 --- a/rollup.js +++ b/rollup.js @@ -1,17 +1,18 @@ -var rollup = require( 'rollup' ); +var rollup = require('rollup'); var coffeescript = require('rollup-plugin-coffee-script') var cache; rollup.rollup({ entry: 'src/event-kit.coffee', plugins: [ - coffeescript() + coffeescript() ], cache: cache -}).then( function ( bundle ) { +}).then(function (bundle) { bundle.write({ - format: 'iife', + moduleName: 'self', + format: 'umd', watch: true, - dest: 'lib/browser/event-kit.js' + dest: 'lib/event-kit.js' }); -}); +}); \ No newline at end of file From d95682b1509297afec195f803815e5f1c0b4f3d8 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Mon, 20 Feb 2017 02:10:49 -0800 Subject: [PATCH 14/15] Changed to UMD format for cross compatibilty (node/browser) --- lib/browser/event-kit.js | 280 ----------------------------------- lib/composite-disposable.js | 78 ---------- lib/disposable.js | 34 ----- lib/emitter.js | 158 -------------------- lib/event-kit.js | 285 +++++++++++++++++++++++++++++++++++- src/event-kit.coffee | 4 +- 6 files changed, 281 insertions(+), 558 deletions(-) delete mode 100644 lib/browser/event-kit.js delete mode 100644 lib/composite-disposable.js delete mode 100644 lib/disposable.js delete mode 100644 lib/emitter.js diff --git a/lib/browser/event-kit.js b/lib/browser/event-kit.js deleted file mode 100644 index e62b03c..0000000 --- a/lib/browser/event-kit.js +++ /dev/null @@ -1,280 +0,0 @@ -(function () { -'use strict'; - -var Disposable; - -Disposable = (function() { - Disposable.prototype.disposed = false; - - Disposable.isDisposable = function(object) { - return typeof (object != null ? object.dispose : void 0) === "function"; - }; - - - /* - Section: Construction and Destruction - */ - - function Disposable(disposalAction) { - this.disposalAction = disposalAction; - } - - Disposable.prototype.dispose = function() { - if (!this.disposed) { - this.disposed = true; - if (typeof this.disposalAction === "function") { - this.disposalAction(); - } - this.disposalAction = null; - } - }; - - return Disposable; - -})(); - -var Disposable$1 = Disposable; - -var Emitter; - -Emitter = (function() { - Emitter.exceptionHandlers = []; - - Emitter.onEventHandlerException = function(exceptionHandler) { - if (this.exceptionHandlers.length === 0) { - this.dispatch = this.exceptionHandlingDispatch; - } - this.exceptionHandlers.push(exceptionHandler); - return new Disposable$1((function(_this) { - return function() { - _this.exceptionHandlers.splice(_this.exceptionHandlers.indexOf(exceptionHandler), 1); - if (_this.exceptionHandlers.length === 0) { - return _this.dispatch = _this.simpleDispatch; - } - }; - })(this)); - }; - - Emitter.simpleDispatch = function(handler, value) { - return handler(value); - }; - - Emitter.exceptionHandlingDispatch = function(handler, value) { - var exception, exceptionHandler, i, len, ref, results; - try { - return handler(value); - } catch (error) { - exception = error; - ref = this.exceptionHandlers; - results = []; - for (i = 0, len = ref.length; i < len; i++) { - exceptionHandler = ref[i]; - results.push(exceptionHandler(exception)); - } - return results; - } - }; - - Emitter.dispatch = Emitter.simpleDispatch; - - Emitter.prototype.disposed = false; - - - /* - Section: Construction and Destruction - */ - - function Emitter() { - this.clear(); - } - - Emitter.prototype.clear = function() { - return this.handlersByEventName = {}; - }; - - Emitter.prototype.dispose = function() { - this.handlersByEventName = null; - return this.disposed = true; - }; - - - /* - Section: Event Subscription - */ - - Emitter.prototype.on = function(eventName, handler, unshift) { - var currentHandlers; - if (unshift == null) { - unshift = false; - } - if (this.disposed) { - throw new Error("Emitter has been disposed"); - } - if (typeof handler !== 'function') { - throw new Error("Handler must be a function"); - } - if (currentHandlers = this.handlersByEventName[eventName]) { - if (unshift) { - this.handlersByEventName[eventName] = [handler].concat(currentHandlers); - } else { - this.handlersByEventName[eventName] = currentHandlers.concat(handler); - } - } else { - this.handlersByEventName[eventName] = [handler]; - } - return new Disposable$1(this.off.bind(this, eventName, handler)); - }; - - Emitter.prototype.preempt = function(eventName, handler) { - return this.on(eventName, handler, true); - }; - - Emitter.prototype.off = function(eventName, handlerToRemove) { - var handler, i, len, newHandlers, oldHandlers; - if (this.disposed) { - return; - } - if (oldHandlers = this.handlersByEventName[eventName]) { - newHandlers = []; - for (i = 0, len = oldHandlers.length; i < len; i++) { - handler = oldHandlers[i]; - if (handler !== handlerToRemove) { - newHandlers.push(handler); - } - } - if (newHandlers.length > 0) { - this.handlersByEventName[eventName] = newHandlers; - } else { - delete this.handlersByEventName[eventName]; - } - } - }; - - - /* - Section: Event Emission - */ - - Emitter.prototype.emit = function(eventName, value) { - var handler, handlers, i, len, ref; - if (handlers = (ref = this.handlersByEventName) != null ? ref[eventName] : void 0) { - for (i = 0, len = handlers.length; i < len; i++) { - handler = handlers[i]; - this.constructor.dispatch(handler, value); - } - } - }; - - Emitter.prototype.getEventNames = function() { - return Object.keys(this.handlersByEventName); - }; - - Emitter.prototype.listenerCountForEventName = function(eventName) { - var ref, ref1; - return (ref = (ref1 = this.handlersByEventName[eventName]) != null ? ref1.length : void 0) != null ? ref : 0; - }; - - Emitter.prototype.getTotalListenerCount = function() { - var eventName, i, len, ref, result; - result = 0; - ref = Object.keys(this.handlersByEventName); - for (i = 0, len = ref.length; i < len; i++) { - eventName = ref[i]; - result += this.handlersByEventName[eventName].length; - } - return result; - }; - - return Emitter; - -})(); - -var Emitter$1 = Emitter; - -var CompositeDisposable; -var Disposable$2; -var assertDisposable; - -Disposable$2 = null; - -CompositeDisposable = (function() { - CompositeDisposable.prototype.disposed = false; - - - /* - Section: Construction and Destruction - */ - - function CompositeDisposable() { - var disposable, i, len; - this.disposables = new Set; - for (i = 0, len = arguments.length; i < len; i++) { - disposable = arguments[i]; - this.add(disposable); - } - } - - CompositeDisposable.prototype.dispose = function() { - if (!this.disposed) { - this.disposed = true; - this.disposables.forEach(function(disposable) { - return disposable.dispose(); - }); - this.disposables = null; - } - }; - - - /* - Section: Managing Disposables - */ - - CompositeDisposable.prototype.add = function() { - var disposable, i, len; - if (!this.disposed) { - for (i = 0, len = arguments.length; i < len; i += 1) { - disposable = arguments[i]; - assertDisposable(disposable); - this.disposables.add(disposable); - } - } - }; - - CompositeDisposable.prototype.remove = function(disposable) { - if (!this.disposed) { - this.disposables["delete"](disposable); - } - }; - - CompositeDisposable.prototype["delete"] = function(disposable) { - this.remove(disposable); - }; - - CompositeDisposable.prototype.clear = function() { - if (!this.disposed) { - this.disposables.clear(); - } - }; - - return CompositeDisposable; - -})(); - -assertDisposable = function(disposable) { - if (Disposable$2 == null) { - Disposable$2 = require('./disposable'); - } - if (!Disposable$2.isDisposable(disposable)) { - throw new TypeError('Arguments to CompositeDisposable.add must have a .dispose() method'); - } -}; - -var CompositeDisposable$1 = CompositeDisposable; - -window.Emitter = Emitter$1; - -window.Disposable = Disposable$1; - -window.CompositeDisposable = CompositeDisposable$1; - -}()); diff --git a/lib/composite-disposable.js b/lib/composite-disposable.js deleted file mode 100644 index 4af0ac5..0000000 --- a/lib/composite-disposable.js +++ /dev/null @@ -1,78 +0,0 @@ -(function() { - var CompositeDisposable, Disposable, assertDisposable; - - Disposable = null; - - module.exports = CompositeDisposable = (function() { - CompositeDisposable.prototype.disposed = false; - - - /* - Section: Construction and Destruction - */ - - function CompositeDisposable() { - var disposable, _i, _len; - this.disposables = new Set; - for (_i = 0, _len = arguments.length; _i < _len; _i++) { - disposable = arguments[_i]; - this.add(disposable); - } - } - - CompositeDisposable.prototype.dispose = function() { - if (!this.disposed) { - this.disposed = true; - this.disposables.forEach(function(disposable) { - return disposable.dispose(); - }); - this.disposables = null; - } - }; - - - /* - Section: Managing Disposables - */ - - CompositeDisposable.prototype.add = function() { - var disposable, _i, _len; - if (!this.disposed) { - for (_i = 0, _len = arguments.length; _i < _len; _i += 1) { - disposable = arguments[_i]; - assertDisposable(disposable); - this.disposables.add(disposable); - } - } - }; - - CompositeDisposable.prototype.remove = function(disposable) { - if (!this.disposed) { - this.disposables["delete"](disposable); - } - }; - - CompositeDisposable.prototype["delete"] = function(disposable) { - this.remove(disposable); - }; - - CompositeDisposable.prototype.clear = function() { - if (!this.disposed) { - this.disposables.clear(); - } - }; - - return CompositeDisposable; - - })(); - - assertDisposable = function(disposable) { - if (Disposable == null) { - Disposable = require('./disposable'); - } - if (!Disposable.isDisposable(disposable)) { - throw new TypeError('Arguments to CompositeDisposable.add must have a .dispose() method'); - } - }; - -}).call(this); diff --git a/lib/disposable.js b/lib/disposable.js deleted file mode 100644 index 1895fc8..0000000 --- a/lib/disposable.js +++ /dev/null @@ -1,34 +0,0 @@ -(function() { - var Disposable; - - module.exports = Disposable = (function() { - Disposable.prototype.disposed = false; - - Disposable.isDisposable = function(object) { - return typeof (object != null ? object.dispose : void 0) === "function"; - }; - - - /* - Section: Construction and Destruction - */ - - function Disposable(disposalAction) { - this.disposalAction = disposalAction; - } - - Disposable.prototype.dispose = function() { - if (!this.disposed) { - this.disposed = true; - if (typeof this.disposalAction === "function") { - this.disposalAction(); - } - this.disposalAction = null; - } - }; - - return Disposable; - - })(); - -}).call(this); diff --git a/lib/emitter.js b/lib/emitter.js deleted file mode 100644 index 646d7b3..0000000 --- a/lib/emitter.js +++ /dev/null @@ -1,158 +0,0 @@ -(function() { - var Disposable, Emitter; - - Disposable = require('./disposable'); - - module.exports = Emitter = (function() { - Emitter.exceptionHandlers = []; - - Emitter.onEventHandlerException = function(exceptionHandler) { - if (this.exceptionHandlers.length === 0) { - this.dispatch = this.exceptionHandlingDispatch; - } - this.exceptionHandlers.push(exceptionHandler); - return new Disposable((function(_this) { - return function() { - _this.exceptionHandlers.splice(_this.exceptionHandlers.indexOf(exceptionHandler), 1); - if (_this.exceptionHandlers.length === 0) { - return _this.dispatch = _this.simpleDispatch; - } - }; - })(this)); - }; - - Emitter.simpleDispatch = function(handler, value) { - return handler(value); - }; - - Emitter.exceptionHandlingDispatch = function(handler, value) { - var exception, exceptionHandler, _i, _len, _ref, _results; - try { - return handler(value); - } catch (_error) { - exception = _error; - _ref = this.exceptionHandlers; - _results = []; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - exceptionHandler = _ref[_i]; - _results.push(exceptionHandler(exception)); - } - return _results; - } - }; - - Emitter.dispatch = Emitter.simpleDispatch; - - Emitter.prototype.disposed = false; - - - /* - Section: Construction and Destruction - */ - - function Emitter() { - this.clear(); - } - - Emitter.prototype.clear = function() { - return this.handlersByEventName = {}; - }; - - Emitter.prototype.dispose = function() { - this.handlersByEventName = null; - return this.disposed = true; - }; - - - /* - Section: Event Subscription - */ - - Emitter.prototype.on = function(eventName, handler, unshift) { - var currentHandlers; - if (unshift == null) { - unshift = false; - } - if (this.disposed) { - throw new Error("Emitter has been disposed"); - } - if (typeof handler !== 'function') { - throw new Error("Handler must be a function"); - } - if (currentHandlers = this.handlersByEventName[eventName]) { - if (unshift) { - this.handlersByEventName[eventName] = [handler].concat(currentHandlers); - } else { - this.handlersByEventName[eventName] = currentHandlers.concat(handler); - } - } else { - this.handlersByEventName[eventName] = [handler]; - } - return new Disposable(this.off.bind(this, eventName, handler)); - }; - - Emitter.prototype.preempt = function(eventName, handler) { - return this.on(eventName, handler, true); - }; - - Emitter.prototype.off = function(eventName, handlerToRemove) { - var handler, newHandlers, oldHandlers, _i, _len; - if (this.disposed) { - return; - } - if (oldHandlers = this.handlersByEventName[eventName]) { - newHandlers = []; - for (_i = 0, _len = oldHandlers.length; _i < _len; _i++) { - handler = oldHandlers[_i]; - if (handler !== handlerToRemove) { - newHandlers.push(handler); - } - } - if (newHandlers.length > 0) { - this.handlersByEventName[eventName] = newHandlers; - } else { - delete this.handlersByEventName[eventName]; - } - } - }; - - - /* - Section: Event Emission - */ - - Emitter.prototype.emit = function(eventName, value) { - var handler, handlers, _i, _len, _ref; - if (handlers = (_ref = this.handlersByEventName) != null ? _ref[eventName] : void 0) { - for (_i = 0, _len = handlers.length; _i < _len; _i++) { - handler = handlers[_i]; - this.constructor.dispatch(handler, value); - } - } - }; - - Emitter.prototype.getEventNames = function() { - return Object.keys(this.handlersByEventName); - }; - - Emitter.prototype.listenerCountForEventName = function(eventName) { - var _ref, _ref1; - return (_ref = (_ref1 = this.handlersByEventName[eventName]) != null ? _ref1.length : void 0) != null ? _ref : 0; - }; - - Emitter.prototype.getTotalListenerCount = function() { - var eventName, result, _i, _len, _ref; - result = 0; - _ref = Object.keys(this.handlersByEventName); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - eventName = _ref[_i]; - result += this.handlersByEventName[eventName].length; - } - return result; - }; - - return Emitter; - - })(); - -}).call(this); diff --git a/lib/event-kit.js b/lib/event-kit.js index 8250ea0..41560e0 100644 --- a/lib/event-kit.js +++ b/lib/event-kit.js @@ -1,8 +1,283 @@ -(function() { - exports.Emitter = require('./emitter'); +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : + typeof define === 'function' && define.amd ? define(['exports'], factory) : + (factory((global.self = global.self || {}))); +}(this, (function (exports) { 'use strict'; - exports.Disposable = require('./disposable'); +var Disposable; - exports.CompositeDisposable = require('./composite-disposable'); +Disposable = (function() { + Disposable.prototype.disposed = false; -}).call(this); + Disposable.isDisposable = function(object) { + return typeof (object != null ? object.dispose : void 0) === "function"; + }; + + + /* + Section: Construction and Destruction + */ + + function Disposable(disposalAction) { + this.disposalAction = disposalAction; + } + + Disposable.prototype.dispose = function() { + if (!this.disposed) { + this.disposed = true; + if (typeof this.disposalAction === "function") { + this.disposalAction(); + } + this.disposalAction = null; + } + }; + + return Disposable; + +})(); + +var Disposable$1 = Disposable; + +var Emitter; + +Emitter = (function() { + Emitter.exceptionHandlers = []; + + Emitter.onEventHandlerException = function(exceptionHandler) { + if (this.exceptionHandlers.length === 0) { + this.dispatch = this.exceptionHandlingDispatch; + } + this.exceptionHandlers.push(exceptionHandler); + return new Disposable$1((function(_this) { + return function() { + _this.exceptionHandlers.splice(_this.exceptionHandlers.indexOf(exceptionHandler), 1); + if (_this.exceptionHandlers.length === 0) { + return _this.dispatch = _this.simpleDispatch; + } + }; + })(this)); + }; + + Emitter.simpleDispatch = function(handler, value) { + return handler(value); + }; + + Emitter.exceptionHandlingDispatch = function(handler, value) { + var exception, exceptionHandler, i, len, ref, results; + try { + return handler(value); + } catch (error) { + exception = error; + ref = this.exceptionHandlers; + results = []; + for (i = 0, len = ref.length; i < len; i++) { + exceptionHandler = ref[i]; + results.push(exceptionHandler(exception)); + } + return results; + } + }; + + Emitter.dispatch = Emitter.simpleDispatch; + + Emitter.prototype.disposed = false; + + + /* + Section: Construction and Destruction + */ + + function Emitter() { + this.clear(); + } + + Emitter.prototype.clear = function() { + return this.handlersByEventName = {}; + }; + + Emitter.prototype.dispose = function() { + this.handlersByEventName = null; + return this.disposed = true; + }; + + + /* + Section: Event Subscription + */ + + Emitter.prototype.on = function(eventName, handler, unshift) { + var currentHandlers; + if (unshift == null) { + unshift = false; + } + if (this.disposed) { + throw new Error("Emitter has been disposed"); + } + if (typeof handler !== 'function') { + throw new Error("Handler must be a function"); + } + if (currentHandlers = this.handlersByEventName[eventName]) { + if (unshift) { + this.handlersByEventName[eventName] = [handler].concat(currentHandlers); + } else { + this.handlersByEventName[eventName] = currentHandlers.concat(handler); + } + } else { + this.handlersByEventName[eventName] = [handler]; + } + return new Disposable$1(this.off.bind(this, eventName, handler)); + }; + + Emitter.prototype.preempt = function(eventName, handler) { + return this.on(eventName, handler, true); + }; + + Emitter.prototype.off = function(eventName, handlerToRemove) { + var handler, i, len, newHandlers, oldHandlers; + if (this.disposed) { + return; + } + if (oldHandlers = this.handlersByEventName[eventName]) { + newHandlers = []; + for (i = 0, len = oldHandlers.length; i < len; i++) { + handler = oldHandlers[i]; + if (handler !== handlerToRemove) { + newHandlers.push(handler); + } + } + if (newHandlers.length > 0) { + this.handlersByEventName[eventName] = newHandlers; + } else { + delete this.handlersByEventName[eventName]; + } + } + }; + + + /* + Section: Event Emission + */ + + Emitter.prototype.emit = function(eventName, value) { + var handler, handlers, i, len, ref; + if (handlers = (ref = this.handlersByEventName) != null ? ref[eventName] : void 0) { + for (i = 0, len = handlers.length; i < len; i++) { + handler = handlers[i]; + this.constructor.dispatch(handler, value); + } + } + }; + + Emitter.prototype.getEventNames = function() { + return Object.keys(this.handlersByEventName); + }; + + Emitter.prototype.listenerCountForEventName = function(eventName) { + var ref, ref1; + return (ref = (ref1 = this.handlersByEventName[eventName]) != null ? ref1.length : void 0) != null ? ref : 0; + }; + + Emitter.prototype.getTotalListenerCount = function() { + var eventName, i, len, ref, result; + result = 0; + ref = Object.keys(this.handlersByEventName); + for (i = 0, len = ref.length; i < len; i++) { + eventName = ref[i]; + result += this.handlersByEventName[eventName].length; + } + return result; + }; + + return Emitter; + +})(); + +var Emitter$1 = Emitter; + +var CompositeDisposable; +var Disposable$2; +var assertDisposable; + +Disposable$2 = null; + +CompositeDisposable = (function() { + CompositeDisposable.prototype.disposed = false; + + + /* + Section: Construction and Destruction + */ + + function CompositeDisposable() { + var disposable, i, len; + this.disposables = new Set; + for (i = 0, len = arguments.length; i < len; i++) { + disposable = arguments[i]; + this.add(disposable); + } + } + + CompositeDisposable.prototype.dispose = function() { + if (!this.disposed) { + this.disposed = true; + this.disposables.forEach(function(disposable) { + return disposable.dispose(); + }); + this.disposables = null; + } + }; + + + /* + Section: Managing Disposables + */ + + CompositeDisposable.prototype.add = function() { + var disposable, i, len; + if (!this.disposed) { + for (i = 0, len = arguments.length; i < len; i += 1) { + disposable = arguments[i]; + assertDisposable(disposable); + this.disposables.add(disposable); + } + } + }; + + CompositeDisposable.prototype.remove = function(disposable) { + if (!this.disposed) { + this.disposables["delete"](disposable); + } + }; + + CompositeDisposable.prototype["delete"] = function(disposable) { + this.remove(disposable); + }; + + CompositeDisposable.prototype.clear = function() { + if (!this.disposed) { + this.disposables.clear(); + } + }; + + return CompositeDisposable; + +})(); + +assertDisposable = function(disposable) { + if (Disposable$2 == null) { + Disposable$2 = require('./disposable'); + } + if (!Disposable$2.isDisposable(disposable)) { + throw new TypeError('Arguments to CompositeDisposable.add must have a .dispose() method'); + } +}; + +var CompositeDisposable$1 = CompositeDisposable; + +exports.Emitter = Emitter$1; +exports.Disposable = Disposable$1; +exports.CompositeDisposable = CompositeDisposable$1; + +Object.defineProperty(exports, '__esModule', { value: true }); + +}))); diff --git a/src/event-kit.coffee b/src/event-kit.coffee index 2868588..e75b879 100644 --- a/src/event-kit.coffee +++ b/src/event-kit.coffee @@ -2,6 +2,4 @@ import Emitter from './emitter.coffee' import Disposable from './disposable.coffee' import CompositeDisposable from './composite-disposable.coffee' -window.Emitter = Emitter -window.Disposable = Disposable -window.CompositeDisposable = CompositeDisposable \ No newline at end of file +export {Emitter, Disposable, CompositeDisposable} \ No newline at end of file From a785a05ad163a221818112d6d69f8ee2ced08039 Mon Sep 17 00:00:00 2001 From: Neek Sandhu Date: Mon, 20 Feb 2017 02:23:21 -0800 Subject: [PATCH 15/15] Namespaced exports into EventKit Object (window.EventKit) --- debug.log | 2 ++ lib/event-kit.js | 2 +- rollup.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debug.log b/debug.log index bc26726..3e024ed 100644 --- a/debug.log +++ b/debug.log @@ -1,2 +1,4 @@ [0219/212305:ERROR:tcp_listen_socket.cc(76)] Could not bind socket to 127.0.0.1:6004 [0219/212305:ERROR:node_debugger.cc(86)] Cannot start debugger server +[0220/022115:ERROR:tcp_listen_socket.cc(76)] Could not bind socket to 127.0.0.1:6004 +[0220/022115:ERROR:node_debugger.cc(86)] Cannot start debugger server diff --git a/lib/event-kit.js b/lib/event-kit.js index 41560e0..f0283d6 100644 --- a/lib/event-kit.js +++ b/lib/event-kit.js @@ -1,7 +1,7 @@ (function (global, factory) { typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof define === 'function' && define.amd ? define(['exports'], factory) : - (factory((global.self = global.self || {}))); + (factory((global.EventKit = global.EventKit || {}))); }(this, (function (exports) { 'use strict'; var Disposable; diff --git a/rollup.js b/rollup.js index 8340666..d39a24a 100644 --- a/rollup.js +++ b/rollup.js @@ -10,7 +10,7 @@ rollup.rollup({ cache: cache }).then(function (bundle) { bundle.write({ - moduleName: 'self', + moduleName: 'EventKit', format: 'umd', watch: true, dest: 'lib/event-kit.js'