diff --git a/.gitignore b/.gitignore index 2c80334a..04f175ff 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ .project .settings/ .settings.xml +.settings .c9settings.xml .c9revisions .settings.xml.old @@ -16,7 +17,6 @@ /ignore/ node_modules/ tool/node_modules/ -build/ .git-ref npm-debug.log diff --git a/.gitmodules b/.gitmodules index 0e3f48e0..5c78725c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "doc/wiki"] path = doc/wiki - url = git://github.com/ajaxorg/ace.wiki.git \ No newline at end of file + url = git://github.com/ajaxorg/ace.wiki.git +[submodule "build"] + path = build + url = https://github.com/ajaxorg/ace-builds.git diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 547c5b1a..3b53a2db 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -62,8 +62,8 @@ function main(args) { if (type == "minimal") { buildAce({ - compress: args.indexOf("-m") != -1, - noconflict: args.indexOf("-nc") != -1 + compress: args.indexOf("--m") != -1, + noconflict: args.indexOf("--nc") != -1 }); } else if (type == "normal") { ace(); diff --git a/build b/build new file mode 160000 index 00000000..b5354412 --- /dev/null +++ b/build @@ -0,0 +1 @@ +Subproject commit b5354412bfeb461b7d8020423562451a81da2c85 diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js index 405a89bb..76c89025 100644 --- a/demo/kitchen-sink/demo.js +++ b/demo/kitchen-sink/demo.js @@ -90,6 +90,7 @@ Mode.prototype.supportsFile = function(filename) { }; var modesByName = { + c9search: ["C9Search" , "c9search_results"], coffee: ["CoffeeScript" , "coffee|^Cakefile"], coldfusion: ["ColdFusion" , "cfm"], csharp: ["C#" , "cs"], @@ -104,10 +105,12 @@ var modesByName = { java: ["Java" , "java"], javascript: ["JavaScript" , "js"], json: ["JSON" , "json"], + jsx: ["JSX" , "jsx"], latex: ["LaTeX" , "latex|tex|ltx|bib"], less: ["LESS" , "less"], liquid: ["Liquid" , "liquid"], lua: ["Lua" , "lua"], + luapage: ["LuaPage" , "lp"], // http://keplerproject.github.com/cgilua/manual.html#templates markdown: ["Markdown" , "md|markdown"], ocaml: ["OCaml" , "ml|mli"], perl: ["Perl" , "pl|pm"], @@ -165,6 +168,7 @@ function makeHuge(txt) { } var docs = { + "docs/c9search.c9search_results": "C9 Search Results", "docs/javascript.js": "JavaScript", "docs/plaintext.txt": {name: "Plain Text", prepare: makeHuge, wrapped: true}, "docs/coffeescript.coffee": "Coffeescript", @@ -185,6 +189,7 @@ var docs = { "docs/ocaml.ml": "OCaml", "docs/OpenSCAD.scad": "OpenSCAD", "docs/lua.lua": "Lua", + "docs/luapage.lp": "LuaPage", "docs/liquid.liquid": "Liquid", "docs/java.java": "Java", "docs/clojure.clj": "Clojure", @@ -201,7 +206,8 @@ var docs = { "docs/latex.tex": {name: "LaTeX", wrapped: true}, "docs/sql.sql": {name: "SQL", wrapped: true}, "docs/pgsql.pgsql": {name: "pgSQL", wrapped: true}, - "docs/golang.go": "Go" + "docs/golang.go": "Go", + "docs/jsx.jsx": "JSX" } var ownSource = { diff --git a/demo/kitchen-sink/docs/c9search.c9search_results b/demo/kitchen-sink/docs/c9search.c9search_results new file mode 100644 index 00000000..bf0fdb87 --- /dev/null +++ b/demo/kitchen-sink/docs/c9search.c9search_results @@ -0,0 +1,25 @@ +Searching for 'var' in /workspace/configs + +configs/default.js: + 1: var fs = require("fs"); + 2: var argv = require('optimist').argv; + 3: var path = require("path"); + 5: var clientExtensions = {}; + 6: var clientDirs = fs.readdirSync(__dirname + "/../plugins-client"); + 7: for (var i = 0; i < clientDirs.length; i++) { + 8: var dir = clientDirs[i]; + 12: var name = dir.split(".")[1]; + 16: var projectDir = (argv.w && path.resolve(process.cwd(), argv.w)) || process.cwd(); + 17: var fsUrl = "/workspace"; + 19: var port = argv.p || process.env.PORT || 3131; + 20: var host = argv.l || "localhost"; + 22: var config = { + +configs/local.js: + 2: var config = require("./default"); + +configs/packed.js: + 1: var config = require("./default"); + + +Found 15 matches in 3 files \ No newline at end of file diff --git a/demo/kitchen-sink/docs/jsx.jsx b/demo/kitchen-sink/docs/jsx.jsx new file mode 100644 index 00000000..fbbeb662 --- /dev/null +++ b/demo/kitchen-sink/docs/jsx.jsx @@ -0,0 +1,9 @@ +/*EXPECTED +hello world! +*/ +class Test { + static function run() : void { + // console.log("hello world!"); + log "hello world!"; + } +} \ No newline at end of file diff --git a/demo/kitchen-sink/docs/luapage.lp b/demo/kitchen-sink/docs/luapage.lp new file mode 100644 index 00000000..f70c992b --- /dev/null +++ b/demo/kitchen-sink/docs/luapage.lp @@ -0,0 +1,71 @@ + + +<% --[[-- + index.lp from the Kepler Project's LuaDoc HTML doclet. + http://keplerproject.github.com/luadoc/ +--]] %> + + Reference + " type="text/css" /> + + + + +
+ +
+ +
+
+
+ +
+ + + +
+ + +<%if not options.nomodules and #doc.modules > 0 then%> +

Modules

+ + +<%for _, modulename in ipairs(doc.modules) do%> + + + + +<%end%> +
<%=modulename%><%=doc.modules[modulename].summary%>
+<%end%> + + + +<%if not options.nofiles and #doc.files > 0 then%> +

Files

+ + +<%for _, filepath in ipairs(doc.files) do%> + + + + +<%end%> +
<%=filepath%>
+<%end%> + +
+ +
+ +
+

Valid XHTML 1.0!

+
+ +
+ + diff --git a/demo/kitchen-sink/require.js b/demo/kitchen-sink/require.js index 068e34c8..d016e1da 100644 --- a/demo/kitchen-sink/require.js +++ b/demo/kitchen-sink/require.js @@ -1,54 +1,98 @@ /** vim: et:ts=4:sw=4:sts=4 - * @license RequireJS 1.0.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. + * @license RequireJS 2.0.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/requirejs for details */ -/*jslint strict: false, plusplus: false, sub: true */ +/*jslint regexp: true, nomen: true */ /*global window, navigator, document, importScripts, jQuery, setTimeout, opera */ var requirejs, require, define; -(function (undefined) { - //Change this version number for each release. - var version = "1.0.8", +(function (global) { + 'use strict'; + + var version = '2.0.1', commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, - cjsRequireRegExp = /require\(\s*["']([^'"\s]+)["']\s*\)/g, - currDirRegExp = /^\.\//, + cjsRequireRegExp = /require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, jsSuffixRegExp = /\.js$/, + currDirRegExp = /^\.\//, ostring = Object.prototype.toString, ap = Array.prototype, aps = ap.slice, apsp = ap.splice, - isBrowser = !!(typeof window !== "undefined" && navigator && document), - isWebWorker = !isBrowser && typeof importScripts !== "undefined", + isBrowser = !!(typeof window !== 'undefined' && navigator && document), + isWebWorker = !isBrowser && typeof importScripts !== 'undefined', //PS3 indicates loaded and complete, but need to wait for complete - //specifically. Sequence is "loading", "loaded", execution, - // then "complete". The UA check is unfortunate, but not sure how + //specifically. Sequence is 'loading', 'loaded', execution, + // then 'complete'. The UA check is unfortunate, but not sure how //to feature test w/o causing perf issues. readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ? /^complete$/ : /^(complete|loaded)$/, - defContextName = "_", + defContextName = '_', //Oh the tragedy, detecting opera. See the usage of isOpera for reason. - isOpera = typeof opera !== "undefined" && opera.toString() === "[object Opera]", - empty = {}, + isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]', contexts = {}, + cfg = {}, globalDefQueue = [], - interactiveScript = null, - checkLoadedDepth = 0, useInteractive = false, - reservedDependencies = { - require: true, - module: true, - exports: true - }, - req, cfg = {}, currentlyAddingScript, s, head, baseElement, scripts, script, - src, subPath, mainScript, dataMain, globalI, ctx, jQueryCheck, checkLoadedTimeoutId; + req, s, head, baseElement, dataMain, src, + interactiveScript, currentlyAddingScript, mainScript, subPath; function isFunction(it) { - return ostring.call(it) === "[object Function]"; + return ostring.call(it) === '[object Function]'; } function isArray(it) { - return ostring.call(it) === "[object Array]"; + return ostring.call(it) === '[object Array]'; + } + + /** + * Helper function for iterating over an array. If the func returns + * a true value, it will break out of the loop. + */ + function each(ary, func) { + if (ary) { + var i; + for (i = 0; i < ary.length; i += 1) { + if (func(ary[i], i, ary)) { + break; + } + } + } + } + + /** + * Helper function for iterating over an array backwards. If the func + * returns a true value, it will break out of the loop. + */ + function eachReverse(ary, func) { + if (ary) { + var i; + for (i = ary.length - 1; i > -1; i -= 1) { + if (func(ary[i], i, ary)) { + break; + } + } + } + } + + function hasProp(obj, prop) { + return obj.hasOwnProperty(prop); + } + + /** + * Cycles over properties in an object and calls a function for each + * property value. If the function returns a truthy value, then the + * iteration is stopped. + */ + function eachProp(obj, func) { + var prop; + for (prop in obj) { + if (obj.hasOwnProperty(prop)) { + if (func(obj[prop], prop)) { + break; + } + } + } } /** @@ -59,12 +103,64 @@ var requirejs, require, define; * trigger a problem related to that. */ function mixin(target, source, force) { - for (var prop in source) { - if (!(prop in empty) && (!(prop in target) || force)) { - target[prop] = source[prop]; - } + if (source) { + eachProp(source, function (value, prop) { + if (force || !hasProp(target, prop)) { + target[prop] = value; + } + }); } - return req; + } + + //Similar to Function.prototype.bind, but the 'this' object is specified + //first, since it is easier to read/figure out what 'this' will be. + function bind(obj, fn) { + return function () { + return fn.apply(obj, arguments); + }; + } + + function scripts() { + return document.getElementsByTagName('script'); + } + + //Allow getting a global that expressed in + //dot notation, like 'a.b.c'. + function getGlobal(value) { + if (!value) { + return value; + } + var g = global; + each(value.split('.'), function (part) { + g = g[part]; + }); + return g; + } + + function makeContextModuleFunc(func, relMap, enableBuildCallback) { + return function () { + //A version of a require function that passes a moduleName + //value for items that may need to + //look up paths relative to the moduleName + var args = aps.call(arguments, 0), lastArg; + if (enableBuildCallback && + isFunction((lastArg = args[args.length - 1]))) { + lastArg.__requireJsBuild = true; + } + args.push(relMap); + return func.apply(null, args); + }; + } + + function addRequireMethods(req, context, relMap) { + each([ + ['toUrl'], + ['undef'], + ['defined', 'requireDefined'], + ['specified', 'requireSpecified'] + ], function (item) { + req[item[0]] = makeContextModuleFunc(context[item[1] || item[0]], relMap); + }); } /** @@ -75,128 +171,61 @@ var requirejs, require, define; * * @returns {Error} */ - function makeError(id, msg, err) { + function makeError(id, msg, err, requireModules) { var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id); + e.requireType = id; + e.requireModules = requireModules; if (err) { e.originalError = err; } return e; } - /** - * Used to set up package paths from a packagePaths or packages config object. - * @param {Object} pkgs the object to store the new package config - * @param {Array} currentPackages an array of packages to configure - * @param {String} [dir] a prefix dir to use. - */ - function configurePackageDir(pkgs, currentPackages, dir) { - var i, location, pkgObj; - - for (i = 0; (pkgObj = currentPackages[i]); i++) { - pkgObj = typeof pkgObj === "string" ? { name: pkgObj } : pkgObj; - location = pkgObj.location; - - //Add dir to the path, but avoid paths that start with a slash - //or have a colon (indicates a protocol) - if (dir && (!location || (location.indexOf("/") !== 0 && location.indexOf(":") === -1))) { - location = dir + "/" + (location || pkgObj.name); - } - - //Create a brand new object on pkgs, since currentPackages can - //be passed in again, and config.pkgs is the internal transformed - //state for all package configs. - pkgs[pkgObj.name] = { - name: pkgObj.name, - location: location || pkgObj.name, - //Remove leading dot in main, so main paths are normalized, - //and remove any trailing .js, since different package - //envs have different conventions: some use a module name, - //some use a file name. - main: (pkgObj.main || "main") - .replace(currDirRegExp, '') - .replace(jsSuffixRegExp, '') - }; - } - } - - /** - * jQuery 1.4.3-1.5.x use a readyWait/ready() pairing to hold DOM - * ready callbacks, but jQuery 1.6 supports a holdReady() API instead. - * At some point remove the readyWait/ready() support and just stick - * with using holdReady. - */ - function jQueryHoldReady($, shouldHold) { - if ($.holdReady) { - $.holdReady(shouldHold); - } else if (shouldHold) { - $.readyWait += 1; - } else { - $.ready(true); - } - } - - if (typeof define !== "undefined") { + if (typeof define !== 'undefined') { //If a define is already in play via another AMD loader, //do not overwrite. return; } - if (typeof requirejs !== "undefined") { + if (typeof requirejs !== 'undefined') { if (isFunction(requirejs)) { //Do not overwrite and existing requirejs instance. return; - } else { - cfg = requirejs; - requirejs = undefined; } + cfg = requirejs; + requirejs = undefined; } //Allow for a require config object - if (typeof require !== "undefined" && !isFunction(require)) { + if (typeof require !== 'undefined' && !isFunction(require)) { //assume it is a config object. cfg = require; require = undefined; } - /** - * Creates a new context for use in require and define calls. - * Handle most of the heavy lifting. Do not want to use an object - * with prototype here to avoid using "this" in require, in case it - * needs to be used in more super secure envs that do not want this. - * Also there should not be that many contexts in the page. Usually just - * one for the default context, but could be extra for multiversion cases - * or if a package needs a special context for a dependency that conflicts - * with the standard context. - */ function newContext(contextName) { - var context, resume, - config = { + var config = { waitSeconds: 7, - baseUrl: "./", + baseUrl: './', paths: {}, pkgs: {}, - catchError: {} + shim: {} }, + registry = {}, + undefEvents = {}, defQueue = [], - specified = { - "require": true, - "exports": true, - "module": true - }, - urlMap = {}, defined = {}, - loaded = {}, - waiting = {}, - waitAry = [], + urlMap = {}, urlFetched = {}, - managerCounter = 0, - managerCallbacks = {}, - plugins = {}, - //Used to indicate which modules in a build scenario - //need to be full executed. - needFullExec = {}, - fullExec = {}, - resumeDepth = 0; + requireCounter = 1, + unnormalizedCounter = 1, + //Used to track the order in which modules + //should be executed, by the order they + //load. Important for consistent cycle resolution + //behavior. + waitAry = [], + inCheckLoaded, Module, context, handlers, + checkLoadedTimeoutId; /** * Trims the . and .. from an array of path segments. @@ -209,11 +238,12 @@ var requirejs, require, define; */ function trimDots(ary) { var i, part; - for (i = 0; (part = ary[i]); i++) { - if (part === ".") { + for (i = 0; ary[i]; i+= 1) { + part = ary[i]; + if (part === '.') { ary.splice(i, 1); i -= 1; - } else if (part === "..") { + } else if (part === '..') { if (i === 1 && (ary[2] === '..' || ary[0] === '..')) { //End of the line. Keep at least one non-dot //path segment at the front so it can be mapped @@ -236,13 +266,19 @@ var requirejs, require, define; * @param {String} name the relative name * @param {String} baseName a real name that the name arg is relative * to. + * @param {Boolean} applyMap apply the map config to the value. Should + * only be done if this normalization is for a dependency ID. * @returns {String} normalized name */ - function normalize(name, baseName) { - var pkgName, pkgConfig; + function normalize(name, baseName, applyMap) { + var baseParts = baseName && baseName.split('/'), + map = config.map, + starMap = map && map['*'], + pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment, + foundMap; //Adjust any relative paths. - if (name && name.charAt(0) === ".") { + if (name && name.charAt(0) === '.') { //If have a base name, try to normalize against it, //otherwise, assume it is a top-level require that will //be relative to baseUrl in the end. @@ -250,36 +286,99 @@ var requirejs, require, define; if (config.pkgs[baseName]) { //If the baseName is a package name, then just treat it as one //name to concat the name with. - baseName = [baseName]; + baseParts = [baseName]; } else { //Convert baseName to array, and lop off the last part, - //so that . matches that "directory" and not name of the baseName's - //module. For instance, baseName of "one/two/three", maps to - //"one/two/three.js", but we want the directory, "one/two" for + //so that . matches that 'directory' and not name of the baseName's + //module. For instance, baseName of 'one/two/three', maps to + //'one/two/three.js', but we want the directory, 'one/two' for //this normalization. - baseName = baseName.split("/"); - baseName = baseName.slice(0, baseName.length - 1); + baseParts = baseParts.slice(0, baseParts.length - 1); } - name = baseName.concat(name.split("/")); + name = baseParts.concat(name.split('/')); trimDots(name); //Some use of packages may use a . path to reference the - //"main" module name, so normalize for that. + //'main' module name, so normalize for that. pkgConfig = config.pkgs[(pkgName = name[0])]; - name = name.join("/"); + name = name.join('/'); if (pkgConfig && name === pkgName + '/' + pkgConfig.main) { name = pkgName; } - } else if (name.indexOf("./") === 0) { + } else if (name.indexOf('./') === 0) { // No baseName, so this is ID is resolved relative // to baseUrl, pull off the leading dot. name = name.substring(2); } } + + //Apply map config if available. + if (applyMap && (baseParts || starMap) && map) { + nameParts = name.split('/'); + + for (i = nameParts.length; i > 0; i -= 1) { + nameSegment = nameParts.slice(0, i).join('/'); + + if (baseParts) { + //Find the longest baseName segment match in the config. + //So, do joins on the biggest to smallest lengths of baseParts. + for (j = baseParts.length; j > 0; j -= 1) { + mapValue = map[baseParts.slice(0, j).join('/')]; + + //baseName segment has config, find if it has one for + //this name. + if (mapValue) { + mapValue = mapValue[nameSegment]; + if (mapValue) { + //Match, update name to the new value. + foundMap = mapValue; + break; + } + } + } + } + + if (!foundMap && starMap && starMap[nameSegment]) { + foundMap = starMap[nameSegment]; + } + + if (foundMap) { + nameParts.splice(0, i, foundMap); + name = nameParts.join('/'); + break; + } + } + } + return name; } + function removeScript(name) { + if (isBrowser) { + each(scripts(), function (scriptNode) { + if (scriptNode.getAttribute('data-requiremodule') === name && + scriptNode.getAttribute('data-requirecontext') === context.contextName) { + scriptNode.parentNode.removeChild(scriptNode); + return true; + } + }); + } + } + + function hasPathFallback(id) { + var pathConfig = config.paths[id]; + if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) { + removeScript(id); + //Pop off the first array value, since it failed, and + //retry + pathConfig.shift(); + context.undef(id); + context.require([id]); + return true; + } + } + /** * Creates a module mapping that includes plugin prefix, module * name, and path. If parentModuleMap is provided it will @@ -288,15 +387,28 @@ var requirejs, require, define; * @param {String} name the module name * @param {String} [parentModuleMap] parent module map * for the module name, used to resolve relative names. + * @param {Boolean} isNormalized: is the ID already normalized. + * This is true if this call is done for a define() module ID. + * @param {Boolean} applyMap: apply the map config to the ID. + * Should only be true if this map is for a dependency. * * @returns {Object} */ - function makeModuleMap(name, parentModuleMap) { - var index = name ? name.indexOf("!") : -1, + function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) { + var index = name ? name.indexOf('!') : -1, prefix = null, parentName = parentModuleMap ? parentModuleMap.name : null, originalName = name, - normalizedName, url, pluginModule; + isDefine = true, + normalizedName = '', + url, pluginModule, suffix; + + //If no name, then it means it is a require call, generate an + //internal name. + if (!name) { + isDefine = false; + name = '_@r' + (requireCounter += 1); + } if (index !== -1) { prefix = name.substring(0, index); @@ -304,24 +416,24 @@ var requirejs, require, define; } if (prefix) { - prefix = normalize(prefix, parentName); + prefix = normalize(prefix, parentName, applyMap); + pluginModule = defined[prefix]; } //Account for relative paths if there is a base name. if (name) { if (prefix) { - pluginModule = defined[prefix]; if (pluginModule && pluginModule.normalize) { //Plugin is loaded, use its normalize method. normalizedName = pluginModule.normalize(name, function (name) { - return normalize(name, parentName); + return normalize(name, parentName, applyMap); }); } else { - normalizedName = normalize(name, parentName); + normalizedName = normalize(name, parentName, applyMap); } } else { //A regular module. - normalizedName = normalize(name, parentName); + normalizedName = normalize(name, parentName, applyMap); url = urlMap[normalizedName]; if (!url) { @@ -342,50 +454,91 @@ var requirejs, require, define; } } + //If the id is a plugin id that cannot be determined if it needs + //normalization, stamp it with a unique ID so two matching relative + //ids that may conflict can be separate. + suffix = prefix && !pluginModule && !isNormalized ? + '_unnormalized' + (unnormalizedCounter += 1) : + ''; + return { prefix: prefix, name: normalizedName, parentMap: parentModuleMap, + unnormalized: !!suffix, url: url, originalName: originalName, - fullName: prefix ? prefix + "!" + (normalizedName || '') : normalizedName + isDefine: isDefine, + id: (prefix ? + prefix + '!' + normalizedName : + normalizedName) + suffix }; } + function getModule(depMap) { + var id = depMap.id, + mod = registry[id]; + + if (!mod) { + mod = registry[id] = new context.Module(depMap); + } + + return mod; + } + + function on(depMap, name, fn) { + var id = depMap.id, + mod = registry[id]; + + if (hasProp(defined, id) && + (!mod || mod.defineEmitComplete)) { + if (name === 'defined') { + fn(defined[id]); + } + } else { + getModule(depMap).on(name, fn); + } + } + + function onError(err, errback) { + var ids = err.requireModules, + notified = false; + + if (errback) { + errback(err); + } else { + each(ids, function (id) { + var mod = registry[id]; + if (mod) { + //Set error on module, so it skips timeout checks. + mod.error = err; + if (mod.events.error) { + notified = true; + mod.emit('error', err); + } + } + }); + + if (!notified) { + req.onError(err); + } + } + } + /** - * Determine if priority loading is done. If so clear the priorityWait + * Internal method to transfer globalQueue items to this context's + * defQueue. */ - function isPriorityDone() { - var priorityDone = true, - priorityWait = config.priorityWait, - priorityName, i; - if (priorityWait) { - for (i = 0; (priorityName = priorityWait[i]); i++) { - if (!loaded[priorityName]) { - priorityDone = false; - break; - } - } - if (priorityDone) { - delete config.priorityWait; - } + function takeGlobalQueue() { + //Push all the globalDefQueue items into the context's defQueue + if (globalDefQueue.length) { + //Array splice in the values since the context code has a + //local var ref to defQueue, so cannot just reassign the one + //on context. + apsp.apply(defQueue, + [defQueue.length - 1, 0].concat(globalDefQueue)); + globalDefQueue = []; } - return priorityDone; - } - - function makeContextModuleFunc(func, relModuleMap, enableBuildCallback) { - return function () { - //A version of a require function that passes a moduleName - //value for items that may need to - //look up paths relative to the moduleName - var args = aps.call(arguments, 0), lastArg; - if (enableBuildCallback && - isFunction((lastArg = args[args.length - 1]))) { - lastArg.__requireJsBuild = true; - } - args.push(relModuleMap); - return func.apply(null, args); - }; } /** @@ -394,686 +547,240 @@ var requirejs, require, define; * per module because of the implication of path mappings that may * need to be relative to the module name. */ - function makeRequire(relModuleMap, enableBuildCallback, altRequire) { - var modRequire = makeContextModuleFunc(altRequire || context.require, relModuleMap, enableBuildCallback); + function makeRequire(mod, enableBuildCallback, altRequire) { + var relMap = mod && mod.map, + modRequire = makeContextModuleFunc(altRequire || context.require, + relMap, + enableBuildCallback); + + addRequireMethods(modRequire, context, relMap); + modRequire.isBrowser = isBrowser; - mixin(modRequire, { - nameToUrl: makeContextModuleFunc(context.nameToUrl, relModuleMap), - toUrl: makeContextModuleFunc(context.toUrl, relModuleMap), - defined: makeContextModuleFunc(context.requireDefined, relModuleMap), - specified: makeContextModuleFunc(context.requireSpecified, relModuleMap), - isBrowser: req.isBrowser - }); return modRequire; } - /* - * Queues a dependency for checking after the loader is out of a - * "paused" state, for example while a script file is being loaded - * in the browser, where it may have many modules defined in it. - */ - function queueDependency(manager) { - context.paused.push(manager); - } - - function execManager(manager) { - var i, ret, err, errFile, errModuleTree, - cb = manager.callback, - map = manager.map, - fullName = map.fullName, - args = manager.deps, - listeners = manager.listeners, - execCb = config.requireExecCb || req.execCb, - cjsModule; - - //Call the callback to define the module, if necessary. - if (cb && isFunction(cb)) { - if (config.catchError.define) { - try { - ret = execCb(fullName, manager.callback, args, defined[fullName]); - } catch (e) { - err = e; - } - } else { - ret = execCb(fullName, manager.callback, args, defined[fullName]); + handlers = { + 'require': function (mod) { + return makeRequire(mod); + }, + 'exports': function (mod) { + mod.usingExports = true; + if (mod.map.isDefine) { + return (mod.exports = defined[mod.map.id] = {}); } - - if (fullName) { - //If setting exports via "module" is in play, - //favor that over return value and exports. After that, - //favor a non-undefined return value over exports use. - cjsModule = manager.cjsModule; - if (cjsModule && - cjsModule.exports !== undefined && - //Make sure it is not already the exports value - cjsModule.exports !== defined[fullName]) { - ret = defined[fullName] = manager.cjsModule.exports; - } else if (ret === undefined && manager.usingExports) { - //exports already set the defined value. - ret = defined[fullName]; - } else { - //Use the return value from the function. - defined[fullName] = ret; - //If this module needed full execution in a build - //environment, mark that now. - if (needFullExec[fullName]) { - fullExec[fullName] = true; - } - } - } - } else if (fullName) { - //May just be an object definition for the module. Only - //worry about defining if have a module name. - ret = defined[fullName] = cb; - - //If this module needed full execution in a build - //environment, mark that now. - if (needFullExec[fullName]) { - fullExec[fullName] = true; - } - } - - //Clean up waiting. Do this before error calls, and before - //calling back listeners, so that bookkeeping is correct - //in the event of an error and error is reported in correct order, - //since the listeners will likely have errors if the - //onError function does not throw. - if (waiting[manager.id]) { - delete waiting[manager.id]; - manager.isDone = true; - context.waitCount -= 1; - if (context.waitCount === 0) { - //Clear the wait array used for cycles. - waitAry = []; - } - } - - //Do not need to track manager callback now that it is defined. - delete managerCallbacks[fullName]; - - //Allow instrumentation like the optimizer to know the order - //of modules executed and their dependencies. - if (req.onResourceLoad && !manager.placeholder) { - req.onResourceLoad(context, map, manager.depArray); - } - - if (err) { - errFile = (fullName ? makeModuleMap(fullName).url : '') || - err.fileName || err.sourceURL; - errModuleTree = err.moduleTree; - err = makeError('defineerror', 'Error evaluating ' + - 'module "' + fullName + '" at location "' + - errFile + '":\n' + - err + '\nfileName:' + errFile + - '\nlineNumber: ' + (err.lineNumber || err.line), err); - err.moduleName = fullName; - err.moduleTree = errModuleTree; - return req.onError(err); - } - - //Let listeners know of this manager's value. - for (i = 0; (cb = listeners[i]); i++) { - cb(ret); - } - - return undefined; - } - - /** - * Helper that creates a callack function that is called when a dependency - * is ready, and sets the i-th dependency for the manager as the - * value passed to the callback generated by this function. - */ - function makeArgCallback(manager, i) { - return function (value) { - //Only do the work if it has not been done - //already for a dependency. Cycle breaking - //logic in forceExec could mean this function - //is called more than once for a given dependency. - if (!manager.depDone[i]) { - manager.depDone[i] = true; - manager.deps[i] = value; - manager.depCount -= 1; - if (!manager.depCount) { - //All done, execute! - execManager(manager); - } - } - }; - } - - function callPlugin(pluginName, depManager) { - var map = depManager.map, - fullName = map.fullName, - name = map.name, - plugin = plugins[pluginName] || - (plugins[pluginName] = defined[pluginName]), - load; - - //No need to continue if the manager is already - //in the process of loading. - if (depManager.loading) { - return; - } - depManager.loading = true; - - load = function (ret) { - depManager.callback = function () { - return ret; - }; - execManager(depManager); - - loaded[depManager.id] = true; - - //The loading of this plugin - //might have placed other things - //in the paused queue. In particular, - //a loader plugin that depends on - //a different plugin loaded resource. - resume(); - }; - - //Allow plugins to load other code without having to know the - //context or how to "complete" the load. - load.fromText = function (moduleName, text) { - /*jslint evil: true */ - var hasInteractive = useInteractive; - - //Indicate a the module is in process of loading. - loaded[moduleName] = false; - context.scriptCount += 1; - - //Indicate this is not a "real" module, so do not track it - //for builds, it does not map to a real file. - context.fake[moduleName] = true; - - //Turn off interactive script matching for IE for any define - //calls in the text, then turn it back on at the end. - if (hasInteractive) { - useInteractive = false; - } - - req.exec(text); - - if (hasInteractive) { - useInteractive = true; - } - - //Support anonymous modules. - context.completeLoad(moduleName); - }; - - //No need to continue if the plugin value has already been - //defined by a build. - if (fullName in defined) { - load(defined[fullName]); - } else { - //Use parentName here since the plugin's name is not reliable, - //could be some weird string with no path that actually wants to - //reference the parentName's path. - plugin.load(name, makeRequire(map.parentMap, true, function (deps, cb) { - var moduleDeps = [], - i, dep, depMap; - //Convert deps to full names and hold on to them - //for reference later, when figuring out if they - //are blocked by a circular dependency. - for (i = 0; (dep = deps[i]); i++) { - depMap = makeModuleMap(dep, map.parentMap); - deps[i] = depMap.fullName; - if (!depMap.prefix) { - moduleDeps.push(deps[i]); - } - } - depManager.moduleDeps = (depManager.moduleDeps || []).concat(moduleDeps); - return context.require(deps, cb); - }), load, config); - } - } - - /** - * Adds the manager to the waiting queue. Only fully - * resolved items should be in the waiting queue. - */ - function addWait(manager) { - if (!waiting[manager.id]) { - waiting[manager.id] = manager; - waitAry.push(manager); - context.waitCount += 1; - } - } - - /** - * Function added to every manager object. Created out here - * to avoid new function creation for each manager instance. - */ - function managerAdd(cb) { - this.listeners.push(cb); - } - - function getManager(map, shouldQueue) { - var fullName = map.fullName, - prefix = map.prefix, - plugin = prefix ? plugins[prefix] || - (plugins[prefix] = defined[prefix]) : null, - manager, created, pluginManager, prefixMap; - - if (fullName) { - manager = managerCallbacks[fullName]; - } - - if (!manager) { - created = true; - manager = { - //ID is just the full name, but if it is a plugin resource - //for a plugin that has not been loaded, - //then add an ID counter to it. - id: (prefix && !plugin ? - (managerCounter++) + '__p@:' : '') + - (fullName || '__r@' + (managerCounter++)), - map: map, - depCount: 0, - depDone: [], - depCallbacks: [], - deps: [], - listeners: [], - add: managerAdd - }; - - specified[manager.id] = true; - - //Only track the manager/reuse it if this is a non-plugin - //resource. Also only track plugin resources once - //the plugin has been loaded, and so the fullName is the - //true normalized value. - if (fullName && (!prefix || plugins[prefix])) { - managerCallbacks[fullName] = manager; - } - } - - //If there is a plugin needed, but it is not loaded, - //first load the plugin, then continue on. - if (prefix && !plugin) { - prefixMap = makeModuleMap(prefix); - - //Clear out defined and urlFetched if the plugin was previously - //loaded/defined, but not as full module (as in a build - //situation). However, only do this work if the plugin is in - //defined but does not have a module export value. - if (prefix in defined && !defined[prefix]) { - delete defined[prefix]; - delete urlFetched[prefixMap.url]; - } - - pluginManager = getManager(prefixMap, true); - pluginManager.add(function (plugin) { - //Create a new manager for the normalized - //resource ID and have it call this manager when - //done. - var newMap = makeModuleMap(map.originalName, map.parentMap), - normalizedManager = getManager(newMap, true); - - //Indicate this manager is a placeholder for the real, - //normalized thing. Important for when trying to map - //modules and dependencies, for instance, in a build. - manager.placeholder = true; - - normalizedManager.add(function (resource) { - manager.callback = function () { - return resource; - }; - execManager(manager); - }); + }, + 'module': function (mod) { + return (mod.module = { + id: mod.map.id, + uri: mod.map.url, + config: function () { + return (config.config && config.config[mod.map.id]) || {}; + }, + exports: defined[mod.map.id] }); - } else if (created && shouldQueue) { - //Indicate the resource is not loaded yet if it is to be - //queued. - loaded[manager.id] = false; - queueDependency(manager); - addWait(manager); - } - - return manager; - } - - function main(inName, depArray, callback, relModuleMap) { - var moduleMap = makeModuleMap(inName, relModuleMap), - name = moduleMap.name, - fullName = moduleMap.fullName, - manager = getManager(moduleMap), - id = manager.id, - deps = manager.deps, - i, depArg, depName, depPrefix, cjsMod; - - if (fullName) { - //If module already defined for context, or already loaded, - //then leave. Also leave if jQuery is registering but it does - //not match the desired version number in the config. - if (fullName in defined || loaded[id] === true || - (fullName === "jquery" && config.jQuery && - config.jQuery !== callback().fn.jquery)) { - return; - } - - //Set specified/loaded here for modules that are also loaded - //as part of a layer, where onScriptLoad is not fired - //for those cases. Do this after the inline define and - //dependency tracing is done. - specified[id] = true; - loaded[id] = true; - - //If module is jQuery set up delaying its dom ready listeners. - if (fullName === "jquery" && callback) { - jQueryCheck(callback()); - } - } - - //Attach real depArray and callback to the manager. Do this - //only if the module has not been defined already, so do this after - //the fullName checks above. IE can call main() more than once - //for a module. - manager.depArray = depArray; - manager.callback = callback; - - //Add the dependencies to the deps field, and register for callbacks - //on the dependencies. - for (i = 0; i < depArray.length; i++) { - depArg = depArray[i]; - //There could be cases like in IE, where a trailing comma will - //introduce a null dependency, so only treat a real dependency - //value as a dependency. - if (depArg) { - //Split the dependency name into plugin and name parts - depArg = makeModuleMap(depArg, (name ? moduleMap : relModuleMap)); - depName = depArg.fullName; - depPrefix = depArg.prefix; - - //Fix the name in depArray to be just the name, since - //that is how it will be called back later. - depArray[i] = depName; - - //Fast path CommonJS standard dependencies. - if (depName === "require") { - deps[i] = makeRequire(moduleMap); - } else if (depName === "exports") { - //CommonJS module spec 1.1 - deps[i] = defined[fullName] = {}; - manager.usingExports = true; - } else if (depName === "module") { - //CommonJS module spec 1.1 - manager.cjsModule = cjsMod = deps[i] = { - id: name, - uri: name ? context.nameToUrl(name, null, relModuleMap) : undefined, - exports: defined[fullName] - }; - } else if (depName in defined && !(depName in waiting) && - (!(fullName in needFullExec) || - (fullName in needFullExec && fullExec[depName]))) { - //Module already defined, and not in a build situation - //where the module is a something that needs full - //execution and this dependency has not been fully - //executed. See r.js's requirePatch.js for more info - //on fullExec. - deps[i] = defined[depName]; - } else { - //Mark this dependency as needing full exec if - //the current module needs full exec. - if (fullName in needFullExec) { - needFullExec[depName] = true; - //Reset state so fully executed code will get - //picked up correctly. - delete defined[depName]; - urlFetched[depArg.url] = false; - } - - //Either a resource that is not loaded yet, or a plugin - //resource for either a plugin that has not - //loaded yet. - manager.depCount += 1; - manager.depCallbacks[i] = makeArgCallback(manager, i); - getManager(depArg, true).add(manager.depCallbacks[i]); - } - } - } - - //Do not bother tracking the manager if it is all done. - if (!manager.depCount) { - //All done, execute! - execManager(manager); - } else { - addWait(manager); - } - } - - /** - * Convenience method to call main for a define call that was put on - * hold in the defQueue. - */ - function callDefMain(args) { - main.apply(null, args); - } - - /** - * jQuery 1.4.3+ supports ways to hold off calling - * calling jQuery ready callbacks until all scripts are loaded. Be sure - * to track it if the capability exists.. Also, since jQuery 1.4.3 does - * not register as a module, need to do some global inference checking. - * Even if it does register as a module, not guaranteed to be the precise - * name of the global. If a jQuery is tracked for this context, then go - * ahead and register it as a module too, if not already in process. - */ - jQueryCheck = function (jqCandidate) { - if (!context.jQuery) { - var $ = jqCandidate || (typeof jQuery !== "undefined" ? jQuery : null); - - if ($) { - //If a specific version of jQuery is wanted, make sure to only - //use this jQuery if it matches. - if (config.jQuery && $.fn.jquery !== config.jQuery) { - return; - } - - if ("holdReady" in $ || "readyWait" in $) { - context.jQuery = $; - - //Manually create a "jquery" module entry if not one already - //or in process. Note this could trigger an attempt at - //a second jQuery registration, but does no harm since - //the first one wins, and it is the same value anyway. - callDefMain(["jquery", [], function () { - return jQuery; - }]); - - //Ask jQuery to hold DOM ready callbacks. - if (context.scriptCount) { - jQueryHoldReady($, true); - context.jQueryIncremented = true; - } - } - } } }; - function findCycle(manager, traced) { - var fullName = manager.map.fullName, - depArray = manager.depArray, - fullyLoaded = true, - i, depName, depManager, result; + function removeWaiting(id) { + //Clean up machinery used for waiting modules. + delete registry[id]; - if (manager.isDone || !fullName || !loaded[fullName]) { - return result; + each(waitAry, function (mod, i) { + if (mod.map.id === id) { + waitAry.splice(i, 1); + if (!mod.defined) { + context.waitCount -= 1; + } + return true; + } + }); + } + + function findCycle(mod, traced) { + var id = mod.map.id, + depArray = mod.depMaps, + foundModule; + + //Do not bother with unitialized modules or not yet enabled + //modules. + if (!mod.inited) { + return; } //Found the cycle. - if (traced[fullName]) { - return manager; + if (traced[id]) { + return mod; } - traced[fullName] = true; + traced[id] = true; //Trace through the dependencies. - if (depArray) { - for (i = 0; i < depArray.length; i++) { - //Some array members may be null, like if a trailing comma - //IE, so do the explicit [i] access and check if it has a value. - depName = depArray[i]; - if (!loaded[depName] && !reservedDependencies[depName]) { - fullyLoaded = false; - break; - } - depManager = waiting[depName]; - if (depManager && !depManager.isDone && loaded[depName]) { - result = findCycle(depManager, traced); - if (result) { - break; - } - } - } - if (!fullyLoaded) { - //Discard the cycle that was found, since it cannot - //be forced yet. Also clear this module from traced. - result = undefined; - delete traced[fullName]; - } - } + each(depArray, function (depMap) { + var depId = depMap.id, + depMod = registry[depId]; - return result; + if (!depMod) { + return; + } + + if (!depMod.inited || !depMod.enabled) { + //Dependency is not inited, so this cannot + //be used to determine a cycle. + foundModule = null; + delete traced[id]; + return true; + } + + return (foundModule = findCycle(depMod, traced)); + }); + + return foundModule; } - function forceExec(manager, traced) { - var fullName = manager.map.fullName, - depArray = manager.depArray, - i, depName, depManager, prefix, prefixManager, value; + function forceExec(mod, traced, uninited) { + var id = mod.map.id, + depArray = mod.depMaps; - - if (manager.isDone || !fullName || !loaded[fullName]) { - return undefined; + if (!mod.inited || !mod.map.isDefine) { + return; } - if (fullName) { - if (traced[fullName]) { - return defined[fullName]; + if (traced[id]) { + return defined[id]; + } + + traced[id] = mod; + + each(depArray, function(depMap) { + var depId = depMap.id, + depMod = registry[depId], + value; + + if (handlers[depId]) { + return; } - traced[fullName] = true; - } + if (depMod) { + if (!depMod.inited || !depMod.enabled) { + //Dependency is not inited, + //so this module cannot be + //given a forced value yet. + uninited[id] = true; + return; + } - //Trace through the dependencies. - if (depArray) { - for (i = 0; i < depArray.length; i++) { - //Some array members may be null, like if a trailing comma - //IE, so do the explicit [i] access and check if it has a value. - depName = depArray[i]; - if (depName) { - //First, make sure if it is a plugin resource that the - //plugin is not blocked. - prefix = makeModuleMap(depName).prefix; - if (prefix && (prefixManager = waiting[prefix])) { - forceExec(prefixManager, traced); - } - depManager = waiting[depName]; - if (depManager && !depManager.isDone && loaded[depName]) { - value = forceExec(depManager, traced); - manager.depCallbacks[i](value); - } + //Get the value for the current dependency + value = forceExec(depMod, traced, uninited); + + //Even with forcing it may not be done, + //in particular if the module is waiting + //on a plugin resource. + if (!uninited[depId]) { + mod.defineDepById(depId, value); } } - } + }); - return defined[fullName]; + mod.check(true); + + return defined[id]; + } + + function modCheck(mod) { + mod.check(); } - /** - * Checks if all modules for a context are loaded, and if so, evaluates the - * new ones in right dependency order. - * - * @private - */ function checkLoaded() { var waitInterval = config.waitSeconds * 1000, //It is possible to disable the wait interval by using waitSeconds of 0. expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(), - noLoads = "", hasLoadedProp = false, stillLoading = false, - cycleDeps = [], - i, prop, err, manager, cycleManager, moduleDeps; + noLoads = [], + stillLoading = false, + needCycleCheck = true, + map, modId, err, usingPathFallback; - //If there are items still in the paused queue processing wait. - //This is particularly important in the sync case where each paused - //item is processed right away but there may be more waiting. - if (context.pausedCount > 0) { - return undefined; + //Do not bother if this call was a result of a cycle break. + if (inCheckLoaded) { + return; } - //Determine if priority loading is done. If so clear the priority. If - //not, then do not check - if (config.priorityWait) { - if (isPriorityDone()) { - //Call resume, since it could have - //some waiting dependencies to trace. - resume(); - } else { - return undefined; + inCheckLoaded = true; + + //Figure out the state of all the modules. + eachProp(registry, function (mod) { + map = mod.map; + modId = map.id; + + //Skip things that are not enabled or in error state. + if (!mod.enabled) { + return; } - } - //See if anything is still in flight. - for (prop in loaded) { - if (!(prop in empty)) { - hasLoadedProp = true; - if (!loaded[prop]) { - if (expired) { - noLoads += prop + " "; - } else { + if (!mod.error) { + //If the module should be executed, and it has not + //been inited and time is up, remember it. + if (!mod.inited && expired) { + if (hasPathFallback(modId)) { + usingPathFallback = true; stillLoading = true; - if (prop.indexOf('!') === -1) { - //No reason to keep looking for unfinished - //loading. If the only stillLoading is a - //plugin resource though, keep going, - //because it may be that a plugin resource - //is waiting on a non-plugin cycle. - cycleDeps = []; - break; - } else { - moduleDeps = managerCallbacks[prop] && managerCallbacks[prop].moduleDeps; - if (moduleDeps) { - cycleDeps.push.apply(cycleDeps, moduleDeps); - } - } + } else { + noLoads.push(modId); + removeScript(modId); + } + } else if (!mod.inited && mod.fetched && map.isDefine) { + stillLoading = true; + if (!map.prefix) { + //No reason to keep looking for unfinished + //loading. If the only stillLoading is a + //plugin resource though, keep going, + //because it may be that a plugin resource + //is waiting on a non-plugin cycle. + return (needCycleCheck = false); } } } - } + }); - //Check for exit conditions. - if (!hasLoadedProp && !context.waitCount) { - //If the loaded object had no items, then the rest of - //the work below does not need to be done. - return undefined; - } - if (expired && noLoads) { + if (expired && noLoads.length) { //If wait time expired, throw error of unloaded modules. - err = makeError("timeout", "Load timeout for modules: " + noLoads); - err.requireType = "timeout"; - err.requireModules = noLoads; + err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads); err.contextName = context.contextName; - return req.onError(err); + return onError(err); } - //If still loading but a plugin is waiting on a regular module cycle - //break the cycle. - if (stillLoading && cycleDeps.length) { - for (i = 0; (manager = waiting[cycleDeps[i]]); i++) { - if ((cycleManager = findCycle(manager, {}))) { - forceExec(cycleManager, {}); - break; - } - } + //Not expired, check for a cycle. + if (needCycleCheck) { + each(waitAry, function (mod) { + if (mod.defined) { + return; + } + + var cycleMod = findCycle(mod, {}), + traced = {}; + + if (cycleMod) { + forceExec(cycleMod, traced, {}); + + //traced modules may have been + //removed from the registry, but + //their listeners still need to + //be called. + eachProp(traced, modCheck); + } + }); + + //Now that dependencies have + //been satisfied, trigger the + //completion check that then + //notifies listeners. + eachProp(registry, modCheck); } //If still waiting on loads, and the waiting load is something //other than a plugin resource, or there are still outstanding //scripts, then just try back later. - if (!expired && (stillLoading || context.scriptCount)) { + if ((!expired || usingPathFallback) && stillLoading) { //Something is still waiting to load. Wait for it, but only //if a timeout is not already in effect. if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) { @@ -1082,238 +789,543 @@ var requirejs, require, define; checkLoaded(); }, 50); } - return undefined; } - //If still have items in the waiting cue, but all modules have - //been loaded, then it means there are some circular dependencies - //that need to be broken. - //However, as a waiting thing is fired, then it can add items to - //the waiting cue, and those items should not be fired yet, so - //make sure to redo the checkLoaded call after breaking a single - //cycle, if nothing else loaded then this logic will pick it up - //again. - if (context.waitCount) { - //Cycle through the waitAry, and call items in sequence. - for (i = 0; (manager = waitAry[i]); i++) { - forceExec(manager, {}); - } - - //If anything got placed in the paused queue, run it down. - if (context.paused.length) { - resume(); - } - - //Only allow this recursion to a certain depth. Only - //triggered by errors in calling a module in which its - //modules waiting on it cannot finish loading, or some circular - //dependencies that then may add more dependencies. - //The value of 5 is a bit arbitrary. Hopefully just one extra - //pass, or two for the case of circular dependencies generating - //more work that gets resolved in the sync node case. - if (checkLoadedDepth < 5) { - checkLoadedDepth += 1; - checkLoaded(); - } - } - - checkLoadedDepth = 0; - - //Check for DOM ready, and nothing is waiting across contexts. - req.checkReadyState(); - - return undefined; + inCheckLoaded = false; } - /** - * Resumes tracing of dependencies and then checks if everything is loaded. - */ - resume = function () { - var manager, map, url, i, p, args, fullName; + Module = function (map) { + this.events = undefEvents[map.id] || {}; + this.map = map; + this.shim = config.shim[map.id]; + this.depExports = []; + this.depMaps = []; + this.depMatched = []; + this.pluginMaps = {}; + this.depCount = 0; - //Any defined modules in the global queue, intake them now. - context.takeGlobalQueue(); + /* this.exports this.factory + this.depMaps = [], + this.enabled, this.fetched + */ + }; - resumeDepth += 1; + Module.prototype = { + init: function(depMaps, factory, errback, options) { + options = options || {}; - if (context.scriptCount <= 0) { - //Synchronous envs will push the number below zero with the - //decrement above, be sure to set it back to zero for good measure. - //require() calls that also do not end up loading scripts could - //push the number negative too. - context.scriptCount = 0; - } - - //Make sure any remaining defQueue items get properly processed. - while (defQueue.length) { - args = defQueue.shift(); - if (args[0] === null) { - return req.onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); - } else { - callDefMain(args); + //Do not do more inits if already done. Can happen if there + //are multiple define calls for the same module. That is not + //a normal, common case, but it is also not unexpected. + if (this.inited) { + return; } - } - //Skip the resume of paused dependencies - //if current context is in priority wait. - if (!config.priorityWait || isPriorityDone()) { - while (context.paused.length) { - p = context.paused; - context.pausedCount += p.length; - //Reset paused list - context.paused = []; + this.factory = factory; - for (i = 0; (manager = p[i]); i++) { - map = manager.map; - url = map.url; - fullName = map.fullName; + if (errback) { + //Register for errors on this module. + this.on('error', errback); + } else if (this.events.error) { + //If no errback already, but there are error listeners + //on this module, set up an errback to pass to the deps. + errback = bind(this, function (err) { + this.emit('error', err); + }); + } - //If the manager is for a plugin managed resource, - //ask the plugin to load it now. - if (map.prefix) { - callPlugin(map.prefix, manager); - } else { - //Regular dependency. - if (!urlFetched[url] && !loaded[fullName]) { - (config.requireLoad || req.load)(context, fullName, url); + each(depMaps, bind(this, function (depMap, i) { + if (typeof depMap === 'string') { + depMap = makeModuleMap(depMap, + (this.map.isDefine ? this.map : this.map.parentMap), + false, + true); + this.depMaps.push(depMap); + } - //Mark the URL as fetched, but only if it is - //not an empty: URL, used by the optimizer. - //In that case we need to be sure to call - //load() for each module that is mapped to - //empty: so that dependencies are satisfied - //correctly. - if (url.indexOf('empty:') !== 0) { - urlFetched[url] = true; + var handler = handlers[depMap.id]; + + if (handler) { + this.depExports[i] = handler(this); + return; + } + + this.depCount += 1; + + on(depMap, 'defined', bind(this, function (depExports) { + this.defineDep(i, depExports); + this.check(); + })); + + if (errback) { + on(depMap, 'error', errback); + } + })); + + //Indicate this module has be initialized + this.inited = true; + + this.ignore = options.ignore; + + //Could have option to init this module in enabled mode, + //or could have been previously marked as enabled. However, + //the dependencies are not known until init is called. So + //if enabled previously, now trigger dependencies as enabled. + if (options.enabled || this.enabled) { + //Enable this module and dependencies. + //Will call this.check() + this.enable(); + } else { + this.check(); + } + }, + + defineDepById: function (id, depExports) { + var i; + + //Find the index for this dependency. + each(this.depMaps, function (map, index) { + if (map.id === id) { + i = index; + return true; + } + }); + + return this.defineDep(i, depExports); + }, + + defineDep: function (i, depExports) { + //Because of cycles, defined callback for a given + //export can be called more than once. + if (!this.depMatched[i]) { + this.depMatched[i] = true; + this.depCount -= 1; + this.depExports[i] = depExports; + } + }, + + fetch: function () { + if (this.fetched) { + return; + } + this.fetched = true; + + context.startTime = (new Date()).getTime(); + + var map = this.map; + + //If the manager is for a plugin managed resource, + //ask the plugin to load it now. + if (map.prefix) { + this.callPlugin(); + } else if (this.shim) { + makeRequire(this, true)(this.shim.deps || [], bind(this, function () { + this.load(); + })); + } else { + //Regular dependency. + this.load(); + } + }, + + load: function() { + var url = this.map.url; + + //Regular dependency. + if (!urlFetched[url]) { + urlFetched[url] = true; + context.load(this.map.id, url); + } + }, + + /** + * Checks is the module is ready to define itself, and if so, + * define it. If the silent argument is true, then it will just + * define, but not notify listeners, and not ask for a context-wide + * check of all loaded modules. That is useful for cycle breaking. + */ + check: function (silent) { + if (!this.enabled) { + return; + } + + var id = this.map.id, + depExports = this.depExports, + exports = this.exports, + factory = this.factory, + err, cjsModule; + + if (!this.inited) { + this.fetch(); + } else if (this.error) { + this.emit('error', this.error); + } else if (!this.defining) { + //The factory could trigger another require call + //that would result in checking this module to + //define itself again. If already in the process + //of doing that, skip this work. + this.defining = true; + + if (this.depCount < 1 && !this.defined) { + if (isFunction(factory)) { + //If there is an error listener, favor passing + //to that instead of throwing an error. + if (this.events.error) { + try { + exports = context.execCb(id, factory, depExports, exports); + } catch (e) { + err = e; + } + } else { + exports = context.execCb(id, factory, depExports, exports); + } + + if (this.map.isDefine) { + //If setting exports via 'module' is in play, + //favor that over return value and exports. After that, + //favor a non-undefined return value over exports use. + cjsModule = this.module; + if (cjsModule && + cjsModule.exports !== undefined && + //Make sure it is not already the exports value + cjsModule.exports !== this.exports) { + exports = cjsModule.exports; + } else if (exports === undefined && this.usingExports) { + //exports already set the defined value. + exports = this.exports; } } + + if (err) { + err.requireMap = this.map; + err.requireModules = [this.map.id]; + err.requireType = 'define'; + return onError((this.error = err)); + } + + } else { + //Just a literal value + exports = factory; + } + + this.exports = exports; + + if (this.map.isDefine && !this.ignore) { + defined[id] = exports; + + if (req.onResourceLoad) { + req.onResourceLoad(context, this.map, this.depMaps); + } + } + + //Clean up + delete registry[id]; + + this.defined = true; + context.waitCount -= 1; + if (context.waitCount === 0) { + //Clear the wait array used for cycles. + waitAry = []; } } - //Move the start time for timeout forward. - context.startTime = (new Date()).getTime(); - context.pausedCount -= p.length; + //Finished the define stage. Allow calling check again + //to allow define notifications below in the case of a + //cycle. + this.defining = false; + + if (!silent) { + if (this.defined && !this.defineEmitted) { + this.defineEmitted = true; + this.emit('defined', this.exports); + this.defineEmitComplete = true; + } + } + } + }, + + callPlugin: function() { + var map = this.map, + id = map.id, + pluginMap = makeModuleMap(map.prefix, null, false, true); + + on(pluginMap, 'defined', bind(this, function (plugin) { + var name = this.map.name, + parentName = this.map.parentMap ? this.map.parentMap.name : null, + load, normalizedMap, normalizedMod; + + //If current map is not normalized, wait for that + //normalized name to load instead of continuing. + if (this.map.unnormalized) { + //Normalize the ID if the plugin allows it. + if (plugin.normalize) { + name = plugin.normalize(name, function (name) { + return normalize(name, parentName, true); + }) || ''; + } + + normalizedMap = makeModuleMap(map.prefix + '!' + name); + on(normalizedMap, + 'defined', bind(this, function (value) { + this.init([], function () { return value; }, null, { + enabled: true, + ignore: true + }); + })); + normalizedMod = registry[normalizedMap.id]; + if (normalizedMod) { + if (this.events.error) { + normalizedMod.on('error', bind(this, function (err) { + this.emit('error', err); + })); + } + normalizedMod.enable(); + } + + return; + } + + load = bind(this, function (value) { + this.init([], function () { return value; }, null, { + enabled: true + }); + }); + + load.error = bind(this, function (err) { + this.inited = true; + this.error = err; + err.requireModules = [id]; + + //Remove temp unnormalized modules for this module, + //since they will never be resolved otherwise now. + eachProp(registry, function (mod) { + if (mod.map.id.indexOf(id + '_unnormalized') === 0) { + removeWaiting(mod.map.id); + } + }); + + onError(err); + }); + + //Allow plugins to load other code without having to know the + //context or how to 'complete' the load. + load.fromText = function (moduleName, text) { + /*jslint evil: true */ + var hasInteractive = useInteractive; + + //Turn off interactive script matching for IE for any define + //calls in the text, then turn it back on at the end. + if (hasInteractive) { + useInteractive = false; + } + + req.exec(text); + + if (hasInteractive) { + useInteractive = true; + } + + //Support anonymous modules. + context.completeLoad(moduleName); + }; + + //Use parentName here since the plugin's name is not reliable, + //could be some weird string with no path that actually wants to + //reference the parentName's path. + plugin.load(map.name, makeRequire(map.parentMap, true, function (deps, cb) { + return context.require(deps, cb); + }), load, config); + })); + + context.enable(pluginMap, this); + this.pluginMaps[pluginMap.id] = pluginMap; + }, + + enable: function () { + this.enabled = true; + + if (!this.waitPushed) { + waitAry.push(this); + context.waitCount += 1; + this.waitPushed = true; + } + + //Enable each dependency + each(this.depMaps, bind(this, function (map) { + var id = map.id, + mod = registry[id]; + //Skip special modules like 'require', 'exports', 'module' + //Also, don't call enable if it is already enabled, + //important in circular dependency cases. + if (!handlers[id] && mod && !mod.enabled) { + context.enable(map, this); + } + })); + + //Enable each plugin that is used in + //a dependency + eachProp(this.pluginMaps, bind(this, function (pluginMap) { + var mod = registry[pluginMap.id]; + if (mod && !mod.enabled) { + context.enable(pluginMap, this); + } + })); + + this.check(); + }, + + on: function(name, cb) { + var cbs = this.events[name]; + if (!cbs) { + cbs = this.events[name] = []; + } + cbs.push(cb); + }, + + emit: function (name, evt) { + each(this.events[name], function (cb) { + cb(evt); + }); + if (name === 'error') { + //Now that the error handler was triggered, remove + //the listeners, since this broken Module instance + //can stay around for a while in the registry/waitAry. + delete this.events[name]; } } - - //Only check if loaded when resume depth is 1. It is likely that - //it is only greater than 1 in sync environments where a factory - //function also then calls the callback-style require. In those - //cases, the checkLoaded should not occur until the resume - //depth is back at the top level. - if (resumeDepth === 1) { - checkLoaded(); - } - - resumeDepth -= 1; - - return undefined; }; - //Define the context object. Many of these fields are on here - //just to make debugging easier. - context = { - contextName: contextName, + function callGetModule(args) { + getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]); + } + + function removeListener(node, func, name, ieName) { + //Favor detachEvent because of IE9 + //issue, see attachEvent/addEventListener comment elsewhere + //in this file. + if (node.detachEvent && !isOpera) { + //Probably IE. If not it will throw an error, which will be + //useful to know. + if (ieName) { + node.detachEvent(ieName, func); + } + } else { + node.removeEventListener(name, func, false); + } + } + + /** + * Given an event from a script node, get the requirejs info from it, + * and then removes the event listeners on the node. + * @param {Event} evt + * @returns {Object} + */ + function getScriptData(evt) { + //Using currentTarget instead of target for Firefox 2.0's sake. Not + //all old browsers will be supported, but this one was easy enough + //to support and still makes sense. + var node = evt.currentTarget || evt.srcElement; + + //Remove the listeners once here. + removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange'); + removeListener(node, context.onScriptError, 'error'); + + return { + node: node, + id: node && node.getAttribute('data-requiremodule') + }; + } + + return (context = { config: config, - defQueue: defQueue, - waiting: waiting, - waitCount: 0, - specified: specified, - loaded: loaded, + contextName: contextName, + registry: registry, + defined: defined, urlMap: urlMap, urlFetched: urlFetched, - scriptCount: 0, - defined: defined, - paused: [], - pausedCount: 0, - plugins: plugins, - needFullExec: needFullExec, - fake: {}, - fullExec: fullExec, - managerCallbacks: managerCallbacks, + waitCount: 0, + defQueue: defQueue, + Module: Module, makeModuleMap: makeModuleMap, - normalize: normalize, + /** * Set a configuration for the context. * @param {Object} cfg config object to integrate. */ configure: function (cfg) { - var paths, prop, packages, pkgs, packagePaths, requireWait; - //Make sure the baseUrl ends in a slash. if (cfg.baseUrl) { - if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== "/") { - cfg.baseUrl += "/"; + if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') { + cfg.baseUrl += '/'; } } //Save off the paths and packages since they require special processing, //they are additive. - paths = config.paths; - packages = config.packages; - pkgs = config.pkgs; + var paths = config.paths, + pkgs = config.pkgs, + shim = config.shim, + map = config.map || {}; //Mix in the config values, favoring the new values over //existing ones in context.config. mixin(config, cfg, true); - //Adjust paths if necessary. - if (cfg.paths) { - for (prop in cfg.paths) { - if (!(prop in empty)) { - paths[prop] = cfg.paths[prop]; - } - } - config.paths = paths; + //Merge paths. + mixin(paths, cfg.paths, true); + config.paths = paths; + + //Merge map + if (cfg.map) { + mixin(map, cfg.map, true); + config.map = map; } - packagePaths = cfg.packagePaths; - if (packagePaths || cfg.packages) { - //Convert packagePaths into a packages config. - if (packagePaths) { - for (prop in packagePaths) { - if (!(prop in empty)) { - configurePackageDir(pkgs, packagePaths[prop], prop); - } + //Merge shim + if (cfg.shim) { + eachProp(cfg.shim, function (value, id) { + //Normalize the structure + if (isArray(value)) { + value = { + deps: value + }; } - } + if (value.exports && !value.exports.__buildReady) { + value.exports = context.makeShimExports(value.exports); + } + shim[id] = value; + }); + config.shim = shim; + } - //Adjust packages if necessary. - if (cfg.packages) { - configurePackageDir(pkgs, cfg.packages); - } + //Adjust packages if necessary. + if (cfg.packages) { + each(cfg.packages, function (pkgObj) { + var location; + + pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj; + location = pkgObj.location; + + //Create a brand new object on pkgs, since currentPackages can + //be passed in again, and config.pkgs is the internal transformed + //state for all package configs. + pkgs[pkgObj.name] = { + name: pkgObj.name, + location: location || pkgObj.name, + //Remove leading dot in main, so main paths are normalized, + //and remove any trailing .js, since different package + //envs have different conventions: some use a module name, + //some use a file name. + main: (pkgObj.main || 'main') + .replace(currDirRegExp, '') + .replace(jsSuffixRegExp, '') + }; + }); //Done with modifications, assing packages back to context config config.pkgs = pkgs; } - //If priority loading is in effect, trigger the loads now - if (cfg.priority) { - //Hold on to requireWait value, and reset it after done - requireWait = context.requireWait; - - //Allow tracing some require calls to allow the fetching - //of the priority config. - context.requireWait = false; - //But first, call resume to register any defined modules that may - //be in a data-main built file before the priority config - //call. - resume(); - - context.require(cfg.priority); - - //Trigger a resume right away, for the case when - //the script with the priority load is done as part - //of a data-main call. In that case the normal resume - //call will not happen because the scriptCount will be - //at 1, since the script for data-main is being processed. - resume(); - - //Restore previous state. - context.requireWait = requireWait; - config.priorityWait = cfg.priority; - } - //If a deps array or a config callback is specified, then call //require with those args. This is useful when require is defined as a //config object before require.js is loaded. @@ -1322,77 +1334,133 @@ var requirejs, require, define; } }, - requireDefined: function (moduleName, relModuleMap) { - return makeModuleMap(moduleName, relModuleMap).fullName in defined; + makeShimExports: function (exports) { + var func; + if (typeof exports === 'string') { + func = function () { + return getGlobal(exports); + }; + //Save the exports for use in nodefine checking. + func.exports = exports; + return func; + } else { + return function () { + return exports.apply(global, arguments); + }; + } }, - requireSpecified: function (moduleName, relModuleMap) { - return makeModuleMap(moduleName, relModuleMap).fullName in specified; + requireDefined: function (id, relMap) { + return hasProp(defined, makeModuleMap(id, relMap, false, true).id); }, - require: function (deps, callback, relModuleMap) { - var moduleName, fullName, moduleMap; - if (typeof deps === "string") { + requireSpecified: function (id, relMap) { + id = makeModuleMap(id, relMap, false, true).id; + return hasProp(defined, id) || hasProp(registry, id); + }, + + require: function (deps, callback, errback, relMap) { + var moduleName, id, map, requireMod, args; + if (typeof deps === 'string') { if (isFunction(callback)) { //Invalid call - return req.onError(makeError("requireargs", "Invalid require call")); + return onError(makeError('requireargs', 'Invalid require call'), errback); } //Synchronous access to one module. If require.get is //available (as in the Node adapter), prefer that. //In this case deps is the moduleName and callback is - //the relModuleMap + //the relMap if (req.get) { return req.get(context, deps, callback); } //Just return the module wanted. In this scenario, the - //second arg (if passed) is just the relModuleMap. + //second arg (if passed) is just the relMap. moduleName = deps; - relModuleMap = callback; + relMap = callback; //Normalize module name, if it contains . or .. - moduleMap = makeModuleMap(moduleName, relModuleMap); - fullName = moduleMap.fullName; + map = makeModuleMap(moduleName, relMap, false, true); + id = map.id; - if (!(fullName in defined)) { - return req.onError(makeError("notloaded", "Module name '" + - moduleMap.fullName + - "' has not been loaded yet for context: " + + if (!hasProp(defined, id)) { + return onError(makeError('notloaded', 'Module name "' + + id + + '" has not been loaded yet for context: ' + contextName)); } - return defined[fullName]; + return defined[id]; } - //Call main but only if there are dependencies or - //a callback to call. - if (deps && deps.length || callback) { - main(null, deps, callback, relModuleMap); + //Callback require. Normalize args. if callback or errback is + //not a function, it means it is a relMap. Test errback first. + if (errback && !isFunction(errback)) { + relMap = errback; + errback = undefined; + } + if (callback && !isFunction(callback)) { + relMap = callback; + callback = undefined; } - //If the require call does not trigger anything new to load, - //then resume the dependency processing. - if (!context.requireWait) { - while (!context.scriptCount && context.paused.length) { - resume(); + //Any defined modules in the global queue, intake them now. + takeGlobalQueue(); + + //Make sure any remaining defQueue items get properly processed. + while (defQueue.length) { + args = defQueue.shift(); + if (args[0] === null) { + return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); + } else { + //args are id, deps, factory. Should be normalized by the + //define() function. + callGetModule(args); } } + + //Mark all the dependencies as needing to be loaded. + requireMod = getModule(makeModuleMap(null, relMap)); + + requireMod.init(deps, callback, errback, { + enabled: true + }); + + checkLoaded(); + return context.require; }, + undef: function (id) { + var map = makeModuleMap(id, null, true), + mod = registry[id]; + + delete defined[id]; + delete urlMap[id]; + delete urlFetched[map.url]; + delete undefEvents[id]; + + if (mod) { + //Hold on to listeners in case the + //module will be attempted to be reloaded + //using a different config. + if (mod.events.defined) { + undefEvents[id] = mod.events; + } + + removeWaiting(id); + } + }, + /** - * Internal method to transfer globalQueue items to this context's - * defQueue. + * Called to enable a module if it is still in the registry + * awaiting enablement. parent module is passed in for context, + * used by the optimizer. */ - takeGlobalQueue: function () { - //Push all the globalDefQueue items into the context's defQueue - if (globalDefQueue.length) { - //Array splice in the values since the context code has a - //local var ref to defQueue, so cannot just reassign the one - //on context. - apsp.apply(context.defQueue, - [context.defQueue.length - 1, 0].concat(globalDefQueue)); - globalDefQueue = []; + enable: function (depMap, parent) { + var mod = registry[depMap.id]; + if (mod) { + getModule(depMap).enable(); } }, @@ -1403,51 +1471,55 @@ var requirejs, require, define; * @param {String} moduleName the name of the module to potentially complete. */ completeLoad: function (moduleName) { - var args; + var shim = config.shim[moduleName] || {}, + shExports = shim.exports && shim.exports.exports, + found, args, mod; - context.takeGlobalQueue(); + takeGlobalQueue(); while (defQueue.length) { args = defQueue.shift(); - if (args[0] === null) { args[0] = moduleName; - break; + //If already found an anonymous module and bound it + //to this name, then this is some other anon module + //waiting for its completeLoad to fire. + if (found) { + break; + } + found = true; } else if (args[0] === moduleName) { //Found matching define call for this script! - break; - } else { - //Some other named define call, most likely the result - //of a build layer that included many define calls. - callDefMain(args); - args = null; + found = true; } - } - if (args) { - callDefMain(args); - } else { - //A script that does not call define(), so just simulate - //the call for it. Special exception for jQuery dynamic load. - callDefMain([moduleName, [], - moduleName === "jquery" && typeof jQuery !== "undefined" ? - function () { - return jQuery; - } : null]); + + callGetModule(args); } - //Doing this scriptCount decrement branching because sync envs - //need to decrement after resume, otherwise it looks like - //loading is complete after the first dependency is fetched. - //For browsers, it works fine to decrement after, but it means - //the checkLoaded setTimeout 50 ms cost is taken. To avoid - //that cost, decrement beforehand. - if (req.isAsync) { - context.scriptCount -= 1; - } - resume(); - if (!req.isAsync) { - context.scriptCount -= 1; + //Do this after the cycle of callGetModule in case the result + //of those calls/init calls changes the registry. + mod = registry[moduleName]; + + if (!found && + !defined[moduleName] && + mod && !mod.inited) { + if (config.enforceDefine && (!shExports || !getGlobal(shExports))) { + if (hasPathFallback(moduleName)) { + return; + } else { + return onError(makeError('nodefine', + 'No define call for ' + moduleName, + null, + [moduleName])); + } + } else { + //A script that does not call define(), so just simulate + //the call for it. + callGetModule([moduleName, (shim.deps || []), shim.exports]); + } } + + checkLoaded(); }, /** @@ -1456,7 +1528,7 @@ var requirejs, require, define; * plain URLs like nameToUrl. */ toUrl: function (moduleNamePlusExt, relModuleMap) { - var index = moduleNamePlusExt.lastIndexOf("."), + var index = moduleNamePlusExt.lastIndexOf('.'), ext = null; if (index !== -1) { @@ -1473,10 +1545,10 @@ var requirejs, require, define; */ nameToUrl: function (moduleName, ext, relModuleMap) { var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url, - config = context.config; + parentPath; //Normalize module name if have a base relative module name to work from. - moduleName = normalize(moduleName, relModuleMap && relModuleMap.fullName); + moduleName = normalize(moduleName, relModuleMap && relModuleMap.id, true); //If a colon is in the URL, it indicates a protocol is used and it is just //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?) @@ -1486,22 +1558,29 @@ var requirejs, require, define; //Just a plain path, not module name lookup, so just return it. //Add extension if it is included. This is a bit wonky, only non-.js things pass //an extension, this method probably needs to be reworked. - url = moduleName + (ext ? ext : ""); + url = moduleName + (ext || ''); } else { //A module that needs to be converted to a path. paths = config.paths; pkgs = config.pkgs; - syms = moduleName.split("/"); + syms = moduleName.split('/'); //For each module name segment, see if there is a path //registered for it. Start with most specific name //and work up from it. - for (i = syms.length; i > 0; i--) { - parentModule = syms.slice(0, i).join("/"); - if (paths[parentModule]) { - syms.splice(0, i, paths[parentModule]); + for (i = syms.length; i > 0; i -= 1) { + parentModule = syms.slice(0, i).join('/'); + pkg = pkgs[parentModule]; + parentPath = paths[parentModule]; + if (parentPath) { + //If an array, it means there are a few choices, + //Choose the one that is desired + if (isArray(parentPath)) { + parentPath = parentPath[0]; + } + syms.splice(0, i, parentPath); break; - } else if ((pkg = pkgs[parentModule])) { + } else if (pkg) { //If module name is just the package name, then looking //for the main module. if (moduleName === pkg.name) { @@ -1515,22 +1594,64 @@ var requirejs, require, define; } //Join the path parts together, then figure out if baseUrl is needed. - url = syms.join("/") + (ext || ".js"); - url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? "" : config.baseUrl) + url; + url = syms.join('/') + (ext || '.js'); + url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url; } return config.urlArgs ? url + ((url.indexOf('?') === -1 ? '?' : '&') + config.urlArgs) : url; + }, + + //Delegates to req.load. Broken out as a separate function to + //allow overriding in the optimizer. + load: function (id, url) { + req.load(context, id, url); + }, + + /** + * Executes a module callack function. Broken out as a separate function + * solely to allow the build system to sequence the files in the built + * layer in the right sequence. + * + * @private + */ + execCb: function (name, callback, args, exports) { + return callback.apply(exports, args); + }, + + /** + * callback for script loads, used to check status of loading. + * + * @param {Event} evt the event from the browser for the script + * that was loaded. + */ + onScriptLoad: function (evt) { + //Using currentTarget instead of target for Firefox 2.0's sake. Not + //all old browsers will be supported, but this one was easy enough + //to support and still makes sense. + if (evt.type === 'load' || + (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) { + //Reset interactive script so a script node is not held onto for + //to long. + interactiveScript = null; + + //Pull out the name of the module and the context. + var data = getScriptData(evt); + context.completeLoad(data.id); + } + }, + + /** + * Callback for script errors. + */ + onScriptError: function (evt) { + var data = getScriptData(evt); + if (!hasPathFallback(data.id)) { + return onError(makeError('scripterror', 'Script error', evt, [data.id])); + } } - }; - - //Make these visible on the context so can be called at the very - //end of the file to bootstrap - context.jQueryCheck = jQueryCheck; - context.resume = resume; - - return context; + }); } /** @@ -1547,20 +1668,21 @@ var requirejs, require, define; * on a require that are not standardized), and to give a short * name for minification/local scope use. */ - req = requirejs = function (deps, callback) { + req = requirejs = function (deps, callback, errback, optional) { //Find the right context, use default var contextName = defContextName, context, config; // Determine if have config object in the call. - if (!isArray(deps) && typeof deps !== "string") { + if (!isArray(deps) && typeof deps !== 'string') { // deps is a config object config = deps; if (isArray(callback)) { // Adjust args if there are dependencies deps = callback; - callback = arguments[2]; + callback = errback; + errback = optional; } else { deps = []; } @@ -1570,14 +1692,16 @@ var requirejs, require, define; contextName = config.context; } - context = contexts[contextName] || - (contexts[contextName] = newContext(contextName)); + context = contexts[contextName]; + if (!context) { + context = contexts[contextName] = req.s.newContext(contextName); + } if (config) { context.configure(config); } - return context.require(deps, callback); + return context.require(deps, callback, errback); }; /** @@ -1595,31 +1719,29 @@ var requirejs, require, define; require = req; } - /** - * Global require.toUrl(), to match global require, mostly useful - * for debugging/work in the global space. - */ - req.toUrl = function (moduleNamePlusExt) { - return contexts[defContextName].toUrl(moduleNamePlusExt); - }; - req.version = version; //Used to filter out dependencies that are already paths. req.jsExtRegExp = /^\/|:|\?|\.js$/; + req.isBrowser = isBrowser; s = req.s = { contexts: contexts, - //Stores a list of URLs that should not get async script tag treatment. - skipAsync: {} + newContext: newContext }; - req.isAsync = req.isBrowser = isBrowser; + //Create default context. + req({}); + + //Exports some context-sensitive methods on global require, using + //default context if no context specified. + addRequireMethods(req, contexts[defContextName]); + if (isBrowser) { - head = s.head = document.getElementsByTagName("head")[0]; + head = s.head = document.getElementsByTagName('head')[0]; //If BASE tag is in play, using appendChild is a problem for IE6. //When that browser dies, this can be removed. Details in this jQuery bug: //http://dev.jquery.com/ticket/2709 - baseElement = document.getElementsByTagName("base")[0]; + baseElement = document.getElementsByTagName('base')[0]; if (baseElement) { head = s.head = baseElement.parentNode; } @@ -1644,34 +1766,137 @@ var requirejs, require, define; * @param {Object} url the URL to the module. */ req.load = function (context, moduleName, url) { - req.resourcesReady(false); + var config = (context && context.config) || {}, + node; + if (isBrowser) { + //In the browser so use a script tag + node = config.xhtml ? + document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') : + document.createElement('script'); + node.type = config.scriptType || 'text/javascript'; + node.charset = 'utf-8'; - context.scriptCount += 1; - req.attach(url, context, moduleName); + node.setAttribute('data-requirecontext', context.contextName); + node.setAttribute('data-requiremodule', moduleName); - //If tracking a jQuery, then make sure its ready callbacks - //are put on hold to prevent its ready callbacks from - //triggering too soon. - if (context.jQuery && !context.jQueryIncremented) { - jQueryHoldReady(context.jQuery, true); - context.jQueryIncremented = true; + //Set up load listener. Test attachEvent first because IE9 has + //a subtle issue in its addEventListener and script onload firings + //that do not match the behavior of all other browsers with + //addEventListener support, which fire the onload event for a + //script right after the script execution. See: + //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution + //UNFORTUNATELY Opera implements attachEvent but does not follow the script + //script execution mode. + if (node.attachEvent && + //Check if node.attachEvent is artificially added by custom script or + //natively supported by browser + //read https://github.com/jrburke/requirejs/issues/187 + //if we can NOT find [native code] then it must NOT natively supported. + //in IE8, node.attachEvent does not have toString() + //Note the test for "[native code" with no closing brace, see: + //https://github.com/jrburke/requirejs/issues/273 + !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) && + !isOpera) { + //Probably IE. IE (at least 6-8) do not fire + //script onload right after executing the script, so + //we cannot tie the anonymous define call to a name. + //However, IE reports the script as being in 'interactive' + //readyState at the time of the define call. + useInteractive = true; + + node.attachEvent('onreadystatechange', context.onScriptLoad); + //It would be great to add an error handler here to catch + //404s in IE9+. However, onreadystatechange will fire before + //the error handler, so that does not help. If addEvenListener + //is used, then IE will fire error before load, but we cannot + //use that pathway given the connect.microsoft.com issue + //mentioned above about not doing the 'script execute, + //then fire the script load event listener before execute + //next script' that other browsers do. + //Best hope: IE10 fixes the issues, + //and then destroys all installs of IE 6-9. + //node.attachEvent('onerror', context.onScriptError); + } else { + node.addEventListener('load', context.onScriptLoad, false); + node.addEventListener('error', context.onScriptError, false); + } + node.src = url; + + //For some cache cases in IE 6-8, the script executes before the end + //of the appendChild execution, so to tie an anonymous define + //call to the module name (which is stored on the node), hold on + //to a reference to this node, but clear after the DOM insertion. + currentlyAddingScript = node; + if (baseElement) { + head.insertBefore(node, baseElement); + } else { + head.appendChild(node); + } + currentlyAddingScript = null; + + return node; + } else if (isWebWorker) { + //In a web worker, use importScripts. This is not a very + //efficient use of importScripts, importScripts will block until + //its script is downloaded and evaluated. However, if web workers + //are in play, the expectation that a build has been done so that + //only one script needs to be loaded anyway. This may need to be + //reevaluated if other use cases become common. + importScripts(url); + + //Account for anonymous modules + context.completeLoad(moduleName); } }; function getInteractiveScript() { - var scripts, i, script; if (interactiveScript && interactiveScript.readyState === 'interactive') { return interactiveScript; } - scripts = document.getElementsByTagName('script'); - for (i = scripts.length - 1; i > -1 && (script = scripts[i]); i--) { + eachReverse(scripts(), function (script) { if (script.readyState === 'interactive') { return (interactiveScript = script); } - } + }); + return interactiveScript; + } - return null; + //Look for a data-main script attribute, which could also adjust the baseUrl. + if (isBrowser) { + //Figure out baseUrl. Get it from the script tag with require.js in it. + eachReverse(scripts(), function (script) { + //Set the 'head' where we can append children by + //using the script's parent. + if (!head) { + head = script.parentNode; + } + + //Look for a data-main attribute to set main script for the page + //to load. If it is there, the path to data main becomes the + //baseUrl, if it is not already set. + dataMain = script.getAttribute('data-main'); + if (dataMain) { + if (!cfg.baseUrl) { + //Pull off the directory of data-main for use as the + //baseUrl. + src = dataMain.split('/'); + mainScript = src.pop(); + subPath = src.length ? src.join('/') + '/' : './'; + + //Set final config. + cfg.baseUrl = subPath; + //Strip off any trailing .js since dataMain is now + //like a module name. + dataMain = mainScript.replace(jsSuffixRegExp, ''); + } + + //Put the data-main script in the files to load. + cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain]; + + return true; + } + }); } /** @@ -1707,7 +1932,7 @@ var requirejs, require, define; if (callback.length) { callback .toString() - .replace(commentRegExp, "") + .replace(commentRegExp, '') .replace(cjsRequireRegExp, function (match, dep) { deps.push(dep); }); @@ -1717,7 +1942,7 @@ var requirejs, require, define; //work though if it just needs require. //REQUIRES the function to expect the CommonJS variables in the //order listed below. - deps = (callback.length === 1 ? ["require"] : ["require", "exports", "module"]).concat(deps); + deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps); } } @@ -1727,9 +1952,9 @@ var requirejs, require, define; node = currentlyAddingScript || getInteractiveScript(); if (node) { if (!name) { - name = node.getAttribute("data-requiremodule"); + name = node.getAttribute('data-requiremodule'); } - context = contexts[node.getAttribute("data-requirecontext")]; + context = contexts[node.getAttribute('data-requirecontext')]; } } @@ -1740,324 +1965,24 @@ var requirejs, require, define; //occurs. If no context, use the global queue, and get it processed //in the onscript load callback. (context ? context.defQueue : globalDefQueue).push([name, deps, callback]); - - return undefined; }; define.amd = { - multiversion: true, - plugins: true, jQuery: true }; + /** * Executes the text. Normally just uses eval, but can be modified - * to use a more environment specific call. + * to use a better, environment-specific call. Only used for transpiling + * loader plugins, not for plain JS modules. * @param {String} text the text to execute/evaluate. */ req.exec = function (text) { + /*jslint evil: true */ return eval(text); }; - /** - * Executes a module callack function. Broken out as a separate function - * solely to allow the build system to sequence the files in the built - * layer in the right sequence. - * - * @private - */ - req.execCb = function (name, callback, args, exports) { - return callback.apply(exports, args); - }; - - - /** - * Adds a node to the DOM. Public function since used by the order plugin. - * This method should not normally be called by outside code. - */ - req.addScriptToDom = function (node) { - //For some cache cases in IE 6-8, the script executes before the end - //of the appendChild execution, so to tie an anonymous define - //call to the module name (which is stored on the node), hold on - //to a reference to this node, but clear after the DOM insertion. - currentlyAddingScript = node; - if (baseElement) { - head.insertBefore(node, baseElement); - } else { - head.appendChild(node); - } - currentlyAddingScript = null; - }; - - /** - * callback for script loads, used to check status of loading. - * - * @param {Event} evt the event from the browser for the script - * that was loaded. - * - * @private - */ - req.onScriptLoad = function (evt) { - //Using currentTarget instead of target for Firefox 2.0's sake. Not - //all old browsers will be supported, but this one was easy enough - //to support and still makes sense. - var node = evt.currentTarget || evt.srcElement, contextName, moduleName, - context; - - if (evt.type === "load" || (node && readyRegExp.test(node.readyState))) { - //Reset interactive script so a script node is not held onto for - //to long. - interactiveScript = null; - - //Pull out the name of the module and the context. - contextName = node.getAttribute("data-requirecontext"); - moduleName = node.getAttribute("data-requiremodule"); - context = contexts[contextName]; - - contexts[contextName].completeLoad(moduleName); - - //Clean up script binding. Favor detachEvent because of IE9 - //issue, see attachEvent/addEventListener comment elsewhere - //in this file. - if (node.detachEvent && !isOpera) { - //Probably IE. If not it will throw an error, which will be - //useful to know. - node.detachEvent("onreadystatechange", req.onScriptLoad); - } else { - node.removeEventListener("load", req.onScriptLoad, false); - } - } - }; - - /** - * Attaches the script represented by the URL to the current - * environment. Right now only supports browser loading, - * but can be redefined in other environments to do the right thing. - * @param {String} url the url of the script to attach. - * @param {Object} context the context that wants the script. - * @param {moduleName} the name of the module that is associated with the script. - * @param {Function} [callback] optional callback, defaults to require.onScriptLoad - * @param {String} [type] optional type, defaults to text/javascript - * @param {Function} [fetchOnlyFunction] optional function to indicate the script node - * should be set up to fetch the script but do not attach it to the DOM - * so that it can later be attached to execute it. This is a way for the - * order plugin to support ordered loading in IE. Once the script is fetched, - * but not executed, the fetchOnlyFunction will be called. - */ - req.attach = function (url, context, moduleName, callback, type, fetchOnlyFunction) { - var node; - if (isBrowser) { - //In the browser so use a script tag - callback = callback || req.onScriptLoad; - node = context && context.config && context.config.xhtml ? - document.createElementNS("http://www.w3.org/1999/xhtml", "html:script") : - document.createElement("script"); - node.type = type || (context && context.config.scriptType) || - "text/javascript"; - node.charset = "utf-8"; - //Use async so Gecko does not block on executing the script if something - //like a long-polling comet tag is being run first. Gecko likes - //to evaluate scripts in DOM order, even for dynamic scripts. - //It will fetch them async, but only evaluate the contents in DOM - //order, so a long-polling script tag can delay execution of scripts - //after it. But telling Gecko we expect async gets us the behavior - //we want -- execute it whenever it is finished downloading. Only - //Helps Firefox 3.6+ - //Allow some URLs to not be fetched async. Mostly helps the order! - //plugin - node.async = !s.skipAsync[url]; - - if (context) { - node.setAttribute("data-requirecontext", context.contextName); - } - node.setAttribute("data-requiremodule", moduleName); - - //Set up load listener. Test attachEvent first because IE9 has - //a subtle issue in its addEventListener and script onload firings - //that do not match the behavior of all other browsers with - //addEventListener support, which fire the onload event for a - //script right after the script execution. See: - //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution - //UNFORTUNATELY Opera implements attachEvent but does not follow the script - //script execution mode. - if (node.attachEvent && - // check if node.attachEvent is artificially added by custom script or - // natively supported by browser - // read https://github.com/jrburke/requirejs/issues/187 - // if we can NOT find [native code] then it must NOT natively supported. - // in IE8, node.attachEvent does not have toString() - // TODO: a better way to check interactive mode - !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code]') < 0) && - !isOpera) { - //Probably IE. IE (at least 6-8) do not fire - //script onload right after executing the script, so - //we cannot tie the anonymous define call to a name. - //However, IE reports the script as being in "interactive" - //readyState at the time of the define call. - useInteractive = true; - - - if (fetchOnlyFunction) { - //Need to use old school onreadystate here since - //when the event fires and the node is not attached - //to the DOM, the evt.srcElement is null, so use - //a closure to remember the node. - node.onreadystatechange = function (evt) { - //Script loaded but not executed. - //Clear loaded handler, set the real one that - //waits for script execution. - if (node.readyState === 'loaded') { - node.onreadystatechange = null; - node.attachEvent("onreadystatechange", callback); - fetchOnlyFunction(node); - } - }; - } else { - node.attachEvent("onreadystatechange", callback); - } - } else { - node.addEventListener("load", callback, false); - } - node.src = url; - - //Fetch only means waiting to attach to DOM after loaded. - if (!fetchOnlyFunction) { - req.addScriptToDom(node); - } - - return node; - } else if (isWebWorker) { - //In a web worker, use importScripts. This is not a very - //efficient use of importScripts, importScripts will block until - //its script is downloaded and evaluated. However, if web workers - //are in play, the expectation that a build has been done so that - //only one script needs to be loaded anyway. This may need to be - //reevaluated if other use cases become common. - importScripts(url); - - //Account for anonymous modules - context.completeLoad(moduleName); - } - return null; - }; - - //Look for a data-main script attribute, which could also adjust the baseUrl. - if (isBrowser) { - //Figure out baseUrl. Get it from the script tag with require.js in it. - scripts = document.getElementsByTagName("script"); - - for (globalI = scripts.length - 1; globalI > -1 && (script = scripts[globalI]); globalI--) { - //Set the "head" where we can append children by - //using the script's parent. - if (!head) { - head = script.parentNode; - } - - //Look for a data-main attribute to set main script for the page - //to load. If it is there, the path to data main becomes the - //baseUrl, if it is not already set. - if ((dataMain = script.getAttribute('data-main'))) { - if (!cfg.baseUrl) { - //Pull off the directory of data-main for use as the - //baseUrl. - src = dataMain.split('/'); - mainScript = src.pop(); - subPath = src.length ? src.join('/') + '/' : './'; - - //Set final config. - cfg.baseUrl = subPath; - //Strip off any trailing .js since dataMain is now - //like a module name. - dataMain = mainScript.replace(jsSuffixRegExp, ''); - } - - //Put the data-main script in the files to load. - cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain]; - - break; - } - } - } - - //See if there is nothing waiting across contexts, and if not, trigger - //resourcesReady. - req.checkReadyState = function () { - var contexts = s.contexts, prop; - for (prop in contexts) { - if (!(prop in empty)) { - if (contexts[prop].waitCount) { - return; - } - } - } - req.resourcesReady(true); - }; - - /** - * Internal function that is triggered whenever all scripts/resources - * have been loaded by the loader. Can be overridden by other, for - * instance the domReady plugin, which wants to know when all resources - * are loaded. - */ - req.resourcesReady = function (isReady) { - var contexts, context, prop; - - //First, set the public variable indicating that resources are loading. - req.resourcesDone = isReady; - - if (req.resourcesDone) { - //If jQuery with DOM ready delayed, release it now. - contexts = s.contexts; - for (prop in contexts) { - if (!(prop in empty)) { - context = contexts[prop]; - if (context.jQueryIncremented) { - jQueryHoldReady(context.jQuery, false); - context.jQueryIncremented = false; - } - } - } - } - }; - - //FF < 3.6 readyState fix. Needed so that domReady plugin - //works well in that environment, since require.js is normally - //loaded via an HTML script tag so it will be there before window load, - //where the domReady plugin is more likely to be loaded after window load. - req.pageLoaded = function () { - if (document.readyState !== "complete") { - document.readyState = "complete"; - } - }; - if (isBrowser) { - if (document.addEventListener) { - if (!document.readyState) { - document.readyState = "loading"; - window.addEventListener("load", req.pageLoaded, false); - } - } - } - - //Set up default context. If require was a configuration object, use that as base config. + //Set up with config info. req(cfg); - - //If modules are built into require.js, then need to make sure dependencies are - //traced. Use a setTimeout in the browser world, to allow all the modules to register - //themselves. In a non-browser env, assume that modules are not built into require.js, - //which seems odd to do on the server. - if (req.isAsync && typeof setTimeout !== "undefined") { - ctx = s.contexts[(cfg.context || defContextName)]; - //Indicate that the script that includes require() is still loading, - //so that require()'d dependencies are not traced until the end of the - //file is parsed (approximated via the setTimeout call). - ctx.requireWait = true; - setTimeout(function () { - ctx.requireWait = false; - - if (!ctx.scriptCount) { - ctx.resume(); - } - req.checkReadyState(); - }, 0); - } -}()); +}(this)); diff --git a/index.html b/index.html index 34abb971..7ebc6317 100644 --- a/index.html +++ b/index.html @@ -8,9 +8,9 @@ - - - + + + Fork me on GitHub @@ -57,6 +57,7 @@
  • WaveMaker
  • RStudio
  • Play My Code
    • +
  • Codecademy
  • Qooxdoo playground
  • Radiant CMS
  • Developer Companion
    • diff --git a/kitchen-sink.html b/kitchen-sink.html index 55b43635..6712e59d 100644 --- a/kitchen-sink.html +++ b/kitchen-sink.html @@ -67,6 +67,7 @@ + diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js index d12478a3..a64b61cf 100644 --- a/lib/ace/commands/default_commands.js +++ b/lib/ace/commands/default_commands.js @@ -72,22 +72,22 @@ exports.commands = [{ readOnly: true }, { name: "fold", - bindKey: bindKey("Alt-L", "Alt-L"), + bindKey: bindKey("Alt-L|Ctrl-F1", "Command-Alt-L|Command-F1"), exec: function(editor) { editor.session.toggleFold(false); }, readOnly: true }, { name: "unfold", - bindKey: bindKey("Alt-Shift-L", "Alt-Shift-L"), + bindKey: bindKey("Alt-Shift-L|Ctrl-Shift-F1", "Command-Alt-Shift-L|Command-Shift-F1"), exec: function(editor) { editor.session.toggleFold(true); }, readOnly: true }, { name: "foldall", - bindKey: bindKey("Alt-0", "Alt-0"), + bindKey: bindKey("Alt-0", "Command-Option-0"), exec: function(editor) { editor.session.foldAll(); }, readOnly: true }, { name: "unfoldall", - bindKey: bindKey("Alt-Shift-0", "Alt-Shift-0"), + bindKey: bindKey("Alt-Shift-0", "Command-Option-Shift-0"), exec: function(editor) { editor.session.unfold(); }, readOnly: true }, { @@ -110,17 +110,17 @@ exports.commands = [{ readOnly: true }, { name: "overwrite", - bindKey: bindKey("Insert", "Insert"), + bindKey: "Insert", exec: function(editor) { editor.toggleOverwrite(); }, readOnly: true }, { name: "selecttostart", - bindKey: bindKey("Ctrl-Shift-Home|Alt-Shift-Up", "Command-Shift-Up"), + bindKey: bindKey("Ctrl-Shift-Home", "Command-Shift-Up"), exec: function(editor) { editor.getSelection().selectFileStart(); }, readOnly: true }, { name: "gotostart", - bindKey: bindKey("Ctrl-Home|Ctrl-Up", "Command-Home|Command-Up"), + bindKey: bindKey("Ctrl-Home", "Command-Home|Command-Up"), exec: function(editor) { editor.navigateFileStart(); }, readOnly: true }, { @@ -137,13 +137,13 @@ exports.commands = [{ readOnly: true }, { name: "selecttoend", - bindKey: bindKey("Ctrl-Shift-End|Alt-Shift-Down", "Command-Shift-Down"), + bindKey: bindKey("Ctrl-Shift-End", "Command-Shift-Down"), exec: function(editor) { editor.getSelection().selectFileEnd(); }, multiSelectAction: "forEach", readOnly: true }, { name: "gotoend", - bindKey: bindKey("Ctrl-End|Ctrl-Down", "Command-End|Command-Down"), + bindKey: bindKey("Ctrl-End", "Command-End|Command-Down"), exec: function(editor) { editor.navigateFileEnd(); }, multiSelectAction: "forEach", readOnly: true @@ -233,43 +233,53 @@ exports.commands = [{ readOnly: true }, { name: "selectpagedown", - bindKey: bindKey("Shift-PageDown", "Shift-PageDown"), + bindKey: "Shift-PageDown", exec: function(editor) { editor.selectPageDown(); }, readOnly: true }, { name: "pagedown", - bindKey: bindKey(null, "PageDown"), + bindKey: bindKey(null, "Option-PageDown"), exec: function(editor) { editor.scrollPageDown(); }, readOnly: true }, { name: "gotopagedown", - bindKey: bindKey("PageDown", "Option-PageDown|Ctrl-V"), + bindKey: bindKey("PageDown", "PageDown|Ctrl-V"), exec: function(editor) { editor.gotoPageDown(); }, readOnly: true }, { name: "selectpageup", - bindKey: bindKey("Shift-PageUp", "Shift-PageUp"), + bindKey: "Shift-PageUp", exec: function(editor) { editor.selectPageUp(); }, readOnly: true }, { name: "pageup", - bindKey: bindKey(null, "PageUp"), + bindKey: bindKey(null, "Option-PageUp"), exec: function(editor) { editor.scrollPageUp(); }, readOnly: true }, { name: "gotopageup", - bindKey: bindKey("PageUp", "Option-PageUp"), + bindKey: "PageUp", exec: function(editor) { editor.gotoPageUp(); }, readOnly: true +}, { + name: "scrollup", + bindKey: bindKey("Ctrl-Up", null), + exec: function(e) { e.renderer.scrollBy(0, -2 * e.renderer.layerConfig.lineHeight); }, + readOnly: true +}, { + name: "scrolldown", + bindKey: bindKey("Ctrl-Down", null), + exec: function(e) { e.renderer.scrollBy(0, 2 * e.renderer.layerConfig.lineHeight); }, + readOnly: true }, { name: "selectlinestart", - bindKey: bindKey("Shift-Home", "Shift-Home"), + bindKey: "Shift-Home", exec: function(editor) { editor.getSelection().selectLineStart(); }, multiSelectAction: "forEach", readOnly: true }, { name: "selectlineend", - bindKey: bindKey("Shift-End", "Shift-End"), + bindKey: "Shift-End", exec: function(editor) { editor.getSelection().selectLineEnd(); }, multiSelectAction: "forEach", readOnly: true @@ -285,10 +295,15 @@ exports.commands = [{ readOnly: true }, { name: "jumptomatching", - bindKey: bindKey("Ctrl-Shift-P", "Ctrl-Shift-P"), + bindKey: bindKey("Ctrl-P", "Ctrl-P"), exec: function(editor) { editor.jumpToMatching(); }, multiSelectAction: "forEach", readOnly: true +}, { + name: "selecttomatching", + bindKey: bindKey("Ctrl-Shift-P", "Ctrl-Shift-P"), + exec: function(editor) { editor.jumpToMatching(true); }, + readOnly: true }, // commands disabled in readOnly mode @@ -309,6 +324,11 @@ exports.commands = [{ bindKey: bindKey("Ctrl-D", "Command-D"), exec: function(editor) { editor.removeLines(); }, multiSelectAction: "forEach" +}, { + name: "duplicateSelection", + bindKey: bindKey("Ctrl-Shift-D", "Command-Shift-D"), + exec: function(editor) { editor.duplicateSelection(); }, + multiSelectAction: "forEach" }, { name: "togglecomment", bindKey: bindKey("Ctrl-/", "Command-/"), @@ -348,7 +368,7 @@ exports.commands = [{ exec: function(editor) { editor.redo(); } }, { name: "copylinesup", - bindKey: bindKey("Ctrl-Alt-Up", "Command-Option-Up"), + bindKey: bindKey("Alt-Shift-Up", "Command-Option-Up"), exec: function(editor) { editor.copyLinesUp(); } }, { name: "movelinesup", @@ -356,7 +376,7 @@ exports.commands = [{ exec: function(editor) { editor.moveLinesUp(); } }, { name: "copylinesdown", - bindKey: bindKey("Ctrl-Alt-Down", "Command-Option-Down"), + bindKey: bindKey("Alt-Shift-Down", "Command-Option-Down"), exec: function(editor) { editor.copyLinesDown(); } }, { name: "movelinesdown", diff --git a/lib/ace/commands/multi_select_commands.js b/lib/ace/commands/multi_select_commands.js index ed396fb3..ebac5cc7 100644 --- a/lib/ace/commands/multi_select_commands.js +++ b/lib/ace/commands/multi_select_commands.js @@ -92,7 +92,7 @@ exports.multiSelectCommands = [{ bindKey: "esc", exec: function(editor) { editor.exitMultiSelectMode(); }, readonly: true, - isAvailable: function(editor) {return editor.inMultiSelectMode} + isAvailable: function(editor) {return editor && editor.inMultiSelectMode} }]; var HashHandler = require("../keyboard/hash_handler").HashHandler; diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index c1cd0f0c..d53a135b 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -8,6 +8,7 @@ .ace_scroller { position: absolute; overflow: hidden; + width : 100%; } .ace_content { @@ -50,9 +51,11 @@ .ace_gutter-cell.ace_info { background-image: url("data:image/gif;base64,R0lGODlhEAAQAMQAAAAAAEFBQVJSUl5eXmRkZGtra39/f4WFhYmJiZGRkaampry8vMPDw8zMzNXV1dzc3OTk5Orq6vDw8P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABQALAAAAAAQABAAAAUuICWOZGmeaBml5XGwFCQSBGyXRSAwtqQIiRuiwIM5BoYVbEFIyGCQoeJGrVptIQA7"); - background-repeat: no-repeat; background-position: 2px center; } +.ace_dark .ace_gutter-cell.ace_info { + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGRTk5MTVGREIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGRTk5MTVGRUIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZFOTkxNUZCQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFOTkxNUZDQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+SIDkjAAAAJ1JREFUeNpi/P//PwMlgImBQkB7A6qrq/+DMC55FkIGKCoq4pVnpFkgTp069f/+/fv/r1u37r+tre1/kg0A+ptn9uzZYLaRkRHpLvjw4cNXWVlZhufPnzOcO3eOdAO0tbVPAjHDmzdvGA4fPsxIsgGSkpJmv379Ynj37h2DjIyMCMkG3LhxQ/T27dsMampqDHZ2dq/pH41DxwCAAAMAFdc68dUsFZgAAAAASUVORK5CYII="); +} .ace_editor .ace_sb { position: absolute; @@ -246,9 +249,11 @@ background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAe%8A%B1%0D%000%0C%C2%F2%2CK%96%BC%D0%8F9%81%88H%E9%D0%0E%96%C0%10%92%3E%02%80%5E%82%E4%A9*-%EEsw%C8%CC%11%EE%96w%D8%DC%E9*Eh%0C%151(%00%00%00%00IEND%AEB%60%82"); background-repeat: no-repeat; - background-position: center 5px; + background-position: center 4px; border-radius: 3px; + + border: 1px solid transparent; } .ace_fold-widget.end { @@ -262,11 +267,8 @@ .ace_fold-widget:hover { border: 1px solid rgba(0, 0, 0, 0.3); background-color: rgba(255, 255, 255, 0.2); - -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7); -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7); - -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7); -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7); - box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7); box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7); background-position: center 4px; } @@ -274,14 +276,34 @@ .ace_fold-widget:active { border: 1px solid rgba(0, 0, 0, 0.4); background-color: rgba(0, 0, 0, 0.05); - -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255); -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8); - -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255); -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8); - box-shadow:inset 0 1px 1px rgba(255, 255, 255); box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8); } - +/** + * Dark version for fold widgets + */ +.ace_dark .ace_fold-widget { + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC"); +} +.ace_dark .ace_fold-widget.end { + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg=="); +} +.ace_dark .ace_fold-widget.closed { + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg=="); +} +.ace_dark .ace_fold-widget:hover { + box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2); + background-color: rgba(255, 255, 255, 0.1); +} +.ace_dark .ace_fold-widget:active { + -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2); + -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2); + box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2); +} + + + .ace_fold-widget.invalid { background-color: #FFB4B4; border-color: #DE5555; diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js index 81e17227..b7b0dead 100644 --- a/lib/ace/edit_session.js +++ b/lib/ace/edit_session.js @@ -827,7 +827,8 @@ var EditSession = function(text, mode) { try { module = require(mode); } catch (e) {}; - if (module) + // sometimes require returns empty object (this bug is present in requirejs 2 as well) + if (module && module.Mode) return done(module); // set mode to text until loading is finished diff --git a/lib/ace/edit_session/bracket_match.js b/lib/ace/edit_session/bracket_match.js index 86400214..83c8f572 100644 --- a/lib/ace/edit_session/bracket_match.js +++ b/lib/ace/edit_session/bracket_match.js @@ -40,6 +40,7 @@ define(function(require, exports, module) { "use strict"; var TokenIterator = require("../token_iterator").TokenIterator; +var Range = require("../range").Range; /** * class BracketMatch @@ -76,15 +77,56 @@ function BracketMatch() { if (charBeforeCursor == "") return null; var match = charBeforeCursor.match(/([\(\[\{])|([\)\]\}])/); - if (!match) { + if (!match) return null; + + if (match[1]) + return this.$findClosingBracket(match[1], position); + else + return this.$findOpeningBracket(match[2], position); + }; + + this.getBracketRange = function(pos) { + var line = this.getLine(pos.row); + var before = true, range; + + var chr = line.charAt(pos.column-1); + var match = chr && chr.match(/([\(\[\{])|([\)\]\}])/); + if (!match) { + chr = line.charAt(pos.column); + pos.column++; + match = chr && chr.match(/([\(\[\{])|([\)\]\}])/); + before = false; } + if (!match) + return null; if (match[1]) { - return this.$findClosingBracket(match[1], position); + var bracketPos = this.$findClosingBracket(match[1], pos); + if (!bracketPos) + return null; + range = Range.fromPoints(pos, bracketPos); + if (!before) { + range.end.column++; + range.start.column--; + } + range.cursor = range.end; } else { - return this.$findOpeningBracket(match[2], position); + var bracketPos = this.$findOpeningBracket(match[2], pos); + if (!bracketPos) + return null; + range = Range.fromPoints(bracketPos, pos); + if (!before) { + range.start.column++; + range.end.column--; + } + range.cursor = range.start; } + + if (!before) + pos.column--; + + return range; }; this.$brackets = { diff --git a/lib/ace/editor.js b/lib/ace/editor.js index e6d30eca..1efac5fc 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -1348,6 +1348,24 @@ var Editor = function(renderer, session) { this.clearSelection(); }; + this.duplicateSelection = function() { + var sel = this.selection; + var doc = this.session; + var range = sel.getRange(); + if (range.isEmpty()) { + var row = range.start.row; + doc.duplicateLines(row, row); + } else { + var reverse = sel.isBackwards() + var point = sel.isBackwards() ? range.start : range.end; + var endPoint = doc.insert(point, doc.getTextRange(range), false); + range.start = point; + range.end = endPoint; + + sel.setSelectionRange(range, reverse) + } + }; + /** related to: EditSession.moveLinesDown * Editor.moveLinesDown() -> Number * + (Number): On success, it returns -1. @@ -1660,8 +1678,11 @@ var Editor = function(renderer, session) { **/ this.centerSelection = function() { var range = this.getSelectionRange(); - var line = Math.floor(range.start.row + (range.end.row - range.start.row) / 2); - this.renderer.scrollToLine(line, true); + var pos = { + row: Math.floor(range.start.row + (range.end.row - range.start.row) / 2), + column: Math.floor(range.start.column + (range.end.column - range.start.column) / 2) + } + this.renderer.alignCursor(pos, 0.5); }; /** related to: Selection.getCursor @@ -1746,21 +1767,34 @@ var Editor = function(renderer, session) { * Moves the cursor's row and column to the next matching bracket. * **/ - this.jumpToMatching = function() { + this.jumpToMatching = function(select) { var cursor = this.getCursorPosition(); - var pos = this.session.findMatchingBracket(cursor); - if (!pos) { - cursor.column += 1; - pos = this.session.findMatchingBracket(cursor); - } - if (!pos) { - cursor.column -= 2; - pos = this.session.findMatchingBracket(cursor); - } + var range = this.session.getBracketRange(cursor); + if (!range) { + range = editor.find({ + needle: /[{}()\[\]]/g, + preventScroll:true, + start: {row: cursor.row, column: cursor.column - 1} + }); + if (!range) + return; + var pos = range.start; + if (pos.row == cursor.row && Math.abs(pos.column - cursor.column) < 2) + range = this.session.getBracketRange(pos); + } + + pos = range && range.cursor || pos; if (pos) { - this.clearSelection(); - this.moveCursorTo(pos.row, pos.column); + if (select) { + if (range && range.isEqual(editor.getSelectionRange())) + this.clearSelection(); + else + this.selection.selectTo(pos.row, pos.column); + } else { + this.clearSelection(); + this.moveCursorTo(pos.row, pos.column); + } } }; diff --git a/lib/ace/ext/static_highlight.js b/lib/ace/ext/static_highlight.js index 407b2829..aca3fd9e 100644 --- a/lib/ace/ext/static_highlight.js +++ b/lib/ace/ext/static_highlight.js @@ -52,7 +52,7 @@ var baseStyles = require("../requirejs/text!./static.css"); * @returns {object} An object containing: html, css */ -exports.render = function(input, mode, theme, lineStart) { +exports.render = function(input, mode, theme, lineStart, disableGutter) { lineStart = parseInt(lineStart || 1, 10); var session = new EditSession(""); @@ -74,7 +74,8 @@ exports.render = function(input, mode, theme, lineStart) { for(var ix = 0; ix < length; ix++) { var lineTokens = session.getTokens(ix); stringBuilder.push("
    "); - stringBuilder.push("" + (ix + lineStart) + ""); + if (!disableGutter) + stringBuilder.push("" + (ix + lineStart) + ""); textLayer.$renderLine(stringBuilder, 0, lineTokens, true); stringBuilder.push("
    "); } diff --git a/lib/ace/keyboard/textinput.js b/lib/ace/keyboard/textinput.js index d39b13e3..e4ba3e1c 100644 --- a/lib/ace/keyboard/textinput.js +++ b/lib/ace/keyboard/textinput.js @@ -246,7 +246,6 @@ var TextInput = function(parentNode, host) { }); this.focus = function() { - host.onFocus(); reset(); text.focus(); }; @@ -281,10 +280,12 @@ var TextInput = function(parentNode, host) { if (host.renderer.$keepTextAreaAtCursor) host.renderer.$keepTextAreaAtCursor = null; - event.capture(host.container, function(e) { - text.style.left = e.clientX - 2 + "px"; - text.style.top = e.clientY - 2 + "px"; - }, onContextMenuClose); + // on windows context menu is opened after mouseup + if (useragent.isGecko && useragent.isWin) + event.capture(host.container, function(e) { + text.style.left = e.clientX - 2 + "px"; + text.style.top = e.clientY - 2 + "px"; + }, onContextMenuClose); }; function onContextMenuClose() { diff --git a/lib/ace/keyboard/vim/maps/motions.js b/lib/ace/keyboard/vim/maps/motions.js index ec97b298..9ae7bfc1 100644 --- a/lib/ace/keyboard/vim/maps/motions.js +++ b/lib/ace/keyboard/vim/maps/motions.js @@ -300,27 +300,27 @@ module.exports = { case "(": case "{": case "[": - var cursor = editor.getCursorPosition() - var end = editor.session.$findClosingBracket(param, cursor, /paren/) + var cursor = editor.getCursorPosition(); + var end = editor.session.$findClosingBracket(param, cursor, /paren/); if (!end) return; - var start = editor.session.$findOpeningBracket(editor.session.$brackets[param], cursor, /paren/) + var start = editor.session.$findOpeningBracket(editor.session.$brackets[param], cursor, /paren/); if (!start) return; start.column ++; - editor.selection.setSelectionRange(Range.fromPoints(start, end)) - break + editor.selection.setSelectionRange(Range.fromPoints(start, end)); + break; case "'": - case "\"": + case '"': case "/": - var end = find(editor, param, 1) + var end = find(editor, param, 1); if (!end) return; - var start = find(editor, param, -1) + var start = find(editor, param, -1); if (!start) return; - editor.selection.setSelectionRange(Range.fromPoints(start.end, end.start)) - break + editor.selection.setSelectionRange(Range.fromPoints(start.end, end.start)); + break; } } }, diff --git a/lib/ace/lib/event.js b/lib/ace/lib/event.js index aad5ddd4..c4fff32a 100644 --- a/lib/ace/lib/event.js +++ b/lib/ace/lib/event.js @@ -93,7 +93,7 @@ exports.preventDefault = function(e) { exports.getButton = function(e) { if (e.type == "dblclick") return 0; - else if (e.type == "contextmenu") + if (e.type == "contextmenu" || (e.ctrlKey && useragent.isMac)) return 2; // DOM Event diff --git a/lib/ace/mode/c9search_highlight_rules.js b/lib/ace/mode/c9search_highlight_rules.js index c16b48c0..f5aae9b2 100644 --- a/lib/ace/mode/c9search_highlight_rules.js +++ b/lib/ace/mode/c9search_highlight_rules.js @@ -48,7 +48,7 @@ var C9SearchHighlightRules = function() { this.$rules = { "start" : [ { - token : ["constant.numeric", "text", "text"], + token : ["c9searchresults.constant.numeric", "c9searchresults.text", "c9searchresults.text"], regex : "(^\\s+[0-9]+)(:\\s*)(.+)" }, { diff --git a/lib/ace/mode/folding/c9search.js b/lib/ace/mode/folding/c9search.js index dd501153..406222b6 100644 --- a/lib/ace/mode/folding/c9search.js +++ b/lib/ace/mode/folding/c9search.js @@ -19,7 +19,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Fabian Jakobs + * Garen J. Torikian * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js index 18100423..63348303 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -191,6 +191,22 @@ var JavaScriptHighlightRules = function() { ], regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()", next: "function_arguments" + }, { // match stuff like: Sound.play = function play() { } + token : [ + "storage.type", + "punctuation.operator", + "entity.name.function", + "text", + "keyword.operator", + "text", + "storage.type", + "text", + "entity.name.function", + "text", + "paren.lparen" + ], + regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()", + next: "function_arguments" }, { // match regular function like: function myFunc(arg) { } token : [ "storage.type", diff --git a/lib/ace/mode/jsx.js b/lib/ace/mode/jsx.js new file mode 100644 index 00000000..1031e9dc --- /dev/null +++ b/lib/ace/mode/jsx.js @@ -0,0 +1,53 @@ +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var JsxHighlightRules = require("./jsx_highlight_rules").JsxHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; +var CStyleFoldMode = require("./folding/cstyle").FoldMode; + +function Mode() { + this.$tokenizer = new Tokenizer(new JsxHighlightRules().getRules()); + this.$outdent = new MatchingBraceOutdent(); + this.$behaviour = new CstyleBehaviour(); + this.foldingRules = new CStyleFoldMode(); +} +oop.inherits(Mode, TextMode); + +(function() { + + this.getNextLineIndent = function(state, line, tab) { + var indent = this.$getIndent(line); + + var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokens = tokenizedLine.tokens; + + if (tokens.length && tokens[tokens.length-1].type == "comment") { + return indent; + } + + if (state == "start") { + var match = line.match(/^.*[\{\(\[]\s*$/); + if (match) { + indent += tab; + } + } + + return indent; + }; + + this.checkOutdent = function(state, line, input) { + return this.$outdent.checkOutdent(line, input); + }; + + this.autoOutdent = function(state, doc, row) { + this.$outdent.autoOutdent(doc, row); + }; + +}).call(Mode.prototype); + +exports.Mode = Mode; +}); diff --git a/lib/ace/mode/jsx_highlight_rules.js b/lib/ace/mode/jsx_highlight_rules.js new file mode 100644 index 00000000..0700b011 --- /dev/null +++ b/lib/ace/mode/jsx_highlight_rules.js @@ -0,0 +1,122 @@ +define(function(require, exports, module) { + var oop = require("../lib/oop"); + var lang = require("../lib/lang"); + var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; + var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; + + var JsxHighlightRules = function() { + var keywords = lang.arrayToMap( + ("break|do|instanceof|typeof|case|else|new|var|catch|finally|return|void|continue|for|switch|default|while|function|this|" + + "if|throw|" + + "delete|in|try|" + + "class|extends|super|import|from|into|implements|interface|static|mixin|override|abstract|final|" + + "number|int|string|boolean|variant|" + + "log|assert").split("|") + ); + + var buildinConstants = lang.arrayToMap( + ("null|true|false|NaN|Infinity|__FILE__|__LINE__|undefined").split("|") + ); + + var reserved = lang.arrayToMap( + ("debugger|with|" + + "const|export|" + + "let|private|public|yield|protected|" + + "extern|native|as|operator|__fake__|__readonly__").split("|") + ); + + var identifierRe = "[a-zA-Z_][a-zA-Z0-9_]*\\b"; + + this.$rules = { + "start" : [ + { + token : "comment", + regex : "\\/\\/.*$" + }, + DocCommentHighlightRules.getStartRule("doc-start"), + { + token : "comment", // multi line comment + regex : "\\/\\*", + merge : true, + next : "comment" + }, { + token : "string.regexp", + regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)" + }, { + token : "string", // single line + regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' + }, { + token : "string", // single line + regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']" + }, { + token : "constant.numeric", // hex + regex : "0[xX][0-9a-fA-F]+\\b" + }, { + token : "constant.numeric", // float + regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b" + }, { + token : "constant.language.boolean", + regex : "(?:true|false)\\b" + }, { + token : [ + "storage.type", + "text", + "entity.name.function" + ], + regex : "(function)(\\s+)(" + identifierRe + ")" + }, { + token : function(value) { + if (value == "this") + return "variable.language"; + else if (value == "function") + return "storage.type"; + else if (keywords.hasOwnProperty(value) || reserved.hasOwnProperty(value)) + return "keyword"; + else if (buildinConstants.hasOwnProperty(value)) + return "constant.language"; + else if (/^_?[A-Z][a-zA-Z0-9_]*$/.test(value)) + return "language.support.class"; + else + return "identifier"; + }, + // TODO: Unicode escape sequences + // TODO: Unicode identifiers + regex : identifierRe + }, { + token : "keyword.operator", + regex : "!|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)" + }, { + token : "punctuation.operator", + regex : "\\?|\\:|\\,|\\;|\\." + }, { + token : "paren.lparen", + regex : "[[({<]" + }, { + token : "paren.rparen", + regex : "[\\])}>]" + }, { + token : "text", + regex : "\\s+" + } + ], + "comment" : [ + { + token : "comment", // closing comment + regex : ".*?\\*\\/", + next : "start" + }, { + token : "comment", // comment spanning whole line + merge : true, + regex : ".+" + } + ] + }; + + this.embedRules(DocCommentHighlightRules, "doc-", + [ DocCommentHighlightRules.getEndRule("start") ]); + }; + + oop.inherits(JsxHighlightRules, TextHighlightRules); + + exports.JsxHighlightRules = JsxHighlightRules; +}); \ No newline at end of file diff --git a/lib/ace/mode/luapage.js b/lib/ace/mode/luapage.js new file mode 100644 index 00000000..03ee19d1 --- /dev/null +++ b/lib/ace/mode/luapage.js @@ -0,0 +1,22 @@ +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var HtmlMode = require("./html").Mode; +var LuaMode = require("./lua").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var LuaPageHighlightRules = require("./luapage_highlight_rules").LuaPageHighlightRules; + +var Mode = function() { + var highlighter = new LuaPageHighlightRules(); + + this.$tokenizer = new Tokenizer(new LuaPageHighlightRules().getRules()); + this.$embeds = highlighter.getEmbeds(); + this.createModeDelegates({ + "lua-": LuaMode + }); +}; +oop.inherits(Mode, HtmlMode); + +exports.Mode = Mode; +}); \ No newline at end of file diff --git a/lib/ace/mode/luapage_highlight_rules.js b/lib/ace/mode/luapage_highlight_rules.js new file mode 100644 index 00000000..d79581c3 --- /dev/null +++ b/lib/ace/mode/luapage_highlight_rules.js @@ -0,0 +1,42 @@ +// LuaPage implements the LuaPage markup as described by the Kepler Project's CGILua +// documentation: http://keplerproject.github.com/cgilua/manual.html#templates +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules; +var LuaHighlightRules = require("./lua_highlight_rules").LuaHighlightRules; + +var LuaPageHighlightRules = function() { + this.$rules = new HtmlHighlightRules().getRules(); + + for (var i in this.$rules) { + this.$rules[i].unshift({ + token: "keyword", + regex: "<\\%\\=?", + next: "lua-start" + }, { + token: "keyword", + regex: "<\\?lua\\=?", + next: "lua-start" + }); + } + this.embedRules(LuaHighlightRules, "lua-", [ + { + token: "keyword", + regex: "\\%>", + next: "start" + }, + { + token: "keyword", + regex: "\\?>", + next: "start" + } + ]); +}; + +oop.inherits(LuaPageHighlightRules, HtmlHighlightRules); + +exports.LuaPageHighlightRules = LuaPageHighlightRules; + +}); \ No newline at end of file diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js index 09fcdff0..8961ff65 100644 --- a/lib/ace/mode/markdown_highlight_rules.js +++ b/lib/ace/mode/markdown_highlight_rules.js @@ -80,7 +80,7 @@ var MarkdownHighlightRules = function() { return "markup.heading." + value.length; }, regex : "^#{1,6}" - }, github_embed("javascript", "js-"), + }, github_embed("(?:javascript|js)", "js-"), github_embed("xml", "xml-"), github_embed("html", "html-"), github_embed("css", "css-"), diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js index e5568881..1b916801 100644 --- a/lib/ace/mouse/default_handlers.js +++ b/lib/ace/mouse/default_handlers.js @@ -90,7 +90,7 @@ function DefaultHandlers(mouseHandler) { // 2: contextmenu, 1: linux paste editor.textInput.onContextMenu(ev.domEvent); - return ev.stop(); + return; // stopping event here breaks contextmenu on ff mac } // if this click caused the editor to be focused should not clear the @@ -109,13 +109,8 @@ function DefaultHandlers(mouseHandler) { // a selection. this.startSelect(pos); } else if (inSelection) { - var e = ev.domEvent; - if ((e.ctrlKey || e.altKey)) { - this.startDrag(); - } else { - this.mousedownEvent.time = (new Date()).getTime(); - this.setState("dragWait"); - } + this.mousedownEvent.time = (new Date()).getTime(); + this.setState("dragWait"); } this.captureMouse(ev); @@ -146,8 +141,9 @@ function DefaultHandlers(mouseHandler) { } else if (cmp == 1) { anchor = this.$clickSelection.start; } else { - cursor = this.$clickSelection.end; - anchor = this.$clickSelection.start; + var orientedRange = calcRangeOrientation(this.$clickSelection, cursor); + cursor = orientedRange.cursor; + anchor = orientedRange.anchor; } editor.selection.setSelectionAnchor(anchor.row, anchor.column); } @@ -175,8 +171,9 @@ function DefaultHandlers(mouseHandler) { cursor = range.end; anchor = range.start; } else { - cursor = this.$clickSelection.end; - anchor = this.$clickSelection.start; + var orientedRange = calcRangeOrientation(this.$clickSelection, cursor); + cursor = orientedRange.cursor; + anchor = orientedRange.anchor; } editor.selection.setSelectionAnchor(anchor.row, anchor.column); } @@ -221,7 +218,7 @@ function DefaultHandlers(mouseHandler) { this.startSelect(); }; - this.dragWait = function() { + this.dragWait = function(e) { var distance = calcDistance(this.mousedownEvent.x, this.mousedownEvent.y, this.x, this.y); var time = (new Date()).getTime(); var editor = this.editor; @@ -229,7 +226,7 @@ function DefaultHandlers(mouseHandler) { if (distance > DRAG_OFFSET) { this.startSelect(); } else if (time - this.mousedownEvent.time > editor.getDragDelay()) { - this.startDrag() + this.startDrag(); } }; @@ -277,12 +274,21 @@ function DefaultHandlers(mouseHandler) { this.onDoubleClick = function(ev) { var pos = ev.getDocumentPosition(); var editor = this.editor; + var session = editor.session + var range = session.getBracketRange(pos); + if (range) { + if (range.isEmpty()) { + range.start.column--; + range.end.column++; + } + this.$clickSelection = range; + this.setState("select"); + return; + } + + this.$clickSelection = editor.selection.getWordRange(pos.row, pos.column); this.setState("selectByWords"); - - editor.moveCursorToPosition(pos); - editor.selection.selectWord(); - this.$clickSelection = editor.getSelectionRange(); }; this.onTripleClick = function(ev) { @@ -334,4 +340,16 @@ function calcDistance(ax, ay, bx, by) { return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2)); } +function calcRangeOrientation(range, cursor) { + if (range.start.row == range.end.row) + var cmp = 2 * cursor.column - range.start.column - range.end.column; + else + var cmp = 2 * cursor.row - range.start.row - range.end.row; + + if (cmp < 0) + return {cursor: range.start, anchor: range.end}; + else + return {cursor: range.end, anchor: range.start}; +} + }); diff --git a/lib/ace/mouse/mouse_event.js b/lib/ace/mouse/mouse_event.js index 2c813cde..59ed98fe 100644 --- a/lib/ace/mouse/mouse_event.js +++ b/lib/ace/mouse/mouse_event.js @@ -40,6 +40,7 @@ define(function(require, exports, module) { "use strict"; var event = require("../lib/event"); +var useragent = require("../lib/useragent"); /* * Custom Ace mouse event @@ -130,9 +131,9 @@ var MouseEvent = exports.MouseEvent = function(domEvent, editor) { return this.domEvent.shiftKey; }; - this.getAccelKey = function() { - return this.domEvent.ctrlKey || this.domEvent.metaKey ; - }; + this.getAccelKey = useragent.isMac + ? function() { return this.domEvent.metaKey; } + : function() { return this.domEvent.ctrlKey; }; }).call(MouseEvent.prototype); diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js index e1e7a2a1..f108a7dc 100644 --- a/lib/ace/mouse/mouse_handler.js +++ b/lib/ace/mouse/mouse_handler.js @@ -130,12 +130,12 @@ var MouseHandler = function(editor) { renderer.$keepTextAreaAtCursor = null; var self = this; - var onMouseSelection = function(e) { + var onMouseMove = function(e) { self.x = e.clientX; self.y = e.clientY; }; - var onMouseSelectionEnd = function(e) { + var onCaptureEnd = function(e) { clearInterval(timerId); self[self.state + "End"] && self[self.state + "End"](e); self.$clickSelection = null; @@ -145,12 +145,12 @@ var MouseHandler = function(editor) { } }; - var onSelectionInterval = function() { + var onCaptureInterval = function() { self[self.state] && self[self.state](); } - event.capture(this.editor.container, onMouseSelection, onMouseSelectionEnd); - var timerId = setInterval(onSelectionInterval, 20); + event.capture(this.editor.container, onMouseMove, onCaptureEnd); + var timerId = setInterval(onCaptureInterval, 20); }; }).call(MouseHandler.prototype); diff --git a/lib/ace/mouse/multi_select_handler.js b/lib/ace/mouse/multi_select_handler.js index 880bc13c..f14e8e99 100644 --- a/lib/ace/mouse/multi_select_handler.js +++ b/lib/ace/mouse/multi_select_handler.js @@ -53,18 +53,14 @@ function onMouseDown(e) { var ctrl = e.getAccelKey(); var button = e.getButton(); + if (e.editor.inMultiSelectMode && button == 2) { + e.editor.textInput.onContextMenu(e.domEvent); + return; + } + if (!ctrl && !alt) { - if (e.editor.inMultiSelectMode) { - if (button == 0) { - e.editor.exitMultiSelectMode(); - } else if (button == 2) { - var editor = e.editor; - var selectionEmpty = editor.selection.isEmpty(); - editor.textInput.onContextMenu({x: e.clientX, y: e.clientY}, selectionEmpty); - event.capture(editor.container, function(){}, editor.textInput.onContextMenuClose); - e.stop(); - } - } + if (button == 0 && e.editor.inMultiSelectMode) + e.editor.exitMultiSelectMode(); return; } diff --git a/lib/ace/range.js b/lib/ace/range.js index e09b850d..fd27dcbc 100644 --- a/lib/ace/range.js +++ b/lib/ace/range.js @@ -90,7 +90,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) { * [start.row/start.column] -> [end.row/end.column] * **/ - this.toString = function() { return ("Range: [" + this.start.row + "/" + this.start.column + "] -> [" + this.end.row + "/" + this.end.column + "]"); @@ -424,7 +423,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) { } } - /** + /** * Range.compareInside(row, column) -> Number * - row (Number): A row point to compare with * - column (Number): A column point to compare with @@ -449,7 +448,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) { } } - /** + /** * Range.clipRows(firstRow, lastRow) -> Range * - firstRow (Number): The starting row * - lastRow (Number): The ending row @@ -488,7 +487,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) { return Range.fromPoints(start || this.start, end || this.end); }; - /** + /** * Range.extend(row, column) -> Range * - row (Number): A new row to extend to * - column (Number): A new column to extend to @@ -513,7 +512,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) { return (this.start.row == this.end.row && this.start.column == this.end.column); }; - /** + /** * Range.isMultiLine() -> Boolean * * Returns true if the range spans across multiple lines. @@ -523,7 +522,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) { return (this.start.row !== this.end.row); }; - /** + /** * Range.clone() -> Range * * Returns a duplicate of the calling range. @@ -533,7 +532,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) { return Range.fromPoints(this.start, this.end); }; - /** + /** * Range.collapseRows() -> Range * * Returns a range containing the starting and ending rows of the original range, but with a column value of `0`. @@ -546,7 +545,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) { return new Range(this.start.row, 0, this.end.row, 0) }; - /** + /** * Range.toScreenRange(session) -> Range * - session (EditSession): The `EditSession` to retrieve coordinates from * diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css index 5997f57c..3283e127 100644 --- a/lib/ace/theme/chrome.css +++ b/lib/ace/theme/chrome.css @@ -18,7 +18,6 @@ } .ace-chrome .ace_text-layer { - cursor: text; } .ace-chrome .ace_cursor { @@ -151,7 +150,10 @@ color:#FD971F; color: rgb(255, 0, 0) } -.ace-chrome .ace_line .ace_string, +.ace-chrome .ace_line .ace_string{ + color: #1A1AA6; +} + .ace-chrome .ace_entity.ace_other.ace_attribute-name{ color: #994409; } \ No newline at end of file diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css index e490c386..fe19f765 100644 --- a/lib/ace/theme/clouds.css +++ b/lib/ace/theme/clouds.css @@ -22,7 +22,6 @@ } .ace-clouds .ace_text-layer { - cursor: text; color: #000000; } diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css index 69ed51db..8f78b84e 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -22,7 +22,6 @@ } .ace-clouds-midnight .ace_text-layer { - cursor: text; color: #929292; } diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css index 5c9a7328..4d4bc633 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -22,7 +22,6 @@ } .ace-cobalt .ace_text-layer { - cursor: text; color: #FFFFFF; } diff --git a/lib/ace/theme/crimson_editor.css b/lib/ace/theme/crimson_editor.css index e38910aa..b10bf3b6 100644 --- a/lib/ace/theme/crimson_editor.css +++ b/lib/ace/theme/crimson_editor.css @@ -23,7 +23,6 @@ } .ace-crimson-editor .ace_text-layer { - cursor: text; color: rgb(64, 64, 64); } diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css index 85d48623..54763212 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -22,7 +22,6 @@ } .ace-dawn .ace_text-layer { - cursor: text; color: #080808; } diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css index b44699af..46ac475c 100644 --- a/lib/ace/theme/dreamweaver.css +++ b/lib/ace/theme/dreamweaver.css @@ -21,7 +21,6 @@ } .ace-dreamweaver .ace_text-layer { - cursor: text; } .ace-dreamweaver .ace_cursor { diff --git a/lib/ace/theme/eclipse.css b/lib/ace/theme/eclipse.css index c39a8470..a45ea999 100644 --- a/lib/ace/theme/eclipse.css +++ b/lib/ace/theme/eclipse.css @@ -22,7 +22,6 @@ } .ace-eclipse .ace_text-layer { - cursor: text; } .ace-eclipse .ace_cursor { diff --git a/lib/ace/theme/github.css b/lib/ace/theme/github.css new file mode 100644 index 00000000..31db975c --- /dev/null +++ b/lib/ace/theme/github.css @@ -0,0 +1,81 @@ +/* CSS style content from github's default pygments highlighter template. + Cursor and selection styles from textmate.css. */ +.ace-github .ace_editor { + color: #333; + background-color: #F8F8F8; + border: 1px solid #CCC; + font: 13px 'Bitstream Vera Sans Mono', Courier, monospace !important; + line-height: 19px !important; + overflow: auto; + padding: 6px 10px; + border-radius: 3px; + position: relative; + margin-bottom: 15px; +} + +.ace-github .ace_keyword { + font-weight: bold; +} + +.ace-github .ace_string { + color: #D14; +} + +.ace-github .ace_variable.ace_class { + color: teal; +} + +.ace-github .ace_constant.ace_numeric { + color: #099; +} + +.ace-github .ace_comment { + color: #998; + font-style: italic; +} + +.ace-github .ace_variable.ace_language { + color: #0086B3; +} + +.ace-github .ace_paren.ace_lparen, +.ace-github .ace_paren.ace_rparen { + font-weight: bold; +} + +.ace-github .ace_constant.ace_language.ace_boolean { + font-weight: bold; +} + +.ace-github .ace_string.ace_regexp { + color: #009926; + font-weight: normal; +} + +.ace-github .ace_variable.ace_instancce { + color: teal; +} + +.ace-github .ace_constant.ace_language { + font-weight: bold; +} + +.ace-github .ace_text-layer { +} + +.ace-github .ace_cursor { + border-left: 2px solid black; +} + +.ace-github .ace_cursor.ace_overwrite { + border-left: 0px; + border-bottom: 1px solid black; +} + +.ace-github .ace_marker-layer .ace_selection { + background: rgb(181, 213, 255); +} +.ace-github.multiselect .ace_selection.start { + box-shadow: 0 0 3px 0px white; + border-radius: 2px; +} \ No newline at end of file diff --git a/lib/ace/theme/github.js b/lib/ace/theme/github.js new file mode 100644 index 00000000..b81731f3 --- /dev/null +++ b/lib/ace/theme/github.js @@ -0,0 +1,46 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Ajax.org Code Editor (ACE). + * + * The Initial Developer of the Original Code is + * Ajax.org B.V. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Fabian Jakobs + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { + +exports.isDark = true; +exports.cssClass = "ace-github"; +exports.cssText = require('ace/requirejs/text!./github.css'); + + var dom = require("../lib/dom"); + dom.importCssString(exports.cssText, exports.cssClass); +}); diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css index 4ad6ff23..f3fdb2a8 100644 --- a/lib/ace/theme/idle_fingers.css +++ b/lib/ace/theme/idle_fingers.css @@ -22,7 +22,6 @@ } .ace-idle-fingers .ace_text-layer { - cursor: text; color: #FFFFFF; } diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css index aa6c2e37..8c8a4da9 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -22,7 +22,6 @@ } .ace-kr-theme .ace_text-layer { - cursor: text; color: #FCFFE0; } diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css index fe957fba..e8b62802 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -22,7 +22,6 @@ } .ace-merbivore .ace_text-layer { - cursor: text; color: #E6E1DC; } diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index 4b7e91f2..4021c275 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -22,7 +22,6 @@ } .ace-merbivore-soft .ace_text-layer { - cursor: text; color: #E6E1DC; } diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 1e2d06ba..dbe006e0 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -22,7 +22,6 @@ } .ace-mono-industrial .ace_text-layer { - cursor: text; color: #FFFFFF; } diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index 5597ab01..54d051e2 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -22,7 +22,6 @@ } .ace-monokai .ace_text-layer { - cursor: text; color: #F8F8F2; } diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css index fc5155a4..735da017 100644 --- a/lib/ace/theme/pastel_on_dark.css +++ b/lib/ace/theme/pastel_on_dark.css @@ -22,7 +22,6 @@ } .ace-pastel-on-dark .ace_text-layer { - cursor: text; color: #8F938F; } diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index 31eed2bd..437bab60 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -22,7 +22,6 @@ } .ace-solarized-dark .ace_text-layer { - cursor: text; color: #93A1A1; } diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css index cc1c8699..1c00cb36 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -22,7 +22,6 @@ } .ace-solarized-light .ace_text-layer { - cursor: text; color: #586E75; } diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css index 87f66f1c..243c08da 100644 --- a/lib/ace/theme/textmate.css +++ b/lib/ace/theme/textmate.css @@ -21,7 +21,6 @@ } .ace-tm .ace_text-layer { - cursor: text; } .ace-tm .ace_cursor { diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index 95c9c0d4..5aef8dc4 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -22,7 +22,6 @@ } .ace-tomorrow .ace_text-layer { - cursor: text; color: #4D4D4C; } diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index 2e74d864..a920d173 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -22,7 +22,6 @@ } .ace-tomorrow-night .ace_text-layer { - cursor: text; color: #C5C8C6; } diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index 10c58165..068e5bea 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -22,7 +22,6 @@ } .ace-tomorrow-night-blue .ace_text-layer { - cursor: text; color: #FFFFFF; } diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index 21a928be..25f62064 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -22,7 +22,6 @@ } .ace-tomorrow-night-bright .ace_text-layer { - cursor: text; color: #DEDEDE; } diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index 93f2d3b6..e798393f 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -22,7 +22,6 @@ } .ace-tomorrow-night-eighties .ace_text-layer { - cursor: text; color: #CCCCCC; } diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css index 6d81e4a5..02f51284 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -22,7 +22,6 @@ } .ace-twilight .ace_text-layer { - cursor: text; color: #F8F8F8; } diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css index 81c54d71..41ca13f6 100644 --- a/lib/ace/theme/vibrant_ink.css +++ b/lib/ace/theme/vibrant_ink.css @@ -22,7 +22,6 @@ } .ace-vibrant-ink .ace_text-layer { - cursor: text; color: #FFFFFF; } diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index 88719079..c41d976a 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -263,8 +263,13 @@ var VirtualRenderer = function(container, theme) { * * Triggers a full update of all the layers, for all the rows. **/ - this.updateFull = function() { - this.$loop.schedule(this.CHANGE_FULL); + this.updateFull = function(force) { + if (force){ + this.$renderChanges(this.CHANGE_FULL, true); + } + else { + this.$loop.schedule(this.CHANGE_FULL); + } }; /** @@ -282,11 +287,19 @@ var VirtualRenderer = function(container, theme) { * * [Triggers a resize of the editor.]{: #VirtualRenderer.onResize} **/ - this.onResize = function(force) { + this.onResize = function(force, gutterWidth, width, height) { var changes = this.CHANGE_SIZE; var size = this.$size; - var height = dom.getInnerHeight(this.container); + if (this.resizing > 2) + return; + else if (this.resizing > 1) + this.resizing++; + else + this.resizing = force ? 1 : 0; + + if (!height) + height = dom.getInnerHeight(this.container); if (force || size.height != height) { size.height = height; @@ -300,20 +313,27 @@ var VirtualRenderer = function(container, theme) { } } - var width = dom.getInnerWidth(this.container); - if (force || size.width != width) { + if (!width) + width = dom.getInnerWidth(this.container); + if (force || this.resizing > 1 || size.width != width) { size.width = width; var gutterWidth = this.showGutter ? this.$gutter.offsetWidth : 0; this.scroller.style.left = gutterWidth + "px"; size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBar.getWidth()); - this.scroller.style.width = size.scrollerWidth + "px"; + //this.scroller.style.width = size.scrollerWidth + "px"; if (this.session.getUseWrapMode() && this.adjustWrapLimit() || force) changes = changes | this.CHANGE_FULL; } - this.$loop.schedule(changes); + if (force) + this.$renderChanges(changes, true); + else + this.$loop.schedule(changes); + + if (force) + delete this.resizing; }; /** @@ -467,14 +487,14 @@ var VirtualRenderer = function(container, theme) { return; if (!gutterReady) { - var ch = this.$gutterLayer.element.children - var oldEl = ch[this.$gutterLineHighlight - this.layerConfig.firstRow]; - if (oldEl) - dom.removeCssClass(oldEl, "ace_gutter_active_line"); + var lineEl, ch = this.$gutterLayer.element.children; + var index = this.$gutterLineHighlight - this.layerConfig.firstRow; + if (index >= 0 && (lineEl = ch[index])) + dom.removeCssClass(lineEl, "ace_gutter_active_line"); - var newEl = ch[i - this.layerConfig.firstRow]; - if (newEl) - dom.addCssClass(newEl, "ace_gutter_active_line"); + index = i - this.layerConfig.firstRow; + if (index >= 0 && (lineEl = ch[index])) + dom.addCssClass(lineEl, "ace_gutter_active_line"); } this.$gutterLayer.removeGutterDecoration(this.$gutterLineHighlight, "ace_gutter_active_line"); @@ -642,8 +662,8 @@ var VirtualRenderer = function(container, theme) { this.scrollBar.setScrollTop(this.scrollTop); }; - this.$renderChanges = function(changes) { - if (!changes || !this.session || !this.container.offsetWidth) + this.$renderChanges = function(changes, force) { + if (!force && (!changes || !this.session || !this.container.offsetWidth)) return; // text, scrolling and resize changes can cause the view port size to change diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js index a992db8f..609e981c 100644 --- a/lib/ace/worker/worker_client.js +++ b/lib/ace/worker/worker_client.js @@ -56,14 +56,17 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) { workerUrl = require.nameToUrl("ace/worker/worker_sourcemint"); } else { // We are running in RequireJS. - workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_")); + // nameToUrl is renamed to toUrl in requirejs 2 + if (require.nameToUrl && !require.toUrl) + require.toUrl = require.nameToUrl; + workerUrl = this.$normalizePath(require.toUrl("ace/worker/worker", null, "_")); } this.$worker = new Worker(workerUrl); var tlns = {}; for (var i=0; i