From 564310b040bb0e2838cf43c2ff53414b4e8bef1b Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 14 Feb 2013 00:59:04 +0400
Subject: [PATCH] use noconflict filter for workers too

---
 Makefile.dryice.js       | 3 ---
 lib/ace/worker/worker.js | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 4ecd397f..6c2d67db 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -269,9 +269,6 @@ function getWriteFilters(options, projectType) {
     if (options.filters)
         filters = filters.concat(options.filters);
 
-    if (projectType == "worker")
-        return filters;
-
     if (options.noconflict)
         filters.push(namespace(options.ns));
 
diff --git a/lib/ace/worker/worker.js b/lib/ace/worker/worker.js
index 00fef1f8..96ab3989 100644
--- a/lib/ace/worker/worker.js
+++ b/lib/ace/worker/worker.js
@@ -15,6 +15,7 @@ window.console = {
     }
 };
 window.window = window;
+window.ace = window;
 
 window.normalizeModule = function(parentId, moduleName) {
     // normalize plugin requires