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

mark modules as packaged

Browse source
This commit is contained in:
Fabian Jakobs 2011-12-19 13:02:10 +01:00
commit 47aa0d88c9
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build_support/mini_require.js
View file

@ -143,7 +143,8 @@ var lookup = function(parentId, moduleName) {
var mod = {
id: moduleName,
uri: '',
exports: exports
exports: exports,
packaged: true
};
var req = function(module, callback) {

8
lib/ace/worker/worker_client.js
View file

@ -40,11 +40,11 @@ define(function(require, exports, module) {
var oop = require("../lib/oop");
var EventEmitter = require("../lib/event_emitter").EventEmitter;
var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
this.changeListener = this.changeListener.bind(this);
if (window.require.packaged) {
if (module.packaged) {
var base = this.$guessBasePath();
this.$worker = new Worker(base + packagedJs);
}
@ -64,7 +64,7 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
this.$worker.postMessage({
init : true,
tlns: tlns,
module: module,
module: mod,
classname: classname
});
@ -128,7 +128,7 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
if (!src) {
continue;
}
var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);
var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
if (m)
return m[1] || m[2];
}