jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use noconflict filter for workers too

Browse source
This commit is contained in:
nightwing 2013-02-14 00:59:04 +04:00
commit 564310b040
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile.dryice.js
View file

@ -269,9 +269,6 @@ function getWriteFilters(options, projectType) {
if (options.filters) if (options.filters)
filters = filters.concat(options.filters); filters = filters.concat(options.filters);
if (projectType == "worker")
return filters;
if (options.noconflict) if (options.noconflict)
filters.push(namespace(options.ns)); filters.push(namespace(options.ns));

1
lib/ace/worker/worker.js
View file

@ -15,6 +15,7 @@ window.console = {
} }
}; };
window.window = window; window.window = window;
window.ace = window;
window.normalizeModule = function(parentId, moduleName) { window.normalizeModule = function(parentId, moduleName) {
// normalize plugin requires // normalize plugin requires