| Index: frog/minfrog
|
| diff --git a/frog/minfrog b/frog/minfrog
|
| index 5382d86fcdcffe116ed949406608ec819684aaa1..b0b2712dd60e86ff3dc3ca0d402e3794f9be62bc 100755
|
| --- a/frog/minfrog
|
| +++ b/frog/minfrog
|
| @@ -1813,6 +1813,7 @@ Collections.filter = function(source, destination, f) {
|
| }
|
| return destination;
|
| }
|
| +// ********** Code for _Worker **************
|
| // ********** Code for top level **************
|
| // ********** Library node **************
|
| // ********** Code for Process **************
|
| @@ -12812,7 +12813,7 @@ World.prototype._addJavascriptTopName = function(named, name) {
|
| else if (namedPri > existingPri) {
|
| this._renameJavascriptTopName(existing);
|
| }
|
| - else {
|
| + else if ((!this._isDomWorker(named) || !this._isIsolateWorker(existing)) && (!this._isDomWorker(existing) || !this._isIsolateWorker(named))) {
|
| $globals.world.internalError(('conflicting JS name "' + name + '" of same ') + ('priority ' + existingPri + ': (already defined in) ') + ('' + existing.get$span().get$locationText() + ' with priority ' + namedPri + ')'), named.get$span(), existing.get$span());
|
| }
|
| }
|
| @@ -12820,6 +12821,12 @@ World.prototype._addJavascriptTopName = function(named, name) {
|
| this._topNames.$setindex(name, named);
|
| }
|
| }
|
| +World.prototype._isDomWorker = function(e) {
|
| + return $eq(e.get$library(), this.get$dom()) && e.get$nativeName() == 'Worker';
|
| +}
|
| +World.prototype._isIsolateWorker = function(e) {
|
| + return $eq(e.get$library(), this.get$coreimpl()) && e.get$nativeName() == 'Worker';
|
| +}
|
| World.prototype._renameJavascriptTopName = function(named) {
|
| named._jsname = ('' + named.get$library().get$jsname() + '_' + named.get$jsname());
|
| var existing = this._topNames.$index(named.get$jsname());
|
|
|