Skip to content

Commit 1777119

Browse files
author
Mark Healey
committed
Updated dist/build based on upgrades so far #106
1 parent 7be56a3 commit 1777119

13 files changed

+11376
-10779
lines changed

F2.latest.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@
4545
"engines": {
4646
"node": ">=0.10"
4747
},
48-
"_releaseDate": "2013-10-15T19:06:03.723Z",
49-
"_releaseDateFormatted": "15 October 2013"
48+
"_releaseDate": "2013-10-17T17:34:05.615Z",
49+
"_releaseDateFormatted": "17 October 2013"
5050
}

sdk/f2.debug.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -10549,6 +10549,11 @@ var $, jQuery = $ = window.jQuery.noConflict(true);
1054910549
*
1055010550
* http://www.twitter.com/hij1nx
1055110551
*
10552+
* Version: 2013-09-17
10553+
* GitHub SHA: 3caacce662998d7903d368b0c0f847f259cae0f7
10554+
* https://github.com/hij1nx/EventEmitter2
10555+
* Diff this version to master: https://github.com/hij1nx/EventEmitter2/compare/3caacce662998d7903d368b0c0f847f259cae0f7...master
10556+
*
1055210557
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
1055310558
* documentation files (the 'Software'), to deal in the Software without restriction, including without limitation
1055410559
* the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
@@ -13633,7 +13638,7 @@ global.easyXDM = easyXDM;
1363313638
})(window, document, location, window.setTimeout, decodeURIComponent, encodeURIComponent);
1363413639

1363513640
/*!
13636-
* F2 v1.4.0 10-16-2013
13641+
* F2 v1.4.0 10-17-2013
1363713642
* Copyright (c) 2013 Markit On Demand, Inc. http://www.openf2.org
1363813643
*
1363913644
* "F2" is licensed under the Apache License, Version 2.0 (the "License");

sdk/f2.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/f2.min.map

+1-1
Large diffs are not rendered by default.

sdk/packages/f2.basic.js

+41-21
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,11 @@ if (typeof JSON !== 'object') {
507507
*
508508
* http://www.twitter.com/hij1nx
509509
*
510+
* Version: 2013-09-17
511+
* GitHub SHA: 3caacce662998d7903d368b0c0f847f259cae0f7
512+
* https://github.com/hij1nx/EventEmitter2
513+
* Diff this version to master: https://github.com/hij1nx/EventEmitter2/compare/3caacce662998d7903d368b0c0f847f259cae0f7...master
514+
*
510515
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
511516
* documentation files (the 'Software'), to deal in the Software without restriction, including without limitation
512517
* the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
@@ -520,29 +525,39 @@ if (typeof JSON !== 'object') {
520525
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
521526
*
522527
*/
523-
!function(exports, undefined) {
528+
;!function(exports, undefined) {
524529

525530
var isArray = Array.isArray ? Array.isArray : function _isArray(obj) {
526531
return Object.prototype.toString.call(obj) === "[object Array]";
527532
};
528533
var defaultMaxListeners = 10;
529534

530535
function init() {
531-
this._events = new Object;
536+
this._events = {};
537+
if (this._conf) {
538+
configure.call(this, this._conf);
539+
}
532540
}
533541

534542
function configure(conf) {
535543
if (conf) {
544+
545+
this._conf = conf;
546+
536547
conf.delimiter && (this.delimiter = conf.delimiter);
548+
conf.maxListeners && (this._events.maxListeners = conf.maxListeners);
537549
conf.wildcard && (this.wildcard = conf.wildcard);
550+
conf.newListener && (this.newListener = conf.newListener);
551+
538552
if (this.wildcard) {
539-
this.listenerTree = new Object;
553+
this.listenerTree = {};
540554
}
541555
}
542556
}
543557

544558
function EventEmitter(conf) {
545-
this._events = new Object;
559+
this._events = {};
560+
this.newListener = false;
546561
configure.call(this, conf);
547562
}
548563

@@ -621,15 +636,15 @@ if (typeof JSON !== 'object') {
621636
//
622637
searchListenerTree(handlers, type, xTree, i+1);
623638
}
624-
639+
625640
xxTree = tree['**'];
626641
if(xxTree) {
627642
if(i < typeLength) {
628643
if(xxTree._listeners) {
629644
// If we have a listener on a '**', it will catch all, so add its handler.
630645
searchListenerTree(handlers, type, xxTree, typeLength);
631646
}
632-
647+
633648
// Build arrays of matching next branches and others.
634649
for(branch in xxTree) {
635650
if(branch !== '_listeners' && xxTree.hasOwnProperty(branch)) {
@@ -660,7 +675,7 @@ if (typeof JSON !== 'object') {
660675
function growListenerTree(type, listener) {
661676

662677
type = typeof type === 'string' ? type.split(this.delimiter) : type.slice();
663-
678+
664679
//
665680
// Looks for two consecutive '**', if so, don't add the event at all.
666681
//
@@ -676,7 +691,7 @@ if (typeof JSON !== 'object') {
676691
while (name) {
677692

678693
if (!tree[name]) {
679-
tree[name] = new Object;
694+
tree[name] = {};
680695
}
681696

682697
tree = tree[name];
@@ -696,7 +711,7 @@ if (typeof JSON !== 'object') {
696711
if (!tree._listeners.warned) {
697712

698713
var m = defaultMaxListeners;
699-
714+
700715
if (typeof this._events.maxListeners !== 'undefined') {
701716
m = this._events.maxListeners;
702717
}
@@ -717,7 +732,7 @@ if (typeof JSON !== 'object') {
717732
name = type.shift();
718733
}
719734
return true;
720-
};
735+
}
721736

722737
// By default EventEmitters will print a warning if more than
723738
// 10 listeners are added to it. This is a useful default which
@@ -731,6 +746,8 @@ if (typeof JSON !== 'object') {
731746
EventEmitter.prototype.setMaxListeners = function(n) {
732747
this._events || init.call(this);
733748
this._events.maxListeners = n;
749+
if (!this._conf) this._conf = {};
750+
this._conf.maxListeners = n;
734751
};
735752

736753
EventEmitter.prototype.event = '';
@@ -752,7 +769,7 @@ if (typeof JSON !== 'object') {
752769
self.off(event, listener);
753770
}
754771
fn.apply(this, arguments);
755-
};
772+
}
756773

757774
listener._origin = fn;
758775

@@ -762,11 +779,12 @@ if (typeof JSON !== 'object') {
762779
};
763780

764781
EventEmitter.prototype.emit = function() {
782+
765783
this._events || init.call(this);
766784

767785
var type = arguments[0];
768786

769-
if (type === 'newListener') {
787+
if (type === 'newListener' && !this.newListener) {
770788
if (!this._events.newListener) { return false; }
771789
}
772790

@@ -783,9 +801,9 @@ if (typeof JSON !== 'object') {
783801

784802
// If there is no 'error' event listener then throw.
785803
if (type === 'error') {
786-
787-
if (!this._all &&
788-
!this._events.error &&
804+
805+
if (!this._all &&
806+
!this._events.error &&
789807
!(this.wildcard && this.listenerTree.error)) {
790808

791809
if (arguments[1] instanceof Error) {
@@ -849,7 +867,7 @@ if (typeof JSON !== 'object') {
849867
};
850868

851869
EventEmitter.prototype.on = function(type, listener) {
852-
870+
853871
if (typeof type === 'function') {
854872
this.onAny(type);
855873
return this;
@@ -885,7 +903,7 @@ if (typeof JSON !== 'object') {
885903
if (!this._events[type].warned) {
886904

887905
var m = defaultMaxListeners;
888-
906+
889907
if (typeof this._events.maxListeners !== 'undefined') {
890908
m = this._events.maxListeners;
891909
}
@@ -956,11 +974,11 @@ if (typeof JSON !== 'object') {
956974
}
957975

958976
if (position < 0) {
959-
return this;
977+
continue;
960978
}
961979

962980
if(this.wildcard) {
963-
leaf._listeners.splice(position, 1)
981+
leaf._listeners.splice(position, 1);
964982
}
965983
else {
966984
this._events[type].splice(position, 1);
@@ -974,6 +992,7 @@ if (typeof JSON !== 'object') {
974992
delete this._events[type];
975993
}
976994
}
995+
return this;
977996
}
978997
else if (handlers === listener ||
979998
(handlers.listener && handlers.listener === listener) ||
@@ -1058,7 +1077,7 @@ if (typeof JSON !== 'object') {
10581077

10591078
};
10601079

1061-
// if (typeof define === 'function' && define.amd) {
1080+
// if (typeof define === 'function' && define.amd) {
10621081
// define('EventEmitter2', [], function() {
10631082
// return EventEmitter;
10641083
// });
@@ -1068,8 +1087,9 @@ if (typeof JSON !== 'object') {
10681087

10691088
}(typeof process !== 'undefined' && typeof process.title !== 'undefined' && typeof exports !== 'undefined' ? exports : window);
10701089

1090+
10711091
/*!
1072-
* F2 v1.3.1 10-15-2013
1092+
* F2 v1.4.0 10-17-2013
10731093
* Copyright (c) 2013 Markit On Demand, Inc. http://www.openf2.org
10741094
*
10751095
* "F2" is licensed under the Apache License, Version 2.0 (the "License");

sdk/packages/f2.basic.min.js

+4-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)