From 62b948721877c6ee6443067252721fa8ec8eabc8 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 17 Jan 2013 16:31:33 -0700 Subject: [PATCH 01/94] Grunt migration: package.json --- package.json | 59 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 38299aeaa0f..de9adedaaa9 100644 --- a/package.json +++ b/package.json @@ -1,26 +1,35 @@ { - "name": "jquery-mobile-build", - "description": "dependencies for the grunt based build", - "version": "0.0.1", - "scripts": { - "lint" : "grunt" - }, - "main": "grunt.js", - "repository": { - "type": "git", - "url": "https://github.com/jquery/jquery-mobile.git" - }, - "dependencies": { - "grunt": "0.3.x", - "grunt-css": "0.2.0", - "grunt-junit": "0.1.4", - "grunt-git-authors": "1.0.0", - "requirejs": "1.0.8", - "glob-whatev": "~0.1.4", - "rimraf": "2.0.1", - "testswarm": "0.2.3" - }, - "engine": { - "node": ">=6.0" - } -} \ No newline at end of file + "name": "jquery-mobile", + "title": "jQuery Mobile", + "description": "Touch-Optimized Web Framework for Smartphones & Tablets", + "version": "1.4.0pre", + "homepage": "http://jquerymobile.com", + "author": { + "name": "jQuery Foundation Inc. and other contributors", + "url": "https://github.com/jquery/jquery-mobile/blob/master/AUTHORS.txt" + }, + "repository": { + "type": "git", + "url": "https://github.com/jquery/jquery-mobile.git" + }, + "bugs": "https://github.com/jquery/jquery-mobile/issues", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/jquery/jquery-mobile/blob/master/MIT-LICENSE.txt" + } + ], + "scripts": { + "test": "./node_modules/.bin/grunt" + }, + "dependencies": {}, + "devDependencies": { + "grunt": "0.4.x", + "grunt-contrib-jshint": "0.1.x", + "grunt-contrib-uglify": "0.1.x", + "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", + "grunt-contrib-requirejs": "0.3.4", + "grunt-git-authors": "1.1.0-beta.1", + }, + "keywords": [] +} From 7d9abad9df9b31093c898e28f7791813b544f9d5 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 17 Jan 2013 17:01:42 -0700 Subject: [PATCH 02/94] Grunt migration: Removed trailing comma --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de9adedaaa9..70dee5eaa2f 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "grunt-contrib-uglify": "0.1.x", "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", "grunt-contrib-requirejs": "0.3.4", - "grunt-git-authors": "1.1.0-beta.1", + "grunt-git-authors": "1.1.0-beta.1" }, "keywords": [] } From 870d4e2b603dfccc6afcb26119e824ba23f048b9 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 17 Jan 2013 17:02:43 -0700 Subject: [PATCH 03/94] Moved RequireJS plugins to requirejs/plugins --- {js => external/requirejs/plugins}/depend.js | 2 +- {js => external/requirejs/plugins}/text.js | 0 js/requirejs.config.js | 9 +++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) rename {js => external/requirejs/plugins}/depend.js (99%) rename {js => external/requirejs/plugins}/text.js (100%) create mode 100644 js/requirejs.config.js diff --git a/js/depend.js b/external/requirejs/plugins/depend.js similarity index 99% rename from js/depend.js rename to external/requirejs/plugins/depend.js index 8de7760c621..49d8a029879 100644 --- a/js/depend.js +++ b/external/requirejs/plugins/depend.js @@ -24,4 +24,4 @@ define(function () { }; -}); \ No newline at end of file +}); diff --git a/js/text.js b/external/requirejs/plugins/text.js similarity index 100% rename from js/text.js rename to external/requirejs/plugins/text.js diff --git a/js/requirejs.config.js b/js/requirejs.config.js new file mode 100644 index 00000000000..3e2915e388a --- /dev/null +++ b/js/requirejs.config.js @@ -0,0 +1,9 @@ +requirejs.config({ + "paths": { + // requireJS plugins + "text": "../external/requirejs/plugins/text", + "depend": "../external/requirejs/plugins/depend", + "json": "../external/requirejs/plugins/json" + } + +}); From fb292939129a51846547458e495cbec1a725147a Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 17 Jan 2013 17:03:06 -0700 Subject: [PATCH 04/94] Added RequireJS json plugin --- external/requirejs/plugins/json.js | 59 ++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 external/requirejs/plugins/json.js diff --git a/external/requirejs/plugins/json.js b/external/requirejs/plugins/json.js new file mode 100644 index 00000000000..85e5ae616c4 --- /dev/null +++ b/external/requirejs/plugins/json.js @@ -0,0 +1,59 @@ +/** @license + * RequireJS plugin for loading JSON files + * - depends on Text plugin and it was HEAVILY "inspired" by it as well. + * Author: Miller Medeiros + * Version: 0.3.0 (2012/10/29) + * Released under the MIT license + */ +define(['text'], function(text){ + + var CACHE_BUST_QUERY_PARAM = 'bust', + CACHE_BUST_FLAG = '!bust', + jsonParse = (typeof JSON !== 'undefined' && typeof JSON.parse === 'function')? JSON.parse : function(val){ + return eval('('+ val +')'); //quick and dirty + }, + buildMap = {}; + + function cacheBust(url){ + url = url.replace(CACHE_BUST_FLAG, ''); + url += (url.indexOf('?') < 0)? '?' : '&'; + return url + CACHE_BUST_QUERY_PARAM +'='+ Math.round(2147483647 * Math.random()); + } + + //API + return { + + load : function(name, req, onLoad, config) { + if ( config.isBuild && (config.inlineJSON === false || name.indexOf(CACHE_BUST_QUERY_PARAM +'=') !== -1) ) { + //avoid inlining cache busted JSON or if inlineJSON:false + onLoad(null); + } else { + text.get(req.toUrl(name), function(data){ + if (config.isBuild) { + buildMap[name] = data; + onLoad(data); + } else { + onLoad(jsonParse(data)); + } + }, + onLoad.error + ); + } + }, + + normalize : function (name, normalize) { + //used normalize to avoid caching references to a "cache busted" request + return (name.indexOf(CACHE_BUST_FLAG) === -1)? name : cacheBust(name); + }, + + //write method based on RequireJS official text plugin by James Burke + //https://github.com/jrburke/requirejs/blob/master/text.js + write : function(pluginName, moduleName, write){ + if(moduleName in buildMap){ + var content = buildMap[moduleName]; + write('define("'+ pluginName +'!'+ moduleName +'", function(){ return '+ content +';});\n'); + } + } + + }; +}); \ No newline at end of file From 32fbf4f442790f516659ae82462bacfa6ee3293a Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 17 Jan 2013 17:04:06 -0700 Subject: [PATCH 05/94] Grunt migration: Removed r.js --- external/r.js/dist/r.js | 12557 -------------------------------------- 1 file changed, 12557 deletions(-) delete mode 100644 external/r.js/dist/r.js diff --git a/external/r.js/dist/r.js b/external/r.js/dist/r.js deleted file mode 100644 index a46ed120400..00000000000 --- a/external/r.js/dist/r.js +++ /dev/null @@ -1,12557 +0,0 @@ -/** - * @license r.js 1.0.8 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 - */ - -/* - * This is a bootstrap script to allow running RequireJS in the command line - * in either a Java/Rhino or Node environment. It is modified by the top-level - * dist.js file to inject other files to completely enable this file. It is - * the shell of the r.js file. - */ - -/*jslint evil: true, nomen: true */ -/*global readFile: true, process: false, Packages: false, print: false, -console: false, java: false, module: false, requirejsVars */ - -var requirejs, require, define; -(function (console, args, readFileFunc) { - - var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire, - nodeDefine, exists, reqMain, loadedOptimizedLib, - version = '1.0.8', - jsSuffixRegExp = /\.js$/, - commandOption = '', - useLibLoaded = {}, - //Used by jslib/rhino/args.js - rhinoArgs = args, - readFile = typeof readFileFunc !== 'undefined' ? readFileFunc : null; - - function showHelp() { - console.log('See https://github.com/jrburke/r.js for usage.'); - } - - if (typeof Packages !== 'undefined') { - env = 'rhino'; - - fileName = args[0]; - - if (fileName && fileName.indexOf('-') === 0) { - commandOption = fileName.substring(1); - fileName = args[1]; - } - - //Set up execution context. - rhinoContext = Packages.org.mozilla.javascript.ContextFactory.getGlobal().enterContext(); - - exec = function (string, name) { - return rhinoContext.evaluateString(this, string, name, 0, null); - }; - - exists = function (fileName) { - return (new java.io.File(fileName)).exists(); - }; - - //Define a console.log for easier logging. Don't - //get fancy though. - if (typeof console === 'undefined') { - console = { - log: function () { - print.apply(undefined, arguments); - } - }; - } - } else if (typeof process !== 'undefined') { - env = 'node'; - - //Get the fs module via Node's require before it - //gets replaced. Used in require/node.js - fs = require('fs'); - vm = require('vm'); - path = require('path'); - nodeRequire = require; - nodeDefine = define; - reqMain = require.main; - - //Temporarily hide require and define to allow require.js to define - //them. - require = undefined; - define = undefined; - - readFile = function (path) { - return fs.readFileSync(path, 'utf8'); - }; - - exec = function (string, name) { - return vm.runInThisContext(this.requirejsVars.require.makeNodeWrapper(string), - name ? fs.realpathSync(name) : ''); - }; - - exists = function (fileName) { - return path.existsSync(fileName); - }; - - - fileName = process.argv[2]; - - if (fileName && fileName.indexOf('-') === 0) { - commandOption = fileName.substring(1); - fileName = process.argv[3]; - } - } - - /** vim: et:ts=4:sw=4:sts=4 - * @license RequireJS 1.0.8 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 */ -/*global window, navigator, document, importScripts, jQuery, setTimeout, opera */ - - -(function (undefined) { - //Change this version number for each release. - var version = "1.0.8", - commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, - cjsRequireRegExp = /require\(\s*["']([^'"\s]+)["']\s*\)/g, - currDirRegExp = /^\.\//, - jsSuffixRegExp = /\.js$/, - ostring = Object.prototype.toString, - ap = Array.prototype, - aps = ap.slice, - apsp = ap.splice, - 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 - //to feature test w/o causing perf issues. - readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ? - /^complete$/ : /^(complete|loaded)$/, - defContextName = "_", - //Oh the tragedy, detecting opera. See the usage of isOpera for reason. - isOpera = typeof opera !== "undefined" && opera.toString() === "[object Opera]", - empty = {}, - contexts = {}, - 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; - - function isFunction(it) { - return ostring.call(it) === "[object Function]"; - } - - function isArray(it) { - return ostring.call(it) === "[object Array]"; - } - - /** - * Simple function to mix in properties from source into target, - * but only if target does not already have a property of the same name. - * This is not robust in IE for transferring methods that match - * Object.prototype names, but the uses of mixin here seem unlikely to - * 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]; - } - } - return req; - } - - /** - * Constructs an error with a pointer to an URL with more information. - * @param {String} id the error ID that maps to an ID on a web page. - * @param {String} message human readable error. - * @param {Error} [err] the original error, if there is one. - * - * @returns {Error} - */ - function makeError(id, msg, err) { - var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id); - 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 a define is already in play via another AMD loader, - //do not overwrite. - return; - } - - if (typeof requirejs !== "undefined") { - if (isFunction(requirejs)) { - //Do not overwrite and existing requirejs instance. - return; - } else { - cfg = requirejs; - requirejs = undefined; - } - } - - //Allow for a require config object - 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 = { - waitSeconds: 7, - baseUrl: "./", - paths: {}, - pkgs: {}, - catchError: {} - }, - defQueue = [], - specified = { - "require": true, - "exports": true, - "module": true - }, - urlMap = {}, - defined = {}, - loaded = {}, - waiting = {}, - waitAry = [], - urlFetched = {}, - managerCounter = 0, - managerCallbacks = {}, - plugins = {}, - //Used to indicate which modules in a build scenario - //need to be full executed. - needFullExec = {}, - fullExec = {}, - resumeDepth = 0; - - /** - * Trims the . and .. from an array of path segments. - * It will keep a leading path segment if a .. will become - * the first path segment, to help with module name lookups, - * which act like paths, but can be remapped. But the end result, - * all paths that use this function should look normalized. - * NOTE: this method MODIFIES the input array. - * @param {Array} ary the array of path segments. - */ - function trimDots(ary) { - var i, part; - for (i = 0; (part = ary[i]); i++) { - if (part === ".") { - ary.splice(i, 1); - i -= 1; - } 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 - //correctly to disk. Otherwise, there is likely - //no path mapping for a path starting with '..'. - //This can still fail, but catches the most reasonable - //uses of .. - break; - } else if (i > 0) { - ary.splice(i - 1, 2); - i -= 2; - } - } - } - } - - /** - * Given a relative module name, like ./something, normalize it to - * a real name that can be mapped to a path. - * @param {String} name the relative name - * @param {String} baseName a real name that the name arg is relative - * to. - * @returns {String} normalized name - */ - function normalize(name, baseName) { - var pkgName, pkgConfig; - - //Adjust any relative paths. - 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. - if (baseName) { - 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]; - } 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 - //this normalization. - baseName = baseName.split("/"); - baseName = baseName.slice(0, baseName.length - 1); - } - - name = baseName.concat(name.split("/")); - trimDots(name); - - //Some use of packages may use a . path to reference the - //"main" module name, so normalize for that. - pkgConfig = config.pkgs[(pkgName = name[0])]; - name = name.join("/"); - if (pkgConfig && name === pkgName + '/' + pkgConfig.main) { - name = pkgName; - } - } 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); - } - } - return name; - } - - /** - * Creates a module mapping that includes plugin prefix, module - * name, and path. If parentModuleMap is provided it will - * also normalize the name via require.normalize() - * - * @param {String} name the module name - * @param {String} [parentModuleMap] parent module map - * for the module name, used to resolve relative names. - * - * @returns {Object} - */ - function makeModuleMap(name, parentModuleMap) { - var index = name ? name.indexOf("!") : -1, - prefix = null, - parentName = parentModuleMap ? parentModuleMap.name : null, - originalName = name, - normalizedName, url, pluginModule; - - if (index !== -1) { - prefix = name.substring(0, index); - name = name.substring(index + 1, name.length); - } - - if (prefix) { - prefix = normalize(prefix, parentName); - } - - //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); - }); - } else { - normalizedName = normalize(name, parentName); - } - } else { - //A regular module. - normalizedName = normalize(name, parentName); - - url = urlMap[normalizedName]; - if (!url) { - //Calculate url for the module, if it has a name. - //Use name here since nameToUrl also calls normalize, - //and for relative names that are outside the baseUrl - //this causes havoc. Was thinking of just removing - //parentModuleMap to avoid extra normalization, but - //normalize() still does a dot removal because of - //issue #142, so just pass in name here and redo - //the normalization. Paths outside baseUrl are just - //messy to support. - url = context.nameToUrl(name, null, parentModuleMap); - - //Store the URL mapping for later. - urlMap[normalizedName] = url; - } - } - } - - return { - prefix: prefix, - name: normalizedName, - parentMap: parentModuleMap, - url: url, - originalName: originalName, - fullName: prefix ? prefix + "!" + (normalizedName || '') : normalizedName - }; - } - - /** - * Determine if priority loading is done. If so clear the priorityWait - */ - 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; - } - } - 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); - }; - } - - /** - * Helper function that creates a require function object to give to - * modules that ask for it as a dependency. It needs to be specific - * 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); - - 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]); - } - - 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); - }); - }); - } 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; - - if (manager.isDone || !fullName || !loaded[fullName]) { - return result; - } - - //Found the cycle. - if (traced[fullName]) { - return manager; - } - - traced[fullName] = 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]; - } - } - - return result; - } - - function forceExec(manager, traced) { - var fullName = manager.map.fullName, - depArray = manager.depArray, - i, depName, depManager, prefix, prefixManager, value; - - - if (manager.isDone || !fullName || !loaded[fullName]) { - return undefined; - } - - if (fullName) { - if (traced[fullName]) { - return defined[fullName]; - } - - traced[fullName] = 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 (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); - } - } - } - } - - return defined[fullName]; - } - - /** - * 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; - - //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; - } - - //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; - } - } - - //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 { - 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); - } - } - } - } - } - } - - //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 wait time expired, throw error of unloaded modules. - err = makeError("timeout", "Load timeout for modules: " + noLoads); - err.requireType = "timeout"; - err.requireModules = noLoads; - err.contextName = context.contextName; - return req.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; - } - } - - } - - //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)) { - //Something is still waiting to load. Wait for it, but only - //if a timeout is not already in effect. - if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) { - checkLoadedTimeoutId = setTimeout(function () { - checkLoadedTimeoutId = 0; - 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; - } - - /** - * Resumes tracing of dependencies and then checks if everything is loaded. - */ - resume = function () { - var manager, map, url, i, p, args, fullName; - - //Any defined modules in the global queue, intake them now. - context.takeGlobalQueue(); - - resumeDepth += 1; - - 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); - } - } - - //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 = []; - - for (i = 0; (manager = p[i]); i++) { - map = manager.map; - url = map.url; - fullName = map.fullName; - - //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); - - //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; - } - } - } - } - - //Move the start time for timeout forward. - context.startTime = (new Date()).getTime(); - context.pausedCount -= p.length; - } - } - - //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, - config: config, - defQueue: defQueue, - waiting: waiting, - waitCount: 0, - specified: specified, - loaded: loaded, - urlMap: urlMap, - urlFetched: urlFetched, - scriptCount: 0, - defined: defined, - paused: [], - pausedCount: 0, - plugins: plugins, - needFullExec: needFullExec, - fake: {}, - fullExec: fullExec, - managerCallbacks: managerCallbacks, - 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 += "/"; - } - } - - //Save off the paths and packages since they require special processing, - //they are additive. - paths = config.paths; - packages = config.packages; - pkgs = config.pkgs; - - //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; - } - - 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); - } - } - } - - //Adjust packages if necessary. - if (cfg.packages) { - configurePackageDir(pkgs, cfg.packages); - } - - //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. - if (cfg.deps || cfg.callback) { - context.require(cfg.deps || [], cfg.callback); - } - }, - - requireDefined: function (moduleName, relModuleMap) { - return makeModuleMap(moduleName, relModuleMap).fullName in defined; - }, - - requireSpecified: function (moduleName, relModuleMap) { - return makeModuleMap(moduleName, relModuleMap).fullName in specified; - }, - - require: function (deps, callback, relModuleMap) { - var moduleName, fullName, moduleMap; - if (typeof deps === "string") { - if (isFunction(callback)) { - //Invalid call - return req.onError(makeError("requireargs", "Invalid require call")); - } - - //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 - 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. - moduleName = deps; - relModuleMap = callback; - - //Normalize module name, if it contains . or .. - moduleMap = makeModuleMap(moduleName, relModuleMap); - fullName = moduleMap.fullName; - - if (!(fullName in defined)) { - return req.onError(makeError("notloaded", "Module name '" + - moduleMap.fullName + - "' has not been loaded yet for context: " + - contextName)); - } - return defined[fullName]; - } - - //Call main but only if there are dependencies or - //a callback to call. - if (deps && deps.length || callback) { - main(null, deps, callback, relModuleMap); - } - - //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(); - } - } - return context.require; - }, - - /** - * Internal method to transfer globalQueue items to this context's - * defQueue. - */ - 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 = []; - } - }, - - /** - * Internal method used by environment adapters to complete a load event. - * A load event could be a script load or just a load pass from a synchronous - * load call. - * @param {String} moduleName the name of the module to potentially complete. - */ - completeLoad: function (moduleName) { - var args; - - context.takeGlobalQueue(); - - while (defQueue.length) { - args = defQueue.shift(); - - if (args[0] === null) { - args[0] = moduleName; - break; - } 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; - } - } - 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]); - } - - //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; - } - }, - - /** - * Converts a module name + .extension into an URL path. - * *Requires* the use of a module name. It does not support using - * plain URLs like nameToUrl. - */ - toUrl: function (moduleNamePlusExt, relModuleMap) { - var index = moduleNamePlusExt.lastIndexOf("."), - ext = null; - - if (index !== -1) { - ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length); - moduleNamePlusExt = moduleNamePlusExt.substring(0, index); - } - - return context.nameToUrl(moduleNamePlusExt, ext, relModuleMap); - }, - - /** - * Converts a module name to a file path. Supports cases where - * moduleName may actually be just an URL. - */ - nameToUrl: function (moduleName, ext, relModuleMap) { - var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url, - config = context.config; - - //Normalize module name if have a base relative module name to work from. - moduleName = normalize(moduleName, relModuleMap && relModuleMap.fullName); - - //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. ?) - //or ends with .js, then assume the user meant to use an url and not a module id. - //The slash is important for protocol-less URLs as well as full paths. - if (req.jsExtRegExp.test(moduleName)) { - //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 : ""); - } else { - //A module that needs to be converted to a path. - paths = config.paths; - pkgs = config.pkgs; - - 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]); - break; - } else if ((pkg = pkgs[parentModule])) { - //If module name is just the package name, then looking - //for the main module. - if (moduleName === pkg.name) { - pkgPath = pkg.location + '/' + pkg.main; - } else { - pkgPath = pkg.location; - } - syms.splice(0, i, pkgPath); - break; - } - } - - //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; - } - - return config.urlArgs ? url + - ((url.indexOf('?') === -1 ? '?' : '&') + - config.urlArgs) : url; - } - }; - - //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; - } - - /** - * Main entry point. - * - * If the only argument to require is a string, then the module that - * is represented by that string is fetched for the appropriate context. - * - * If the first argument is an array, then it will be treated as an array - * of dependency string names to fetch. An optional function callback can - * be specified to execute when all of those dependencies are available. - * - * Make a local req variable to help Caja compliance (it assumes things - * on a require that are not standardized), and to give a short - * name for minification/local scope use. - */ - req = requirejs = function (deps, callback) { - - //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") { - // deps is a config object - config = deps; - if (isArray(callback)) { - // Adjust args if there are dependencies - deps = callback; - callback = arguments[2]; - } else { - deps = []; - } - } - - if (config && config.context) { - contextName = config.context; - } - - context = contexts[contextName] || - (contexts[contextName] = newContext(contextName)); - - if (config) { - context.configure(config); - } - - return context.require(deps, callback); - }; - - /** - * Support require.config() to make it easier to cooperate with other - * AMD loaders on globally agreed names. - */ - req.config = function (config) { - return req(config); - }; - - /** - * Export require as a global, but only if it does not already exist. - */ - if (!require) { - 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$/; - s = req.s = { - contexts: contexts, - //Stores a list of URLs that should not get async script tag treatment. - skipAsync: {} - }; - - req.isAsync = req.isBrowser = isBrowser; - if (isBrowser) { - 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]; - if (baseElement) { - head = s.head = baseElement.parentNode; - } - } - - /** - * Any errors that require explicitly generates will be passed to this - * function. Intercept/override it if you want custom error handling. - * @param {Error} err the error object. - */ - req.onError = function (err) { - throw err; - }; - - /** - * Does the request to load a module for the browser case. - * Make this a separate function to allow other environments - * to override it. - * - * @param {Object} context the require context to find state. - * @param {String} moduleName the name of the module. - * @param {Object} url the URL to the module. - */ - req.load = function (context, moduleName, url) { - req.resourcesReady(false); - - context.scriptCount += 1; - req.attach(url, context, 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; - } - }; - - 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--) { - if (script.readyState === 'interactive') { - return (interactiveScript = script); - } - } - - return null; - } - - /** - * The function that handles definitions of modules. Differs from - * require() in that a string for the module should be the first argument, - * and the function to execute after dependencies are loaded should - * return a value to define the module corresponding to the first argument's - * name. - */ - define = function (name, deps, callback) { - var node, context; - - //Allow for anonymous functions - if (typeof name !== 'string') { - //Adjust args appropriately - callback = deps; - deps = name; - name = null; - } - - //This module may not have dependencies - if (!isArray(deps)) { - callback = deps; - deps = []; - } - - //If no name, and callback is a function, then figure out if it a - //CommonJS thing with dependencies. - if (!deps.length && isFunction(callback)) { - //Remove comments from the callback string, - //look for require calls, and pull them into the dependencies, - //but only if there are function args. - if (callback.length) { - callback - .toString() - .replace(commentRegExp, "") - .replace(cjsRequireRegExp, function (match, dep) { - deps.push(dep); - }); - - //May be a CommonJS thing even without require calls, but still - //could use exports, and module. Avoid doing exports and module - //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); - } - } - - //If in IE 6-8 and hit an anonymous define() call, do the interactive - //work. - if (useInteractive) { - node = currentlyAddingScript || getInteractiveScript(); - if (node) { - if (!name) { - name = node.getAttribute("data-requiremodule"); - } - context = contexts[node.getAttribute("data-requirecontext")]; - } - } - - //Always save off evaluating the def call until the script onload handler. - //This allows multiple modules to be in a file without prematurely - //tracing dependencies, and allows for anonymous module support, - //where the module name is not known until the script onload event - //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. - * @param {String} text the text to execute/evaluate. - */ - req.exec = function (text) { - 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. - 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); - } -}()); - - - if (env === 'rhino') { - /** - * @license RequireJS rhino Copyright (c) 2010-2011, 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 */ -/*global require: false, java: false, load: false */ - -(function () { - - require.load = function (context, moduleName, url) { - //Indicate a the module is in process of loading. - context.scriptCount += 1; - - load(url); - - //Support anonymous modules. - context.completeLoad(moduleName); - }; - -}()); - } else if (env === 'node') { - this.requirejsVars = { - require: require, - requirejs: require, - define: define, - nodeRequire: nodeRequire - }; - require.nodeRequire = nodeRequire; - - /** - * @license RequireJS node Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint regexp: false, strict: false */ -/*global require: false, define: false, requirejsVars: false, process: false */ - -/** - * This adapter assumes that x.js has loaded it and set up - * some variables. This adapter just allows limited RequireJS - * usage from within the requirejs directory. The general - * node adapater is r.js. - */ - -(function () { - var nodeReq = requirejsVars.nodeRequire, - req = requirejsVars.require, - def = requirejsVars.define, - fs = nodeReq('fs'), - path = nodeReq('path'), - vm = nodeReq('vm'); - - //Supply an implementation that allows synchronous get of a module. - req.get = function (context, moduleName, relModuleMap) { - if (moduleName === "require" || moduleName === "exports" || moduleName === "module") { - req.onError(new Error("Explicit require of " + moduleName + " is not allowed.")); - } - - var ret, - moduleMap = context.makeModuleMap(moduleName, relModuleMap); - - //Normalize module name, if it contains . or .. - moduleName = moduleMap.fullName; - - if (moduleName in context.defined) { - ret = context.defined[moduleName]; - } else { - if (ret === undefined) { - //Try to dynamically fetch it. - req.load(context, moduleName, moduleMap.url); - //The above call is sync, so can do the next thing safely. - ret = context.defined[moduleName]; - } - } - - return ret; - }; - - //Add wrapper around the code so that it gets the requirejs - //API instead of the Node API, and it is done lexically so - //that it survives later execution. - req.makeNodeWrapper = function (contents) { - return '(function (require, requirejs, define) { ' + - contents + - '\n}(requirejsVars.require, requirejsVars.requirejs, requirejsVars.define));'; - }; - - requirejsVars.nodeLoad = req.load = function (context, moduleName, url) { - var contents, err; - - //Indicate a the module is in process of loading. - context.scriptCount += 1; - - if (path.existsSync(url)) { - contents = fs.readFileSync(url, 'utf8'); - - contents = req.makeNodeWrapper(contents); - try { - vm.runInThisContext(contents, fs.realpathSync(url)); - } catch (e) { - err = new Error('Evaluating ' + url + ' as module "' + - moduleName + '" failed with error: ' + e); - err.originalError = e; - err.moduleName = moduleName; - err.fileName = url; - return req.onError(err); - } - } else { - def(moduleName, function () { - try { - return (context.config.nodeRequire || req.nodeRequire)(moduleName); - } catch (e) { - err = new Error('Calling node\'s require("' + - moduleName + '") failed with error: ' + e); - err.originalError = e; - err.moduleName = moduleName; - return req.onError(err); - } - }); - } - - //Support anonymous modules. - context.completeLoad(moduleName); - - return undefined; - }; - - //Override to provide the function wrapper for define/require. - req.exec = function (text) { - /*jslint evil: true */ - text = req.makeNodeWrapper(text); - return eval(text); - }; - - //Hold on to the original execCb to use in useLib calls. - requirejsVars.nodeRequireExecCb = require.execCb; -}()); - - } - - //Support a default file name to execute. Useful for hosted envs - //like Joyent where it defaults to a server.js as the only executed - //script. But only do it if this is not an optimization run. - if (commandOption !== 'o' && (!fileName || !jsSuffixRegExp.test(fileName))) { - fileName = 'main.js'; - } - - /** - * Loads the library files that can be used for the optimizer, or for other - * tasks. - */ - function loadLib() { - /** - * @license Copyright (c) 2010-2011, 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 */ -/*global Packages: false, process: false, window: false, navigator: false, - document: false, define: false */ - -/** - * A plugin that modifies any /env/ path to be the right path based on - * the host environment. Right now only works for Node, Rhino and browser. - */ -(function () { - var pathRegExp = /(\/|^)env\/|\{env\}/, - env = 'unknown'; - - if (typeof Packages !== 'undefined') { - env = 'rhino'; - } else if (typeof process !== 'undefined') { - env = 'node'; - } else if (typeof window !== "undefined" && navigator && document) { - env = 'browser'; - } - - define('env', { - load: function (name, req, load, config) { - //Allow override in the config. - if (config.env) { - env = config.env; - } - - name = name.replace(pathRegExp, function (match, prefix) { - if (match.indexOf('{') === -1) { - return prefix + env + '/'; - } else { - return env; - } - }); - - req([name], function (mod) { - load(mod); - }); - } - }); -}()); -if(env === 'node') { -/** - * @license RequireJS Copyright (c) 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 */ -/*global define: false, load: false */ - -//Needed so that rhino/assert can return a stub for uglify's consolidator.js -define('node/assert', ['assert'], function (assert) { - return assert; -}); - -} - -if(env === 'rhino') { -/** - * @license RequireJS Copyright (c) 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 */ -/*global define: false, load: false */ - -//Just a stub for use with uglify's consolidator.js -define('rhino/assert', function () { - return {}; -}); - -} - -if(env === 'node') { -/** - * @license Copyright (c) 2010-2011, 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 */ -/*global define: false, process: false */ - -define('node/args', function () { - //Do not return the "node" or "r.js" arguments - var args = process.argv.slice(2); - - //Ignore any command option used for rq.js - if (args[0] && args[0].indexOf('-' === 0)) { - args = args.slice(1); - } - - return args; -}); - -} - -if(env === 'rhino') { -/** - * @license Copyright (c) 2010-2011, 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 */ -/*global define: false, process: false */ - -var jsLibRhinoArgs = (typeof rhinoArgs !== 'undefined' && rhinoArgs) || [].concat(Array.prototype.slice.call(arguments, 0)); - -define('rhino/args', function () { - var args = jsLibRhinoArgs; - - //Ignore any command option used for rq.js - if (args[0] && args[0].indexOf('-' === 0)) { - args = args.slice(1); - } - - return args; -}); - -} - -if(env === 'node') { -/** - * @license RequireJS Copyright (c) 2010-2011, 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 */ -/*global define: false, console: false */ - -define('node/load', ['fs'], function (fs) { - function load(fileName) { - var contents = fs.readFileSync(fileName, 'utf8'); - process.compile(contents, fileName); - } - - return load; -}); - -} - -if(env === 'rhino') { -/** - * @license RequireJS Copyright (c) 2010-2011, 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 */ -/*global define: false, load: false */ - -define('rhino/load', function () { - return load; -}); - -} - -if(env === 'node') { -/** - * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint plusplus: false, octal:false, strict: false */ -/*global define: false, process: false */ - -define('node/file', ['fs', 'path'], function (fs, path) { - - var isWindows = process.platform === 'win32', - windowsDriveRegExp = /^[a-zA-Z]\:\/$/, - file; - - function frontSlash(path) { - return path.replace(/\\/g, '/'); - } - - function exists(path) { - if (isWindows && path.charAt(path.length - 1) === '/' && - path.charAt(path.length - 2) !== ':') { - path = path.substring(0, path.length - 1); - } - - try { - fs.statSync(path); - return true; - } catch (e) { - return false; - } - } - - function mkDir(dir) { - if (!exists(dir) && (!isWindows || !windowsDriveRegExp.test(dir))) { - fs.mkdirSync(dir, 511); - } - } - - function mkFullDir(dir) { - var parts = dir.split('/'), - currDir = '', - first = true; - - parts.forEach(function (part) { - //First part may be empty string if path starts with a slash. - currDir += part + '/'; - first = false; - - if (part) { - mkDir(currDir); - } - }); - } - - file = { - backSlashRegExp: /\\/g, - exclusionRegExp: /^\./, - getLineSeparator: function () { - return '/'; - }, - - exists: function (fileName) { - return exists(fileName); - }, - - parent: function (fileName) { - var parts = fileName.split('/'); - parts.pop(); - return parts.join('/'); - }, - - /** - * Gets the absolute file path as a string, normalized - * to using front slashes for path separators. - * @param {String} fileName - */ - absPath: function (fileName) { - return frontSlash(path.normalize(frontSlash(fs.realpathSync(fileName)))); - }, - - normalize: function (fileName) { - return frontSlash(path.normalize(fileName)); - }, - - isFile: function (path) { - return fs.statSync(path).isFile(); - }, - - isDirectory: function (path) { - return fs.statSync(path).isDirectory(); - }, - - getFilteredFileList: function (/*String*/startDir, /*RegExp*/regExpFilters, /*boolean?*/makeUnixPaths) { - //summary: Recurses startDir and finds matches to the files that match regExpFilters.include - //and do not match regExpFilters.exclude. Or just one regexp can be passed in for regExpFilters, - //and it will be treated as the "include" case. - //Ignores files/directories that start with a period (.) unless exclusionRegExp - //is set to another value. - var files = [], topDir, regExpInclude, regExpExclude, dirFileArray, - i, stat, filePath, ok, dirFiles, fileName; - - topDir = startDir; - - regExpInclude = regExpFilters.include || regExpFilters; - regExpExclude = regExpFilters.exclude || null; - - if (file.exists(topDir)) { - dirFileArray = fs.readdirSync(topDir); - for (i = 0; i < dirFileArray.length; i++) { - fileName = dirFileArray[i]; - filePath = path.join(topDir, fileName); - stat = fs.statSync(filePath); - if (stat.isFile()) { - if (makeUnixPaths) { - //Make sure we have a JS string. - if (filePath.indexOf("/") === -1) { - filePath = frontSlash(filePath); - } - } - - ok = true; - if (regExpInclude) { - ok = filePath.match(regExpInclude); - } - if (ok && regExpExclude) { - ok = !filePath.match(regExpExclude); - } - - if (ok && (!file.exclusionRegExp || - !file.exclusionRegExp.test(fileName))) { - files.push(filePath); - } - } else if (stat.isDirectory() && - (!file.exclusionRegExp || !file.exclusionRegExp.test(fileName))) { - dirFiles = this.getFilteredFileList(filePath, regExpFilters, makeUnixPaths); - files.push.apply(files, dirFiles); - } - } - } - - return files; //Array - }, - - copyDir: function (/*String*/srcDir, /*String*/destDir, /*RegExp?*/regExpFilter, /*boolean?*/onlyCopyNew) { - //summary: copies files from srcDir to destDir using the regExpFilter to determine if the - //file should be copied. Returns a list file name strings of the destinations that were copied. - regExpFilter = regExpFilter || /\w/; - - //Normalize th directory names, but keep front slashes. - //path module on windows now returns backslashed paths. - srcDir = frontSlash(path.normalize(srcDir)); - destDir = frontSlash(path.normalize(destDir)); - - var fileNames = file.getFilteredFileList(srcDir, regExpFilter, true), - copiedFiles = [], i, srcFileName, destFileName; - - for (i = 0; i < fileNames.length; i++) { - srcFileName = fileNames[i]; - destFileName = srcFileName.replace(srcDir, destDir); - - if (file.copyFile(srcFileName, destFileName, onlyCopyNew)) { - copiedFiles.push(destFileName); - } - } - - return copiedFiles.length ? copiedFiles : null; //Array or null - }, - - copyFile: function (/*String*/srcFileName, /*String*/destFileName, /*boolean?*/onlyCopyNew) { - //summary: copies srcFileName to destFileName. If onlyCopyNew is set, it only copies the file if - //srcFileName is newer than destFileName. Returns a boolean indicating if the copy occurred. - var parentDir; - - //logger.trace("Src filename: " + srcFileName); - //logger.trace("Dest filename: " + destFileName); - - //If onlyCopyNew is true, then compare dates and only copy if the src is newer - //than dest. - if (onlyCopyNew) { - if (file.exists(destFileName) && fs.statSync(destFileName).mtime.getTime() >= fs.statSync(srcFileName).mtime.getTime()) { - return false; //Boolean - } - } - - //Make sure destination dir exists. - parentDir = path.dirname(destFileName); - if (!file.exists(parentDir)) { - mkFullDir(parentDir); - } - - fs.writeFileSync(destFileName, fs.readFileSync(srcFileName, 'binary'), 'binary'); - - return true; //Boolean - }, - - /** - * Renames a file. May fail if "to" already exists or is on another drive. - */ - renameFile: function (from, to) { - return fs.renameSync(from, to); - }, - - /** - * Reads a *text* file. - */ - readFile: function (/*String*/path, /*String?*/encoding) { - if (encoding === 'utf-8') { - encoding = 'utf8'; - } - if (!encoding) { - encoding = 'utf8'; - } - - var text = fs.readFileSync(path, encoding); - - //Hmm, would not expect to get A BOM, but it seems to happen, - //remove it just in case. - if (text.indexOf('\uFEFF') === 0) { - text = text.substring(1, text.length); - } - - return text; - }, - - saveUtf8File: function (/*String*/fileName, /*String*/fileContents) { - //summary: saves a *text* file using UTF-8 encoding. - file.saveFile(fileName, fileContents, "utf8"); - }, - - saveFile: function (/*String*/fileName, /*String*/fileContents, /*String?*/encoding) { - //summary: saves a *text* file. - var parentDir; - - if (encoding === 'utf-8') { - encoding = 'utf8'; - } - if (!encoding) { - encoding = 'utf8'; - } - - //Make sure destination directories exist. - parentDir = path.dirname(fileName); - if (!file.exists(parentDir)) { - mkFullDir(parentDir); - } - - fs.writeFileSync(fileName, fileContents, encoding); - }, - - deleteFile: function (/*String*/fileName) { - //summary: deletes a file or directory if it exists. - var files, i, stat; - if (file.exists(fileName)) { - stat = fs.statSync(fileName); - if (stat.isDirectory()) { - files = fs.readdirSync(fileName); - for (i = 0; i < files.length; i++) { - this.deleteFile(path.join(fileName, files[i])); - } - fs.rmdirSync(fileName); - } else { - fs.unlinkSync(fileName); - } - } - } - }; - - return file; - -}); - -} - -if(env === 'rhino') { -/** - * @license RequireJS Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ -//Helper functions to deal with file I/O. - -/*jslint plusplus: false, strict: false */ -/*global java: false, define: false */ - -define('rhino/file', function () { - var file = { - backSlashRegExp: /\\/g, - - exclusionRegExp: /^\./, - - getLineSeparator: function () { - return file.lineSeparator; - }, - - lineSeparator: java.lang.System.getProperty("line.separator"), //Java String - - exists: function (fileName) { - return (new java.io.File(fileName)).exists(); - }, - - parent: function (fileName) { - return file.absPath((new java.io.File(fileName)).getParentFile()); - }, - - normalize: function (fileName) { - return file.absPath(fileName); - }, - - isFile: function (path) { - return (new java.io.File(path)).isFile(); - }, - - isDirectory: function (path) { - return (new java.io.File(path)).isDirectory(); - }, - - /** - * Gets the absolute file path as a string, normalized - * to using front slashes for path separators. - * @param {java.io.File||String} file - */ - absPath: function (fileObj) { - if (typeof fileObj === "string") { - fileObj = new java.io.File(fileObj); - } - return (fileObj.getAbsolutePath() + "").replace(file.backSlashRegExp, "/"); - }, - - getFilteredFileList: function (/*String*/startDir, /*RegExp*/regExpFilters, /*boolean?*/makeUnixPaths, /*boolean?*/startDirIsJavaObject) { - //summary: Recurses startDir and finds matches to the files that match regExpFilters.include - //and do not match regExpFilters.exclude. Or just one regexp can be passed in for regExpFilters, - //and it will be treated as the "include" case. - //Ignores files/directories that start with a period (.) unless exclusionRegExp - //is set to another value. - var files = [], topDir, regExpInclude, regExpExclude, dirFileArray, - i, fileObj, filePath, ok, dirFiles; - - topDir = startDir; - if (!startDirIsJavaObject) { - topDir = new java.io.File(startDir); - } - - regExpInclude = regExpFilters.include || regExpFilters; - regExpExclude = regExpFilters.exclude || null; - - if (topDir.exists()) { - dirFileArray = topDir.listFiles(); - for (i = 0; i < dirFileArray.length; i++) { - fileObj = dirFileArray[i]; - if (fileObj.isFile()) { - filePath = fileObj.getPath(); - if (makeUnixPaths) { - //Make sure we have a JS string. - filePath = String(filePath); - if (filePath.indexOf("/") === -1) { - filePath = filePath.replace(/\\/g, "/"); - } - } - - ok = true; - if (regExpInclude) { - ok = filePath.match(regExpInclude); - } - if (ok && regExpExclude) { - ok = !filePath.match(regExpExclude); - } - - if (ok && (!file.exclusionRegExp || - !file.exclusionRegExp.test(fileObj.getName()))) { - files.push(filePath); - } - } else if (fileObj.isDirectory() && - (!file.exclusionRegExp || !file.exclusionRegExp.test(fileObj.getName()))) { - dirFiles = this.getFilteredFileList(fileObj, regExpFilters, makeUnixPaths, true); - files.push.apply(files, dirFiles); - } - } - } - - return files; //Array - }, - - copyDir: function (/*String*/srcDir, /*String*/destDir, /*RegExp?*/regExpFilter, /*boolean?*/onlyCopyNew) { - //summary: copies files from srcDir to destDir using the regExpFilter to determine if the - //file should be copied. Returns a list file name strings of the destinations that were copied. - regExpFilter = regExpFilter || /\w/; - - var fileNames = file.getFilteredFileList(srcDir, regExpFilter, true), - copiedFiles = [], i, srcFileName, destFileName; - - for (i = 0; i < fileNames.length; i++) { - srcFileName = fileNames[i]; - destFileName = srcFileName.replace(srcDir, destDir); - - if (file.copyFile(srcFileName, destFileName, onlyCopyNew)) { - copiedFiles.push(destFileName); - } - } - - return copiedFiles.length ? copiedFiles : null; //Array or null - }, - - copyFile: function (/*String*/srcFileName, /*String*/destFileName, /*boolean?*/onlyCopyNew) { - //summary: copies srcFileName to destFileName. If onlyCopyNew is set, it only copies the file if - //srcFileName is newer than destFileName. Returns a boolean indicating if the copy occurred. - var destFile = new java.io.File(destFileName), srcFile, parentDir, - srcChannel, destChannel; - - //logger.trace("Src filename: " + srcFileName); - //logger.trace("Dest filename: " + destFileName); - - //If onlyCopyNew is true, then compare dates and only copy if the src is newer - //than dest. - if (onlyCopyNew) { - srcFile = new java.io.File(srcFileName); - if (destFile.exists() && destFile.lastModified() >= srcFile.lastModified()) { - return false; //Boolean - } - } - - //Make sure destination dir exists. - parentDir = destFile.getParentFile(); - if (!parentDir.exists()) { - if (!parentDir.mkdirs()) { - throw "Could not create directory: " + parentDir.getAbsolutePath(); - } - } - - //Java's version of copy file. - srcChannel = new java.io.FileInputStream(srcFileName).getChannel(); - destChannel = new java.io.FileOutputStream(destFileName).getChannel(); - destChannel.transferFrom(srcChannel, 0, srcChannel.size()); - srcChannel.close(); - destChannel.close(); - - return true; //Boolean - }, - - /** - * Renames a file. May fail if "to" already exists or is on another drive. - */ - renameFile: function (from, to) { - return (new java.io.File(from)).renameTo((new java.io.File(to))); - }, - - readFile: function (/*String*/path, /*String?*/encoding) { - //A file read function that can deal with BOMs - encoding = encoding || "utf-8"; - var fileObj = new java.io.File(path), - input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(fileObj), encoding)), - stringBuffer, line; - try { - stringBuffer = new java.lang.StringBuffer(); - line = input.readLine(); - - // Byte Order Mark (BOM) - The Unicode Standard, version 3.0, page 324 - // http://www.unicode.org/faq/utf_bom.html - - // Note that when we use utf-8, the BOM should appear as "EF BB BF", but it doesn't due to this bug in the JDK: - // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4508058 - if (line && line.length() && line.charAt(0) === 0xfeff) { - // Eat the BOM, since we've already found the encoding on this file, - // and we plan to concatenating this buffer with others; the BOM should - // only appear at the top of a file. - line = line.substring(1); - } - while (line !== null) { - stringBuffer.append(line); - stringBuffer.append(file.lineSeparator); - line = input.readLine(); - } - //Make sure we return a JavaScript string and not a Java string. - return String(stringBuffer.toString()); //String - } finally { - input.close(); - } - }, - - saveUtf8File: function (/*String*/fileName, /*String*/fileContents) { - //summary: saves a file using UTF-8 encoding. - file.saveFile(fileName, fileContents, "utf-8"); - }, - - saveFile: function (/*String*/fileName, /*String*/fileContents, /*String?*/encoding) { - //summary: saves a file. - var outFile = new java.io.File(fileName), outWriter, parentDir, os; - - parentDir = outFile.getAbsoluteFile().getParentFile(); - if (!parentDir.exists()) { - if (!parentDir.mkdirs()) { - throw "Could not create directory: " + parentDir.getAbsolutePath(); - } - } - - if (encoding) { - outWriter = new java.io.OutputStreamWriter(new java.io.FileOutputStream(outFile), encoding); - } else { - outWriter = new java.io.OutputStreamWriter(new java.io.FileOutputStream(outFile)); - } - - os = new java.io.BufferedWriter(outWriter); - try { - os.write(fileContents); - } finally { - os.close(); - } - }, - - deleteFile: function (/*String*/fileName) { - //summary: deletes a file or directory if it exists. - var fileObj = new java.io.File(fileName), files, i; - if (fileObj.exists()) { - if (fileObj.isDirectory()) { - files = fileObj.listFiles(); - for (i = 0; i < files.length; i++) { - this.deleteFile(files[i]); - } - } - fileObj["delete"](); - } - } - }; - - return file; -}); - -} -/** - * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint plusplus: true */ -/*global define */ - -define('lang', function () { - 'use strict'; - - var lang = { - backSlashRegExp: /\\/g, - ostring: Object.prototype.toString, - - isArray: Array.isArray || function (it) { - return lang.ostring.call(it) === "[object Array]"; - }, - - isFunction: function(it) { - return lang.ostring.call(it) === "[object Function]"; - }, - - isRegExp: function(it) { - return it && it instanceof RegExp; - }, - - _mixin: function(dest, source, override){ - var name; - for (name in source) { - if(source.hasOwnProperty(name) - && (override || !dest.hasOwnProperty(name))) { - dest[name] = source[name]; - } - } - - return dest; // Object - }, - - /** - * mixin({}, obj1, obj2) is allowed. If the last argument is a boolean, - * then the source objects properties are force copied over to dest. - */ - mixin: function(dest){ - var parameters = Array.prototype.slice.call(arguments), - override, i, l; - - if (!dest) { dest = {}; } - - if (parameters.length > 2 && typeof arguments[parameters.length-1] === 'boolean') { - override = parameters.pop(); - } - - for (i = 1, l = parameters.length; i < l; i++) { - lang._mixin(dest, parameters[i], override); - } - return dest; // Object - }, - - delegate: (function () { - // boodman/crockford delegation w/ cornford optimization - function TMP() {} - return function (obj, props) { - TMP.prototype = obj; - var tmp = new TMP(); - TMP.prototype = null; - if (props) { - lang.mixin(tmp, props); - } - return tmp; // Object - }; - }()) - }; - return lang; -}); - -if(env === 'node') { -/** - * @license RequireJS Copyright (c) 2010-2011, 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 */ -/*global define: false, console: false */ - -define('node/print', function () { - function print(msg) { - console.log(msg); - } - - return print; -}); - -} - -if(env === 'rhino') { -/** - * @license RequireJS Copyright (c) 2010-2011, 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 */ -/*global define: false, print: false */ - -define('rhino/print', function () { - return print; -}); - -} -/** - * @license RequireJS Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint nomen: false, strict: false */ -/*global define: false */ - -define('logger', ['env!env/print'], function (print) { - var logger = { - TRACE: 0, - INFO: 1, - WARN: 2, - ERROR: 3, - SILENT: 4, - level: 0, - logPrefix: "", - - logLevel: function( level ) { - this.level = level; - }, - - trace: function (message) { - if (this.level <= this.TRACE) { - this._print(message); - } - }, - - info: function (message) { - if (this.level <= this.INFO) { - this._print(message); - } - }, - - warn: function (message) { - if (this.level <= this.WARN) { - this._print(message); - } - }, - - error: function (message) { - if (this.level <= this.ERROR) { - this._print(message); - } - }, - - _print: function (message) { - this._sysPrint((this.logPrefix ? (this.logPrefix + " ") : "") + message); - }, - - _sysPrint: function (message) { - print(message); - } - }; - - return logger; -}); -//Just a blank file to use when building the optimizer with the optimizer, -//so that the build does not attempt to inline some env modules, -//like Node's fs and path. - -//Just a blank file to use when building the optimizer with the optimizer, -//so that the build does not attempt to inline some env modules, -//like Node's fs and path. - -define('uglifyjs/consolidator', ["require", "exports", "module", "env!env/assert", "./parse-js", "./process"], function(require, exports, module, assert) { - -/** - * @preserve Copyright 2012 Robert Gust-Bardon . - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF - * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/** - * @fileoverview Enhances UglifyJS with consolidation of null, Boolean, and String values. - *

Also known as aliasing, this feature has been deprecated in the Closure Compiler since its - * initial release, where it is unavailable from the CLI. The Closure Compiler allows one to log and - * influence this process. In contrast, this implementation does not introduce - * any variable declarations in global code and derives String values from - * identifier names used as property accessors.

- *

Consolidating literals may worsen the data compression ratio when an encoding - * transformation is applied. For instance, jQuery 1.7.1 takes 248235 bytes. - * Building it with - * UglifyJS v1.2.5 results in 93647 bytes (37.73% of the original) which are - * then compressed to 33154 bytes (13.36% of the original) using gzip(1). Building it with the same - * version of UglifyJS 1.2.5 patched with the implementation of consolidation - * results in 80784 bytes (a decrease of 12863 bytes, i.e. 13.74%, in comparison - * to the aforementioned 93647 bytes) which are then compressed to 34013 bytes - * (an increase of 859 bytes, i.e. 2.59%, in comparison to the aforementioned - * 33154 bytes).

- *

Written in the strict variant - * of ECMA-262 5.1 Edition. Encoded in UTF-8. Follows Revision 2.28 of the Google JavaScript Style Guide (except for the - * discouraged use of the {@code function} tag and the {@code namespace} tag). - * 100% typed for the Closure Compiler Version 1741.

- *

Should you find this software useful, please consider a donation.

- * @author follow.me@RGustBardon (Robert Gust-Bardon) - * @supported Tested with: - * - */ - -/*global console:false, exports:true, module:false, require:false */ -/*jshint sub:true */ -/** - * Consolidates null, Boolean, and String values found inside an AST. - * @param {!TSyntacticCodeUnit} oAbstractSyntaxTree An array-like object - * representing an AST. - * @return {!TSyntacticCodeUnit} An array-like object representing an AST with its null, Boolean, and - * String values consolidated. - */ -// TODO(user) Consolidation of mathematical values found in numeric literals. -// TODO(user) Unconsolidation. -// TODO(user) Consolidation of ECMA-262 6th Edition programs. -// TODO(user) Rewrite in ECMA-262 6th Edition. -exports['ast_consolidate'] = function(oAbstractSyntaxTree) { - 'use strict'; - /*jshint bitwise:true, curly:true, eqeqeq:true, forin:true, immed:true, - latedef:true, newcap:true, noarge:true, noempty:true, nonew:true, - onevar:true, plusplus:true, regexp:true, undef:true, strict:true, - sub:false, trailing:true */ - - var _, - /** - * A record consisting of data about one or more source elements. - * @constructor - * @nosideeffects - */ - TSourceElementsData = function() { - /** - * The category of the elements. - * @type {number} - * @see ESourceElementCategories - */ - this.nCategory = ESourceElementCategories.N_OTHER; - /** - * The number of occurrences (within the elements) of each primitive - * value that could be consolidated. - * @type {!Array.>} - */ - this.aCount = []; - this.aCount[EPrimaryExpressionCategories.N_IDENTIFIER_NAMES] = {}; - this.aCount[EPrimaryExpressionCategories.N_STRING_LITERALS] = {}; - this.aCount[EPrimaryExpressionCategories.N_NULL_AND_BOOLEAN_LITERALS] = - {}; - /** - * Identifier names found within the elements. - * @type {!Array.} - */ - this.aIdentifiers = []; - /** - * Prefixed representation Strings of each primitive value that could be - * consolidated within the elements. - * @type {!Array.} - */ - this.aPrimitiveValues = []; - }, - /** - * A record consisting of data about a primitive value that could be - * consolidated. - * @constructor - * @nosideeffects - */ - TPrimitiveValue = function() { - /** - * The difference in the number of terminal symbols between the original - * source text and the one with the primitive value consolidated. If the - * difference is positive, the primitive value is considered worthwhile. - * @type {number} - */ - this.nSaving = 0; - /** - * An identifier name of the variable that will be declared and assigned - * the primitive value if the primitive value is consolidated. - * @type {string} - */ - this.sName = ''; - }, - /** - * A record consisting of data on what to consolidate within the range of - * source elements that is currently being considered. - * @constructor - * @nosideeffects - */ - TSolution = function() { - /** - * An object whose keys are prefixed representation Strings of each - * primitive value that could be consolidated within the elements and - * whose values are corresponding data about those primitive values. - * @type {!Object.} - * @see TPrimitiveValue - */ - this.oPrimitiveValues = {}; - /** - * The difference in the number of terminal symbols between the original - * source text and the one with all the worthwhile primitive values - * consolidated. - * @type {number} - * @see TPrimitiveValue#nSaving - */ - this.nSavings = 0; - }, - /** - * The processor of ASTs found - * in UglifyJS. - * @namespace - * @type {!TProcessor} - */ - oProcessor = (/** @type {!TProcessor} */ require('./process')), - /** - * A record consisting of a number of constants that represent the - * difference in the number of terminal symbols between a source text with - * a modified syntactic code unit and the original one. - * @namespace - * @type {!Object.} - */ - oWeights = { - /** - * The difference in the number of punctuators required by the bracket - * notation and the dot notation. - *

'[]'.length - '.'.length

- * @const - * @type {number} - */ - N_PROPERTY_ACCESSOR: 1, - /** - * The number of punctuators required by a variable declaration with an - * initialiser. - *

':'.length + ';'.length

- * @const - * @type {number} - */ - N_VARIABLE_DECLARATION: 2, - /** - * The number of terminal symbols required to introduce a variable - * statement (excluding its variable declaration list). - *

'var '.length

- * @const - * @type {number} - */ - N_VARIABLE_STATEMENT_AFFIXATION: 4, - /** - * The number of terminal symbols needed to enclose source elements - * within a function call with no argument values to a function with an - * empty parameter list. - *

'(function(){}());'.length

- * @const - * @type {number} - */ - N_CLOSURE: 17 - }, - /** - * Categories of primary expressions from which primitive values that - * could be consolidated are derivable. - * @namespace - * @enum {number} - */ - EPrimaryExpressionCategories = { - /** - * Identifier names used as property accessors. - * @type {number} - */ - N_IDENTIFIER_NAMES: 0, - /** - * String literals. - * @type {number} - */ - N_STRING_LITERALS: 1, - /** - * Null and Boolean literals. - * @type {number} - */ - N_NULL_AND_BOOLEAN_LITERALS: 2 - }, - /** - * Prefixes of primitive values that could be consolidated. - * The String values of the prefixes must have same number of characters. - * The prefixes must not be used in any properties defined in any version - * of ECMA-262. - * @namespace - * @enum {string} - */ - EValuePrefixes = { - /** - * Identifies String values. - * @type {string} - */ - S_STRING: '#S', - /** - * Identifies null and Boolean values. - * @type {string} - */ - S_SYMBOLIC: '#O' - }, - /** - * Categories of source elements in terms of their appropriateness of - * having their primitive values consolidated. - * @namespace - * @enum {number} - */ - ESourceElementCategories = { - /** - * Identifies a source element that includes the {@code with} statement. - * @type {number} - */ - N_WITH: 0, - /** - * Identifies a source element that includes the {@code eval} identifier name. - * @type {number} - */ - N_EVAL: 1, - /** - * Identifies a source element that must be excluded from the process - * unless its whole scope is examined. - * @type {number} - */ - N_EXCLUDABLE: 2, - /** - * Identifies source elements not posing any problems. - * @type {number} - */ - N_OTHER: 3 - }, - /** - * The list of literals (other than the String ones) whose primitive - * values can be consolidated. - * @const - * @type {!Array.} - */ - A_OTHER_SUBSTITUTABLE_LITERALS = [ - 'null', // The null literal. - 'false', // The Boolean literal {@code false}. - 'true' // The Boolean literal {@code true}. - ]; - - (/** - * Consolidates all worthwhile primitive values in a syntactic code unit. - * @param {!TSyntacticCodeUnit} oSyntacticCodeUnit An array-like object - * representing the branch of the abstract syntax tree representing the - * syntactic code unit along with its scope. - * @see TPrimitiveValue#nSaving - */ - function fExamineSyntacticCodeUnit(oSyntacticCodeUnit) { - var _, - /** - * Indicates whether the syntactic code unit represents global code. - * @type {boolean} - */ - bIsGlobal = 'toplevel' === oSyntacticCodeUnit[0], - /** - * Indicates whether the whole scope is being examined. - * @type {boolean} - */ - bIsWhollyExaminable = !bIsGlobal, - /** - * An array-like object representing source elements that constitute a - * syntactic code unit. - * @type {!TSyntacticCodeUnit} - */ - oSourceElements, - /** - * A record consisting of data about the source element that is - * currently being examined. - * @type {!TSourceElementsData} - */ - oSourceElementData, - /** - * The scope of the syntactic code unit. - * @type {!TScope} - */ - oScope, - /** - * An instance of an object that allows the traversal of an AST. - * @type {!TWalker} - */ - oWalker, - /** - * An object encompassing collections of functions used during the - * traversal of an AST. - * @namespace - * @type {!Object.>} - */ - oWalkers = { - /** - * A collection of functions used during the surveyance of source - * elements. - * @namespace - * @type {!Object.} - */ - oSurveySourceElement: { - /**#nocode+*/ // JsDoc Toolkit 2.4.0 hides some of the keys. - /** - * Classifies the source element as excludable if it does not - * contain a {@code with} statement or the {@code eval} identifier - * name. Adds the identifier of the function and its formal - * parameters to the list of identifier names found. - * @param {string} sIdentifier The identifier of the function. - * @param {!Array.} aFormalParameterList Formal parameters. - * @param {!TSyntacticCodeUnit} oFunctionBody Function code. - */ - 'defun': function( - sIdentifier, - aFormalParameterList, - oFunctionBody) { - fClassifyAsExcludable(); - fAddIdentifier(sIdentifier); - aFormalParameterList.forEach(fAddIdentifier); - }, - /** - * Increments the count of the number of occurrences of the String - * value that is equivalent to the sequence of terminal symbols - * that constitute the encountered identifier name. - * @param {!TSyntacticCodeUnit} oExpression The nonterminal - * MemberExpression. - * @param {string} sIdentifierName The identifier name used as the - * property accessor. - * @return {!Array} The encountered branch of an AST with its nonterminal - * MemberExpression traversed. - */ - 'dot': function(oExpression, sIdentifierName) { - fCountPrimaryExpression( - EPrimaryExpressionCategories.N_IDENTIFIER_NAMES, - EValuePrefixes.S_STRING + sIdentifierName); - return ['dot', oWalker.walk(oExpression), sIdentifierName]; - }, - /** - * Adds the optional identifier of the function and its formal - * parameters to the list of identifier names found. - * @param {?string} sIdentifier The optional identifier of the - * function. - * @param {!Array.} aFormalParameterList Formal parameters. - * @param {!TSyntacticCodeUnit} oFunctionBody Function code. - */ - 'function': function( - sIdentifier, - aFormalParameterList, - oFunctionBody) { - if ('string' === typeof sIdentifier) { - fAddIdentifier(sIdentifier); - } - aFormalParameterList.forEach(fAddIdentifier); - }, - /** - * Either increments the count of the number of occurrences of the - * encountered null or Boolean value or classifies a source element - * as containing the {@code eval} identifier name. - * @param {string} sIdentifier The identifier encountered. - */ - 'name': function(sIdentifier) { - if (-1 !== A_OTHER_SUBSTITUTABLE_LITERALS.indexOf(sIdentifier)) { - fCountPrimaryExpression( - EPrimaryExpressionCategories.N_NULL_AND_BOOLEAN_LITERALS, - EValuePrefixes.S_SYMBOLIC + sIdentifier); - } else { - if ('eval' === sIdentifier) { - oSourceElementData.nCategory = - ESourceElementCategories.N_EVAL; - } - fAddIdentifier(sIdentifier); - } - }, - /** - * Classifies the source element as excludable if it does not - * contain a {@code with} statement or the {@code eval} identifier - * name. - * @param {TSyntacticCodeUnit} oExpression The expression whose - * value is to be returned. - */ - 'return': function(oExpression) { - fClassifyAsExcludable(); - }, - /** - * Increments the count of the number of occurrences of the - * encountered String value. - * @param {string} sStringValue The String value of the string - * literal encountered. - */ - 'string': function(sStringValue) { - if (sStringValue.length > 0) { - fCountPrimaryExpression( - EPrimaryExpressionCategories.N_STRING_LITERALS, - EValuePrefixes.S_STRING + sStringValue); - } - }, - /** - * Adds the identifier reserved for an exception to the list of - * identifier names found. - * @param {!TSyntacticCodeUnit} oTry A block of code in which an - * exception can occur. - * @param {Array} aCatch The identifier reserved for an exception - * and a block of code to handle the exception. - * @param {TSyntacticCodeUnit} oFinally An optional block of code - * to be evaluated regardless of whether an exception occurs. - */ - 'try': function(oTry, aCatch, oFinally) { - if (Array.isArray(aCatch)) { - fAddIdentifier(aCatch[0]); - } - }, - /** - * Classifies the source element as excludable if it does not - * contain a {@code with} statement or the {@code eval} identifier - * name. Adds the identifier of each declared variable to the list - * of identifier names found. - * @param {!Array.} aVariableDeclarationList Variable - * declarations. - */ - 'var': function(aVariableDeclarationList) { - fClassifyAsExcludable(); - aVariableDeclarationList.forEach(fAddVariable); - }, - /** - * Classifies a source element as containing the {@code with} - * statement. - * @param {!TSyntacticCodeUnit} oExpression An expression whose - * value is to be converted to a value of type Object and - * become the binding object of a new object environment - * record of a new lexical environment in which the statement - * is to be executed. - * @param {!TSyntacticCodeUnit} oStatement The statement to be - * executed in the augmented lexical environment. - * @return {!Array} An empty array to stop the traversal. - */ - 'with': function(oExpression, oStatement) { - oSourceElementData.nCategory = ESourceElementCategories.N_WITH; - return []; - } - /**#nocode-*/ // JsDoc Toolkit 2.4.0 hides some of the keys. - }, - /** - * A collection of functions used while looking for nested functions. - * @namespace - * @type {!Object.} - */ - oExamineFunctions: { - /**#nocode+*/ // JsDoc Toolkit 2.4.0 hides some of the keys. - /** - * Orders an examination of a nested function declaration. - * @this {!TSyntacticCodeUnit} An array-like object representing - * the branch of an AST representing the syntactic code unit along with - * its scope. - * @return {!Array} An empty array to stop the traversal. - */ - 'defun': function() { - fExamineSyntacticCodeUnit(this); - return []; - }, - /** - * Orders an examination of a nested function expression. - * @this {!TSyntacticCodeUnit} An array-like object representing - * the branch of an AST representing the syntactic code unit along with - * its scope. - * @return {!Array} An empty array to stop the traversal. - */ - 'function': function() { - fExamineSyntacticCodeUnit(this); - return []; - } - /**#nocode-*/ // JsDoc Toolkit 2.4.0 hides some of the keys. - } - }, - /** - * Records containing data about source elements. - * @type {Array.} - */ - aSourceElementsData = [], - /** - * The index (in the source text order) of the source element - * immediately following a Directive Prologue. - * @type {number} - */ - nAfterDirectivePrologue = 0, - /** - * The index (in the source text order) of the source element that is - * currently being considered. - * @type {number} - */ - nPosition, - /** - * The index (in the source text order) of the source element that is - * the last element of the range of source elements that is currently - * being considered. - * @type {(undefined|number)} - */ - nTo, - /** - * Initiates the traversal of a source element. - * @param {!TWalker} oWalker An instance of an object that allows the - * traversal of an abstract syntax tree. - * @param {!TSyntacticCodeUnit} oSourceElement A source element from - * which the traversal should commence. - * @return {function(): !TSyntacticCodeUnit} A function that is able to - * initiate the traversal from a given source element. - */ - cContext = function(oWalker, oSourceElement) { - /** - * @return {!TSyntacticCodeUnit} A function that is able to - * initiate the traversal from a given source element. - */ - var fLambda = function() { - return oWalker.walk(oSourceElement); - }; - - return fLambda; - }, - /** - * Classifies the source element as excludable if it does not - * contain a {@code with} statement or the {@code eval} identifier - * name. - */ - fClassifyAsExcludable = function() { - if (oSourceElementData.nCategory === - ESourceElementCategories.N_OTHER) { - oSourceElementData.nCategory = - ESourceElementCategories.N_EXCLUDABLE; - } - }, - /** - * Adds an identifier to the list of identifier names found. - * @param {string} sIdentifier The identifier to be added. - */ - fAddIdentifier = function(sIdentifier) { - if (-1 === oSourceElementData.aIdentifiers.indexOf(sIdentifier)) { - oSourceElementData.aIdentifiers.push(sIdentifier); - } - }, - /** - * Adds the identifier of a variable to the list of identifier names - * found. - * @param {!Array} aVariableDeclaration A variable declaration. - */ - fAddVariable = function(aVariableDeclaration) { - fAddIdentifier(/** @type {string} */ aVariableDeclaration[0]); - }, - /** - * Increments the count of the number of occurrences of the prefixed - * String representation attributed to the primary expression. - * @param {number} nCategory The category of the primary expression. - * @param {string} sName The prefixed String representation attributed - * to the primary expression. - */ - fCountPrimaryExpression = function(nCategory, sName) { - if (!oSourceElementData.aCount[nCategory].hasOwnProperty(sName)) { - oSourceElementData.aCount[nCategory][sName] = 0; - if (-1 === oSourceElementData.aPrimitiveValues.indexOf(sName)) { - oSourceElementData.aPrimitiveValues.push(sName); - } - } - oSourceElementData.aCount[nCategory][sName] += 1; - }, - /** - * Consolidates all worthwhile primitive values in a range of source - * elements. - * @param {number} nFrom The index (in the source text order) of the - * source element that is the first element of the range. - * @param {number} nTo The index (in the source text order) of the - * source element that is the last element of the range. - * @param {boolean} bEnclose Indicates whether the range should be - * enclosed within a function call with no argument values to a - * function with an empty parameter list if any primitive values - * are consolidated. - * @see TPrimitiveValue#nSaving - */ - fExamineSourceElements = function(nFrom, nTo, bEnclose) { - var _, - /** - * The index of the last mangled name. - * @type {number} - */ - nIndex = oScope.cname, - /** - * The index of the source element that is currently being - * considered. - * @type {number} - */ - nPosition, - /** - * A collection of functions used during the consolidation of - * primitive values and identifier names used as property - * accessors. - * @namespace - * @type {!Object.} - */ - oWalkersTransformers = { - /** - * If the String value that is equivalent to the sequence of - * terminal symbols that constitute the encountered identifier - * name is worthwhile, a syntactic conversion from the dot - * notation to the bracket notation ensues with that sequence - * being substituted by an identifier name to which the value - * is assigned. - * Applies to property accessors that use the dot notation. - * @param {!TSyntacticCodeUnit} oExpression The nonterminal - * MemberExpression. - * @param {string} sIdentifierName The identifier name used as - * the property accessor. - * @return {!Array} A syntactic code unit that is equivalent to - * the one encountered. - * @see TPrimitiveValue#nSaving - */ - 'dot': function(oExpression, sIdentifierName) { - /** - * The prefixed String value that is equivalent to the - * sequence of terminal symbols that constitute the - * encountered identifier name. - * @type {string} - */ - var sPrefixed = EValuePrefixes.S_STRING + sIdentifierName; - - return oSolutionBest.oPrimitiveValues.hasOwnProperty( - sPrefixed) && - oSolutionBest.oPrimitiveValues[sPrefixed].nSaving > 0 ? - ['sub', - oWalker.walk(oExpression), - ['name', - oSolutionBest.oPrimitiveValues[sPrefixed].sName]] : - ['dot', oWalker.walk(oExpression), sIdentifierName]; - }, - /** - * If the encountered identifier is a null or Boolean literal - * and its value is worthwhile, the identifier is substituted - * by an identifier name to which that value is assigned. - * Applies to identifier names. - * @param {string} sIdentifier The identifier encountered. - * @return {!Array} A syntactic code unit that is equivalent to - * the one encountered. - * @see TPrimitiveValue#nSaving - */ - 'name': function(sIdentifier) { - /** - * The prefixed representation String of the identifier. - * @type {string} - */ - var sPrefixed = EValuePrefixes.S_SYMBOLIC + sIdentifier; - - return [ - 'name', - oSolutionBest.oPrimitiveValues.hasOwnProperty(sPrefixed) && - oSolutionBest.oPrimitiveValues[sPrefixed].nSaving > 0 ? - oSolutionBest.oPrimitiveValues[sPrefixed].sName : - sIdentifier - ]; - }, - /** - * If the encountered String value is worthwhile, it is - * substituted by an identifier name to which that value is - * assigned. - * Applies to String values. - * @param {string} sStringValue The String value of the string - * literal encountered. - * @return {!Array} A syntactic code unit that is equivalent to - * the one encountered. - * @see TPrimitiveValue#nSaving - */ - 'string': function(sStringValue) { - /** - * The prefixed representation String of the primitive value - * of the literal. - * @type {string} - */ - var sPrefixed = - EValuePrefixes.S_STRING + sStringValue; - - return oSolutionBest.oPrimitiveValues.hasOwnProperty( - sPrefixed) && - oSolutionBest.oPrimitiveValues[sPrefixed].nSaving > 0 ? - ['name', - oSolutionBest.oPrimitiveValues[sPrefixed].sName] : - ['string', sStringValue]; - } - }, - /** - * Such data on what to consolidate within the range of source - * elements that is currently being considered that lead to the - * greatest known reduction of the number of the terminal symbols - * in comparison to the original source text. - * @type {!TSolution} - */ - oSolutionBest = new TSolution(), - /** - * Data representing an ongoing attempt to find a better - * reduction of the number of the terminal symbols in comparison - * to the original source text than the best one that is - * currently known. - * @type {!TSolution} - * @see oSolutionBest - */ - oSolutionCandidate = new TSolution(), - /** - * A record consisting of data about the range of source elements - * that is currently being examined. - * @type {!TSourceElementsData} - */ - oSourceElementsData = new TSourceElementsData(), - /** - * Variable declarations for each primitive value that is to be - * consolidated within the elements. - * @type {!Array.} - */ - aVariableDeclarations = [], - /** - * Augments a list with a prefixed representation String. - * @param {!Array.} aList A list that is to be augmented. - * @return {function(string)} A function that augments a list - * with a prefixed representation String. - */ - cAugmentList = function(aList) { - /** - * @param {string} sPrefixed Prefixed representation String of - * a primitive value that could be consolidated within the - * elements. - */ - var fLambda = function(sPrefixed) { - if (-1 === aList.indexOf(sPrefixed)) { - aList.push(sPrefixed); - } - }; - - return fLambda; - }, - /** - * Adds the number of occurrences of a primitive value of a given - * category that could be consolidated in the source element with - * a given index to the count of occurrences of that primitive - * value within the range of source elements that is currently - * being considered. - * @param {number} nPosition The index (in the source text order) - * of a source element. - * @param {number} nCategory The category of the primary - * expression from which the primitive value is derived. - * @return {function(string)} A function that performs the - * addition. - * @see cAddOccurrencesInCategory - */ - cAddOccurrences = function(nPosition, nCategory) { - /** - * @param {string} sPrefixed The prefixed representation String - * of a primitive value. - */ - var fLambda = function(sPrefixed) { - if (!oSourceElementsData.aCount[nCategory].hasOwnProperty( - sPrefixed)) { - oSourceElementsData.aCount[nCategory][sPrefixed] = 0; - } - oSourceElementsData.aCount[nCategory][sPrefixed] += - aSourceElementsData[nPosition].aCount[nCategory][ - sPrefixed]; - }; - - return fLambda; - }, - /** - * Adds the number of occurrences of each primitive value of a - * given category that could be consolidated in the source - * element with a given index to the count of occurrences of that - * primitive values within the range of source elements that is - * currently being considered. - * @param {number} nPosition The index (in the source text order) - * of a source element. - * @return {function(number)} A function that performs the - * addition. - * @see fAddOccurrences - */ - cAddOccurrencesInCategory = function(nPosition) { - /** - * @param {number} nCategory The category of the primary - * expression from which the primitive value is derived. - */ - var fLambda = function(nCategory) { - Object.keys( - aSourceElementsData[nPosition].aCount[nCategory] - ).forEach(cAddOccurrences(nPosition, nCategory)); - }; - - return fLambda; - }, - /** - * Adds the number of occurrences of each primitive value that - * could be consolidated in the source element with a given index - * to the count of occurrences of that primitive values within - * the range of source elements that is currently being - * considered. - * @param {number} nPosition The index (in the source text order) - * of a source element. - */ - fAddOccurrences = function(nPosition) { - Object.keys(aSourceElementsData[nPosition].aCount).forEach( - cAddOccurrencesInCategory(nPosition)); - }, - /** - * Creates a variable declaration for a primitive value if that - * primitive value is to be consolidated within the elements. - * @param {string} sPrefixed Prefixed representation String of a - * primitive value that could be consolidated within the - * elements. - * @see aVariableDeclarations - */ - cAugmentVariableDeclarations = function(sPrefixed) { - if (oSolutionBest.oPrimitiveValues[sPrefixed].nSaving > 0) { - aVariableDeclarations.push([ - oSolutionBest.oPrimitiveValues[sPrefixed].sName, - [0 === sPrefixed.indexOf(EValuePrefixes.S_SYMBOLIC) ? - 'name' : 'string', - sPrefixed.substring(EValuePrefixes.S_SYMBOLIC.length)] - ]); - } - }, - /** - * Sorts primitive values with regard to the difference in the - * number of terminal symbols between the original source text - * and the one with those primitive values consolidated. - * @param {string} sPrefixed0 The prefixed representation String - * of the first of the two primitive values that are being - * compared. - * @param {string} sPrefixed1 The prefixed representation String - * of the second of the two primitive values that are being - * compared. - * @return {number} - *
- *
-1
- *
if the first primitive value must be placed before - * the other one,
- *
0
- *
if the first primitive value may be placed before - * the other one,
- *
1
- *
if the first primitive value must not be placed - * before the other one.
- *
- * @see TSolution.oPrimitiveValues - */ - cSortPrimitiveValues = function(sPrefixed0, sPrefixed1) { - /** - * The difference between: - *
    - *
  1. the difference in the number of terminal symbols - * between the original source text and the one with the - * first primitive value consolidated, and
    2. - *
  2. the difference in the number of terminal symbols - * between the original source text and the one with the - * second primitive value consolidated.
    3. - *
- * @type {number} - */ - var nDifference = - oSolutionCandidate.oPrimitiveValues[sPrefixed0].nSaving - - oSolutionCandidate.oPrimitiveValues[sPrefixed1].nSaving; - - return nDifference > 0 ? -1 : nDifference < 0 ? 1 : 0; - }, - /** - * Assigns an identifier name to a primitive value and calculates - * whether instances of that primitive value are worth - * consolidating. - * @param {string} sPrefixed The prefixed representation String - * of a primitive value that is being evaluated. - */ - fEvaluatePrimitiveValue = function(sPrefixed) { - var _, - /** - * The index of the last mangled name. - * @type {number} - */ - nIndex, - /** - * The representation String of the primitive value that is - * being evaluated. - * @type {string} - */ - sName = - sPrefixed.substring(EValuePrefixes.S_SYMBOLIC.length), - /** - * The number of source characters taken up by the - * representation String of the primitive value that is - * being evaluated. - * @type {number} - */ - nLengthOriginal = sName.length, - /** - * The number of source characters taken up by the - * identifier name that could substitute the primitive - * value that is being evaluated. - * substituted. - * @type {number} - */ - nLengthSubstitution, - /** - * The number of source characters taken up by by the - * representation String of the primitive value that is - * being evaluated when it is represented by a string - * literal. - * @type {number} - */ - nLengthString = oProcessor.make_string(sName).length; - - oSolutionCandidate.oPrimitiveValues[sPrefixed] = - new TPrimitiveValue(); - do { // Find an identifier unused in this or any nested scope. - nIndex = oScope.cname; - oSolutionCandidate.oPrimitiveValues[sPrefixed].sName = - oScope.next_mangled(); - } while (-1 !== oSourceElementsData.aIdentifiers.indexOf( - oSolutionCandidate.oPrimitiveValues[sPrefixed].sName)); - nLengthSubstitution = oSolutionCandidate.oPrimitiveValues[ - sPrefixed].sName.length; - if (0 === sPrefixed.indexOf(EValuePrefixes.S_SYMBOLIC)) { - // foo:null, or foo:null; - oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving -= - nLengthSubstitution + nLengthOriginal + - oWeights.N_VARIABLE_DECLARATION; - // null vs foo - oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving += - oSourceElementsData.aCount[ - EPrimaryExpressionCategories. - N_NULL_AND_BOOLEAN_LITERALS][sPrefixed] * - (nLengthOriginal - nLengthSubstitution); - } else { - // foo:'fromCharCode'; - oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving -= - nLengthSubstitution + nLengthString + - oWeights.N_VARIABLE_DECLARATION; - // .fromCharCode vs [foo] - if (oSourceElementsData.aCount[ - EPrimaryExpressionCategories.N_IDENTIFIER_NAMES - ].hasOwnProperty(sPrefixed)) { - oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving += - oSourceElementsData.aCount[ - EPrimaryExpressionCategories.N_IDENTIFIER_NAMES - ][sPrefixed] * - (nLengthOriginal - nLengthSubstitution - - oWeights.N_PROPERTY_ACCESSOR); - } - // 'fromCharCode' vs foo - if (oSourceElementsData.aCount[ - EPrimaryExpressionCategories.N_STRING_LITERALS - ].hasOwnProperty(sPrefixed)) { - oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving += - oSourceElementsData.aCount[ - EPrimaryExpressionCategories.N_STRING_LITERALS - ][sPrefixed] * - (nLengthString - nLengthSubstitution); - } - } - if (oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving > - 0) { - oSolutionCandidate.nSavings += - oSolutionCandidate.oPrimitiveValues[sPrefixed].nSaving; - } else { - oScope.cname = nIndex; // Free the identifier name. - } - }, - /** - * Adds a variable declaration to an existing variable statement. - * @param {!Array} aVariableDeclaration A variable declaration - * with an initialiser. - */ - cAddVariableDeclaration = function(aVariableDeclaration) { - (/** @type {!Array} */ oSourceElements[nFrom][1]).unshift( - aVariableDeclaration); - }; - - if (nFrom > nTo) { - return; - } - // If the range is a closure, reuse the closure. - if (nFrom === nTo && - 'stat' === oSourceElements[nFrom][0] && - 'call' === oSourceElements[nFrom][1][0] && - 'function' === oSourceElements[nFrom][1][1][0]) { - fExamineSyntacticCodeUnit(oSourceElements[nFrom][1][1]); - return; - } - // Create a list of all derived primitive values within the range. - for (nPosition = nFrom; nPosition <= nTo; nPosition += 1) { - aSourceElementsData[nPosition].aPrimitiveValues.forEach( - cAugmentList(oSourceElementsData.aPrimitiveValues)); - } - if (0 === oSourceElementsData.aPrimitiveValues.length) { - return; - } - for (nPosition = nFrom; nPosition <= nTo; nPosition += 1) { - // Add the number of occurrences to the total count. - fAddOccurrences(nPosition); - // Add identifiers of this or any nested scope to the list. - aSourceElementsData[nPosition].aIdentifiers.forEach( - cAugmentList(oSourceElementsData.aIdentifiers)); - } - // Distribute identifier names among derived primitive values. - do { // If there was any progress, find a better distribution. - oSolutionBest = oSolutionCandidate; - if (Object.keys(oSolutionCandidate.oPrimitiveValues).length > 0) { - // Sort primitive values descending by their worthwhileness. - oSourceElementsData.aPrimitiveValues.sort(cSortPrimitiveValues); - } - oSolutionCandidate = new TSolution(); - oSourceElementsData.aPrimitiveValues.forEach( - fEvaluatePrimitiveValue); - oScope.cname = nIndex; - } while (oSolutionCandidate.nSavings > oSolutionBest.nSavings); - // Take the necessity of adding a variable statement into account. - if ('var' !== oSourceElements[nFrom][0]) { - oSolutionBest.nSavings -= oWeights.N_VARIABLE_STATEMENT_AFFIXATION; - } - if (bEnclose) { - // Take the necessity of forming a closure into account. - oSolutionBest.nSavings -= oWeights.N_CLOSURE; - } - if (oSolutionBest.nSavings > 0) { - // Create variable declarations suitable for UglifyJS. - Object.keys(oSolutionBest.oPrimitiveValues).forEach( - cAugmentVariableDeclarations); - // Rewrite expressions that contain worthwhile primitive values. - for (nPosition = nFrom; nPosition <= nTo; nPosition += 1) { - oWalker = oProcessor.ast_walker(); - oSourceElements[nPosition] = - oWalker.with_walkers( - oWalkersTransformers, - cContext(oWalker, oSourceElements[nPosition])); - } - if ('var' === oSourceElements[nFrom][0]) { // Reuse the statement. - (/** @type {!Array.} */ aVariableDeclarations.reverse( - )).forEach(cAddVariableDeclaration); - } else { // Add a variable statement. - Array.prototype.splice.call( - oSourceElements, - nFrom, - 0, - ['var', aVariableDeclarations]); - nTo += 1; - } - if (bEnclose) { - // Add a closure. - Array.prototype.splice.call( - oSourceElements, - nFrom, - 0, - ['stat', ['call', ['function', null, [], []], []]]); - // Copy source elements into the closure. - for (nPosition = nTo + 1; nPosition > nFrom; nPosition -= 1) { - Array.prototype.unshift.call( - oSourceElements[nFrom][1][1][3], - oSourceElements[nPosition]); - } - // Remove source elements outside the closure. - Array.prototype.splice.call( - oSourceElements, - nFrom + 1, - nTo - nFrom + 1); - } - } - if (bEnclose) { - // Restore the availability of identifier names. - oScope.cname = nIndex; - } - }; - - oSourceElements = (/** @type {!TSyntacticCodeUnit} */ - oSyntacticCodeUnit[bIsGlobal ? 1 : 3]); - if (0 === oSourceElements.length) { - return; - } - oScope = bIsGlobal ? oSyntacticCodeUnit.scope : oSourceElements.scope; - // Skip a Directive Prologue. - while (nAfterDirectivePrologue < oSourceElements.length && - 'stat' === oSourceElements[nAfterDirectivePrologue][0] && - 'string' === oSourceElements[nAfterDirectivePrologue][1][0]) { - nAfterDirectivePrologue += 1; - aSourceElementsData.push(null); - } - if (oSourceElements.length === nAfterDirectivePrologue) { - return; - } - for (nPosition = nAfterDirectivePrologue; - nPosition < oSourceElements.length; - nPosition += 1) { - oSourceElementData = new TSourceElementsData(); - oWalker = oProcessor.ast_walker(); - // Classify a source element. - // Find its derived primitive values and count their occurrences. - // Find all identifiers used (including nested scopes). - oWalker.with_walkers( - oWalkers.oSurveySourceElement, - cContext(oWalker, oSourceElements[nPosition])); - // Establish whether the scope is still wholly examinable. - bIsWhollyExaminable = bIsWhollyExaminable && - ESourceElementCategories.N_WITH !== oSourceElementData.nCategory && - ESourceElementCategories.N_EVAL !== oSourceElementData.nCategory; - aSourceElementsData.push(oSourceElementData); - } - if (bIsWhollyExaminable) { // Examine the whole scope. - fExamineSourceElements( - nAfterDirectivePrologue, - oSourceElements.length - 1, - false); - } else { // Examine unexcluded ranges of source elements. - for (nPosition = oSourceElements.length - 1; - nPosition >= nAfterDirectivePrologue; - nPosition -= 1) { - oSourceElementData = (/** @type {!TSourceElementsData} */ - aSourceElementsData[nPosition]); - if (ESourceElementCategories.N_OTHER === - oSourceElementData.nCategory) { - if ('undefined' === typeof nTo) { - nTo = nPosition; // Indicate the end of a range. - } - // Examine the range if it immediately follows a Directive Prologue. - if (nPosition === nAfterDirectivePrologue) { - fExamineSourceElements(nPosition, nTo, true); - } - } else { - if ('undefined' !== typeof nTo) { - // Examine the range that immediately follows this source element. - fExamineSourceElements(nPosition + 1, nTo, true); - nTo = void 0; // Obliterate the range. - } - // Examine nested functions. - oWalker = oProcessor.ast_walker(); - oWalker.with_walkers( - oWalkers.oExamineFunctions, - cContext(oWalker, oSourceElements[nPosition])); - } - } - } - }(oAbstractSyntaxTree = oProcessor.ast_add_scope(oAbstractSyntaxTree))); - return oAbstractSyntaxTree; -}; -/*jshint sub:false */ - - -if (require.main === module) { - (function() { - 'use strict'; - /*jshint bitwise:true, curly:true, eqeqeq:true, forin:true, immed:true, - latedef:true, newcap:true, noarge:true, noempty:true, nonew:true, - onevar:true, plusplus:true, regexp:true, undef:true, strict:true, - sub:false, trailing:true */ - - var _, - /** - * NodeJS module for unit testing. - * @namespace - * @type {!TAssert} - * @see http://nodejs.org/docs/v0.6.10/api/all.html#assert - */ - oAssert = (/** @type {!TAssert} */ require('env!env/assert')), - /** - * The parser of ECMA-262 found in UglifyJS. - * @namespace - * @type {!TParser} - */ - oParser = (/** @type {!TParser} */ require('./parse-js')), - /** - * The processor of ASTs - * found in UglifyJS. - * @namespace - * @type {!TProcessor} - */ - oProcessor = (/** @type {!TProcessor} */ require('./process')), - /** - * An instance of an object that allows the traversal of an AST. - * @type {!TWalker} - */ - oWalker, - /** - * A collection of functions for the removal of the scope information - * during the traversal of an AST. - * @namespace - * @type {!Object.} - */ - oWalkersPurifiers = { - /**#nocode+*/ // JsDoc Toolkit 2.4.0 hides some of the keys. - /** - * Deletes the scope information from the branch of the abstract - * syntax tree representing the encountered function declaration. - * @param {string} sIdentifier The identifier of the function. - * @param {!Array.} aFormalParameterList Formal parameters. - * @param {!TSyntacticCodeUnit} oFunctionBody Function code. - */ - 'defun': function( - sIdentifier, - aFormalParameterList, - oFunctionBody) { - delete oFunctionBody.scope; - }, - /** - * Deletes the scope information from the branch of the abstract - * syntax tree representing the encountered function expression. - * @param {?string} sIdentifier The optional identifier of the - * function. - * @param {!Array.} aFormalParameterList Formal parameters. - * @param {!TSyntacticCodeUnit} oFunctionBody Function code. - */ - 'function': function( - sIdentifier, - aFormalParameterList, - oFunctionBody) { - delete oFunctionBody.scope; - } - /**#nocode-*/ // JsDoc Toolkit 2.4.0 hides some of the keys. - }, - /** - * Initiates the traversal of a source element. - * @param {!TWalker} oWalker An instance of an object that allows the - * traversal of an abstract syntax tree. - * @param {!TSyntacticCodeUnit} oSourceElement A source element from - * which the traversal should commence. - * @return {function(): !TSyntacticCodeUnit} A function that is able to - * initiate the traversal from a given source element. - */ - cContext = function(oWalker, oSourceElement) { - /** - * @return {!TSyntacticCodeUnit} A function that is able to - * initiate the traversal from a given source element. - */ - var fLambda = function() { - return oWalker.walk(oSourceElement); - }; - - return fLambda; - }, - /** - * A record consisting of configuration for the code generation phase. - * @type {!Object} - */ - oCodeGenerationOptions = { - beautify: true - }, - /** - * Tests whether consolidation of an ECMAScript program yields expected - * results. - * @param {{ - * sTitle: string, - * sInput: string, - * sOutput: string - * }} oUnitTest A record consisting of data about a unit test: its - * name, an ECMAScript program, and, if consolidation is to take - * place, the resulting ECMAScript program. - */ - cAssert = function(oUnitTest) { - var _, - /** - * An array-like object representing the AST obtained after consolidation. - * @type {!TSyntacticCodeUnit} - */ - oSyntacticCodeUnitActual = - exports.ast_consolidate(oParser.parse(oUnitTest.sInput)), - /** - * An array-like object representing the expected AST. - * @type {!TSyntacticCodeUnit} - */ - oSyntacticCodeUnitExpected = oParser.parse( - oUnitTest.hasOwnProperty('sOutput') ? - oUnitTest.sOutput : oUnitTest.sInput); - - delete oSyntacticCodeUnitActual.scope; - oWalker = oProcessor.ast_walker(); - oWalker.with_walkers( - oWalkersPurifiers, - cContext(oWalker, oSyntacticCodeUnitActual)); - try { - oAssert.deepEqual( - oSyntacticCodeUnitActual, - oSyntacticCodeUnitExpected); - } catch (oException) { - console.error( - '########## A unit test has failed.\n' + - oUnitTest.sTitle + '\n' + - '##### actual code (' + - oProcessor.gen_code(oSyntacticCodeUnitActual).length + - ' bytes)\n' + - oProcessor.gen_code( - oSyntacticCodeUnitActual, - oCodeGenerationOptions) + '\n' + - '##### expected code (' + - oProcessor.gen_code(oSyntacticCodeUnitExpected).length + - ' bytes)\n' + - oProcessor.gen_code( - oSyntacticCodeUnitExpected, - oCodeGenerationOptions)); - } - }; - - [ - // 7.6.1 Reserved Words. - { - sTitle: - 'Omission of keywords while choosing an identifier name.', - sInput: - '(function() {' + - ' var a, b, c, d, e, f, g, h, i, j, k, l, m,' + - ' n, o, p, q, r, s, t, u, v, w, x, y, z,' + - ' A, B, C, D, E, F, G, H, I, J, K, L, M,' + - ' N, O, P, Q, R, S, T, U, V, W, X, Y, Z,' + - ' $, _,' + - ' aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am,' + - ' an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az,' + - ' aA, aB, aC, aD, aE, aF, aG, aH, aI, aJ, aK, aL, aM,' + - ' aN, aO, aP, aQ, aR, aS, aT, aU, aV, aW, aX, aY, aZ,' + - ' a$, a_,' + - ' ba, bb, bc, bd, be, bf, bg, bh, bi, bj, bk, bl, bm,' + - ' bn, bo, bp, bq, br, bs, bt, bu, bv, bw, bx, by, bz,' + - ' bA, bB, bC, bD, bE, bF, bG, bH, bI, bJ, bK, bL, bM,' + - ' bN, bO, bP, bQ, bR, bS, bT, bU, bV, bW, bX, bY, bZ,' + - ' b$, b_,' + - ' ca, cb, cc, cd, ce, cf, cg, ch, ci, cj, ck, cl, cm,' + - ' cn, co, cp, cq, cr, cs, ct, cu, cv, cw, cx, cy, cz,' + - ' cA, cB, cC, cD, cE, cF, cG, cH, cI, cJ, cK, cL, cM,' + - ' cN, cO, cP, cQ, cR, cS, cT, cU, cV, cW, cX, cY, cZ,' + - ' c$, c_,' + - ' da, db, dc, dd, de, df, dg, dh, di, dj, dk, dl, dm,' + - ' dn, dq, dr, ds, dt, du, dv, dw, dx, dy, dz,' + - ' dA, dB, dC, dD, dE, dF, dG, dH, dI, dJ, dK, dL, dM,' + - ' dN, dO, dP, dQ, dR, dS, dT, dU, dV, dW, dX, dY, dZ,' + - ' d$, d_;' + - ' void ["abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",' + - ' "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"];' + - '}());', - sOutput: - '(function() {' + - ' var dp =' + - ' "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",' + - ' a, b, c, d, e, f, g, h, i, j, k, l, m,' + - ' n, o, p, q, r, s, t, u, v, w, x, y, z,' + - ' A, B, C, D, E, F, G, H, I, J, K, L, M,' + - ' N, O, P, Q, R, S, T, U, V, W, X, Y, Z,' + - ' $, _,' + - ' aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am,' + - ' an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az,' + - ' aA, aB, aC, aD, aE, aF, aG, aH, aI, aJ, aK, aL, aM,' + - ' aN, aO, aP, aQ, aR, aS, aT, aU, aV, aW, aX, aY, aZ,' + - ' a$, a_,' + - ' ba, bb, bc, bd, be, bf, bg, bh, bi, bj, bk, bl, bm,' + - ' bn, bo, bp, bq, br, bs, bt, bu, bv, bw, bx, by, bz,' + - ' bA, bB, bC, bD, bE, bF, bG, bH, bI, bJ, bK, bL, bM,' + - ' bN, bO, bP, bQ, bR, bS, bT, bU, bV, bW, bX, bY, bZ,' + - ' b$, b_,' + - ' ca, cb, cc, cd, ce, cf, cg, ch, ci, cj, ck, cl, cm,' + - ' cn, co, cp, cq, cr, cs, ct, cu, cv, cw, cx, cy, cz,' + - ' cA, cB, cC, cD, cE, cF, cG, cH, cI, cJ, cK, cL, cM,' + - ' cN, cO, cP, cQ, cR, cS, cT, cU, cV, cW, cX, cY, cZ,' + - ' c$, c_,' + - ' da, db, dc, dd, de, df, dg, dh, di, dj, dk, dl, dm,' + - ' dn, dq, dr, ds, dt, du, dv, dw, dx, dy, dz,' + - ' dA, dB, dC, dD, dE, dF, dG, dH, dI, dJ, dK, dL, dM,' + - ' dN, dO, dP, dQ, dR, dS, dT, dU, dV, dW, dX, dY, dZ,' + - ' d$, d_;' + - ' void [dp, dp];' + - '}());' - }, - // 7.8.1 Null Literals. - { - sTitle: - 'Evaluation with regard to the null value.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' var foo;' + - ' void [null, null, null];' + - '}());' + - 'eval("");' + - '(function() {' + - ' var foo;' + - ' void [null, null];' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' var a = null, foo;' + - ' void [a, a, a];' + - '}());' + - 'eval("");' + - '(function() {' + - ' var foo;' + - ' void [null, null];' + - '}());' - }, - // 7.8.2 Boolean Literals. - { - sTitle: - 'Evaluation with regard to the false value.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' var foo;' + - ' void [false, false, false];' + - '}());' + - 'eval("");' + - '(function() {' + - ' var foo;' + - ' void [false, false];' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' var a = false, foo;' + - ' void [a, a, a];' + - '}());' + - 'eval("");' + - '(function() {' + - ' var foo;' + - ' void [false, false];' + - '}());' - }, - { - sTitle: - 'Evaluation with regard to the true value.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' var foo;' + - ' void [true, true, true];' + - '}());' + - 'eval("");' + - '(function() {' + - ' var foo;' + - ' void [true, true];' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' var a = true, foo;' + - ' void [a, a, a];' + - '}());' + - 'eval("");' + - '(function() {' + - ' var foo;' + - ' void [true, true];' + - '}());' - }, - // 7.8.4 String Literals. - { - sTitle: - 'Evaluation with regard to the String value of a string literal.', - sInput: - '(function() {' + - ' var foo;' + - ' void ["abcd", "abcd", "abc", "abc"];' + - '}());', - sOutput: - '(function() {' + - ' var a = "abcd", foo;' + - ' void [a, a, "abc", "abc"];' + - '}());' - }, - // 7.8.5 Regular Expression Literals. - { - sTitle: - 'Preservation of the pattern of a regular expression literal.', - sInput: - 'void [/abcdefghijklmnopqrstuvwxyz/, /abcdefghijklmnopqrstuvwxyz/];' - }, - { - sTitle: - 'Preservation of the flags of a regular expression literal.', - sInput: - 'void [/(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim,' + - ' /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim,' + - ' /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim, /(?:)/gim];' - }, - // 10.2 Lexical Environments. - { - sTitle: - 'Preservation of identifier names in the same scope.', - sInput: - '/*jshint shadow:true */' + - 'var a;' + - 'function b(i) {' + - '}' + - 'for (var c; 0 === Math.random(););' + - 'for (var d in {});' + - 'void ["abcdefghijklmnopqrstuvwxyz"];' + - 'void [b(a), b(c), b(d)];' + - 'void [typeof e];' + - 'i: for (; 0 === Math.random();) {' + - ' if (42 === (new Date()).getMinutes()) {' + - ' continue i;' + - ' } else {' + - ' break i;' + - ' }' + - '}' + - 'try {' + - '} catch (f) {' + - '} finally {' + - '}' + - '(function g(h) {' + - '}());' + - 'void [{' + - ' i: 42,' + - ' "j": 42,' + - ' \'k\': 42' + - '}];' + - 'void ["abcdefghijklmnopqrstuvwxyz"];', - sOutput: - '/*jshint shadow:true */' + - 'var a;' + - 'function b(i) {' + - '}' + - 'for (var c; 0 === Math.random(););' + - 'for (var d in {});' + - '(function() {' + - ' var i = "abcdefghijklmnopqrstuvwxyz";' + - ' void [i];' + - ' void [b(a), b(c), b(d)];' + - ' void [typeof e];' + - ' i: for (; 0 === Math.random();) {' + - ' if (42 === (new Date()).getMinutes()) {' + - ' continue i;' + - ' } else {' + - ' break i;' + - ' }' + - ' }' + - ' try {' + - ' } catch (f) {' + - ' } finally {' + - ' }' + - ' (function g(h) {' + - ' }());' + - ' void [{' + - ' i: 42,' + - ' "j": 42,' + - ' \'k\': 42' + - ' }];' + - ' void [i];' + - '}());' - }, - { - sTitle: - 'Preservation of identifier names in nested function code.', - sInput: - '(function() {' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - ' (function() {' + - ' var a;' + - ' for (var b; 0 === Math.random(););' + - ' for (var c in {});' + - ' void [typeof d];' + - ' h: for (; 0 === Math.random();) {' + - ' if (42 === (new Date()).getMinutes()) {' + - ' continue h;' + - ' } else {' + - ' break h;' + - ' }' + - ' }' + - ' try {' + - ' } catch (e) {' + - ' } finally {' + - ' }' + - ' (function f(g) {' + - ' }());' + - ' void [{' + - ' h: 42,' + - ' "i": 42,' + - ' \'j\': 42' + - ' }];' + - ' }());' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - '}());', - sOutput: - '(function() {' + - ' var h = "abcdefghijklmnopqrstuvwxyz";' + - ' void [h];' + - ' (function() {' + - ' var a;' + - ' for (var b; 0 === Math.random(););' + - ' for (var c in {});' + - ' void [typeof d];' + - ' h: for (; 0 === Math.random();) {' + - ' if (42 === (new Date()).getMinutes()) {' + - ' continue h;' + - ' } else {' + - ' break h;' + - ' }' + - ' }' + - ' try {' + - ' } catch (e) {' + - ' } finally {' + - ' }' + - ' (function f(g) {' + - ' }());' + - ' void [{' + - ' h: 42,' + - ' "i": 42,' + - ' \'j\': 42' + - ' }];' + - ' }());' + - ' void [h];' + - '}());' - }, - { - sTitle: - 'Consolidation of a closure with other source elements.', - sInput: - '(function(foo) {' + - '}("abcdefghijklmnopqrstuvwxyz"));' + - 'void ["abcdefghijklmnopqrstuvwxyz"];', - sOutput: - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' (function(foo) {' + - ' })(a);' + - ' void [a];' + - '}());' - }, - { - sTitle: - 'Consolidation of function code instead of a sole closure.', - sInput: - '(function(foo, bar) {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - '}("abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz"));', - sOutput: - '(function(foo, bar) {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}("abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz"));' - }, - // 11.1.5 Object Initialiser. - { - sTitle: - 'Preservation of property names of an object initialiser.', - sInput: - 'var foo = {' + - ' abcdefghijklmnopqrstuvwxyz: 42,' + - ' "zyxwvutsrqponmlkjihgfedcba": 42,' + - ' \'mlkjihgfedcbanopqrstuvwxyz\': 42' + - '};' + - 'void [' + - ' foo.abcdefghijklmnopqrstuvwxyz,' + - ' "zyxwvutsrqponmlkjihgfedcba",' + - ' \'mlkjihgfedcbanopqrstuvwxyz\'' + - '];' - }, - { - sTitle: - 'Evaluation with regard to String values derived from identifier ' + - 'names used as property accessors.', - sInput: - '(function() {' + - ' var foo;' + - ' void [' + - ' Math.abcdefghij,' + - ' Math.abcdefghij,' + - ' Math.abcdefghi,' + - ' Math.abcdefghi' + - ' ];' + - '}());', - sOutput: - '(function() {' + - ' var a = "abcdefghij", foo;' + - ' void [' + - ' Math[a],' + - ' Math[a],' + - ' Math.abcdefghi,' + - ' Math.abcdefghi' + - ' ];' + - '}());' - }, - // 11.2.1 Property Accessors. - { - sTitle: - 'Preservation of identifiers in the nonterminal MemberExpression.', - sInput: - 'void [' + - ' Math.E,' + - ' Math.LN10,' + - ' Math.LN2,' + - ' Math.LOG2E,' + - ' Math.LOG10E,' + - ' Math.PI,' + - ' Math.SQRT1_2,' + - ' Math.SQRT2,' + - ' Math.abs,' + - ' Math.acos' + - '];' - }, - // 12.2 Variable Statement. - { - sTitle: - 'Preservation of the identifier of a variable that is being ' + - 'declared in a variable statement.', - sInput: - '(function() {' + - ' var abcdefghijklmnopqrstuvwxyz;' + - ' void [abcdefghijklmnopqrstuvwxyz];' + - '}());' - }, - { - sTitle: - 'Exclusion of a variable statement in global code.', - sInput: - 'void ["abcdefghijklmnopqrstuvwxyz"];' + - 'var foo = "abcdefghijklmnopqrstuvwxyz",' + - ' bar = "abcdefghijklmnopqrstuvwxyz";' + - 'void ["abcdefghijklmnopqrstuvwxyz"];' - }, - { - sTitle: - 'Exclusion of a variable statement in function code that ' + - 'contains a with statement.', - sInput: - '(function() {' + - ' with ({});' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - ' var foo;' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - '}());' - }, - { - sTitle: - 'Exclusion of a variable statement in function code that ' + - 'contains a direct call to the eval function.', - sInput: - '/*jshint evil:true */' + - 'void [' + - ' function() {' + - ' eval("");' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - ' var foo;' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - ' }' + - '];' - }, - { - sTitle: - 'Consolidation within a variable statement in global code.', - sInput: - 'var foo = function() {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - '};', - sOutput: - 'var foo = function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '};' - }, - { - sTitle: - 'Consolidation within a variable statement excluded in function ' + - 'code due to the presence of a with statement.', - sInput: - '(function() {' + - ' with ({});' + - ' var foo = function() {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - ' };' + - '}());', - sOutput: - '(function() {' + - ' with ({});' + - ' var foo = function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - ' };' + - '}());' - }, - { - sTitle: - 'Consolidation within a variable statement excluded in function ' + - 'code due to the presence of a direct call to the eval function.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' eval("");' + - ' var foo = function() {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - ' };' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' eval("");' + - ' var foo = function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - ' };' + - '}());' - }, - { - sTitle: - 'Inclusion of a variable statement in function code that ' + - 'contains no with statement and no direct call to the eval ' + - 'function.', - sInput: - '(function() {' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - ' var foo;' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - '}());', - sOutput: - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a];' + - ' var foo;' + - ' void [a];' + - '}());' - }, - { - sTitle: - 'Ignorance with regard to a variable statement in global code.', - sInput: - 'var foo = "abcdefghijklmnopqrstuvwxyz";' + - 'void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];', - sOutput: - 'var foo = "abcdefghijklmnopqrstuvwxyz";' + - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}());' - }, - // 12.4 Expression Statement. - { - sTitle: - 'Preservation of identifiers in an expression statement.', - sInput: - 'void [typeof abcdefghijklmnopqrstuvwxyz,' + - ' typeof abcdefghijklmnopqrstuvwxyz];' - }, - // 12.6.3 The {@code for} Statement. - { - sTitle: - 'Preservation of identifiers in the variable declaration list of ' + - 'a for statement.', - sInput: - 'for (var abcdefghijklmnopqrstuvwxyz; 0 === Math.random(););' + - 'for (var abcdefghijklmnopqrstuvwxyz; 0 === Math.random(););' - }, - // 12.6.4 The {@code for-in} Statement. - { - sTitle: - 'Preservation of identifiers in the variable declaration list of ' + - 'a for-in statement.', - sInput: - 'for (var abcdefghijklmnopqrstuvwxyz in {});' + - 'for (var abcdefghijklmnopqrstuvwxyz in {});' - }, - // 12.7 The {@code continue} Statement. - { - sTitle: - 'Preservation of the identifier in a continue statement.', - sInput: - 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random();) {' + - ' continue abcdefghijklmnopqrstuvwxyz;' + - '}' + - 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random();) {' + - ' continue abcdefghijklmnopqrstuvwxyz;' + - '}' - }, - // 12.8 The {@code break} Statement. - { - sTitle: - 'Preservation of the identifier in a break statement.', - sInput: - 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random();) {' + - ' break abcdefghijklmnopqrstuvwxyz;' + - '}' + - 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random();) {' + - ' break abcdefghijklmnopqrstuvwxyz;' + - '}' - }, - // 12.9 The {@code return} Statement. - { - sTitle: - 'Exclusion of a return statement in function code that contains ' + - 'a with statement.', - sInput: - '(function() {' + - ' with ({});' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - ' if (0 === Math.random()) {' + - ' return;' + - ' } else {' + - ' }' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - '}());' - }, - { - sTitle: - 'Exclusion of a return statement in function code that contains ' + - 'a direct call to the eval function.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' eval("");' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - ' if (0 === Math.random()) {' + - ' return;' + - ' } else {' + - ' }' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - '}());' - }, - { - sTitle: - 'Consolidation within a return statement excluded in function ' + - 'code due to the presence of a with statement.', - sInput: - '(function() {' + - ' with ({});' + - ' return function() {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - ' };' + - '}());', - sOutput: - '(function() {' + - ' with ({});' + - ' return function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - ' };' + - '}());' - }, - { - sTitle: - 'Consolidation within a return statement excluded in function ' + - 'code due to the presence of a direct call to the eval function.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' eval("");' + - ' return function() {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - ' };' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' eval("");' + - ' return function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - ' };' + - '}());' - }, - { - sTitle: - 'Inclusion of a return statement in function code that contains ' + - 'no with statement and no direct call to the eval function.', - sInput: - '(function() {' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - ' if (0 === Math.random()) {' + - ' return;' + - ' } else {' + - ' }' + - ' void ["abcdefghijklmnopqrstuvwxyz"];' + - '}());', - sOutput: - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a];' + - ' if (0 === Math.random()) {' + - ' return;' + - ' } else {' + - ' }' + - ' void [a];' + - '}());' - }, - // 12.10 The {@code with} Statement. - { - sTitle: - 'Preservation of the statement in a with statement.', - sInput: - 'with ({}) {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - '}' - }, - { - sTitle: - 'Exclusion of a with statement in the same syntactic code unit.', - sInput: - 'void ["abcdefghijklmnopqrstuvwxyz"];' + - 'with ({' + - ' foo: "abcdefghijklmnopqrstuvwxyz",' + - ' bar: "abcdefghijklmnopqrstuvwxyz"' + - '}) {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - '}' + - 'void ["abcdefghijklmnopqrstuvwxyz"];' - }, - { - sTitle: - 'Exclusion of a with statement in nested function code.', - sInput: - 'void ["abcdefghijklmnopqrstuvwxyz"];' + - '(function() {' + - ' with ({' + - ' foo: "abcdefghijklmnopqrstuvwxyz",' + - ' bar: "abcdefghijklmnopqrstuvwxyz"' + - ' }) {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - ' }' + - '}());' + - 'void ["abcdefghijklmnopqrstuvwxyz"];' - }, - // 12.12 Labelled Statements. - { - sTitle: - 'Preservation of the label of a labelled statement.', - sInput: - 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random(););' + - 'abcdefghijklmnopqrstuvwxyz: for (; 0 === Math.random(););' - }, - // 12.14 The {@code try} Statement. - { - sTitle: - 'Preservation of the identifier in the catch clause of a try' + - 'statement.', - sInput: - 'try {' + - '} catch (abcdefghijklmnopqrstuvwxyz) {' + - '} finally {' + - '}' + - 'try {' + - '} catch (abcdefghijklmnopqrstuvwxyz) {' + - '} finally {' + - '}' - }, - // 13 Function Definition. - { - sTitle: - 'Preservation of the identifier of a function declaration.', - sInput: - 'function abcdefghijklmnopqrstuvwxyz() {' + - '}' + - 'void [abcdefghijklmnopqrstuvwxyz];' - }, - { - sTitle: - 'Preservation of the identifier of a function expression.', - sInput: - 'void [' + - ' function abcdefghijklmnopqrstuvwxyz() {' + - ' },' + - ' function abcdefghijklmnopqrstuvwxyz() {' + - ' }' + - '];' - }, - { - sTitle: - 'Preservation of a formal parameter of a function declaration.', - sInput: - 'function foo(abcdefghijklmnopqrstuvwxyz) {' + - '}' + - 'function bar(abcdefghijklmnopqrstuvwxyz) {' + - '}' - }, - { - sTitle: - 'Preservation of a formal parameter in a function expression.', - sInput: - 'void [' + - ' function(abcdefghijklmnopqrstuvwxyz) {' + - ' },' + - ' function(abcdefghijklmnopqrstuvwxyz) {' + - ' }' + - '];' - }, - { - sTitle: - 'Exclusion of a function declaration.', - sInput: - 'void ["abcdefghijklmnopqrstuvwxyz"];' + - 'function foo() {' + - '}' + - 'void ["abcdefghijklmnopqrstuvwxyz"];' - }, - { - sTitle: - 'Consolidation within a function declaration.', - sInput: - 'function foo() {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - '}', - sOutput: - 'function foo() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}' - }, - // 14 Program. - { - sTitle: - 'Preservation of a program without source elements.', - sInput: - '' - }, - // 14.1 Directive Prologues and the Use Strict Directive. - { - sTitle: - 'Preservation of a Directive Prologue in global code.', - sInput: - '"abcdefghijklmnopqrstuvwxyz";' + - '\'zyxwvutsrqponmlkjihgfedcba\';' - }, - { - sTitle: - 'Preservation of a Directive Prologue in a function declaration.', - sInput: - 'function foo() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' \'zyxwvutsrqponmlkjihgfedcba\';' + - '}' - }, - { - sTitle: - 'Preservation of a Directive Prologue in a function expression.', - sInput: - 'void [' + - ' function() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' \'zyxwvutsrqponmlkjihgfedcba\';' + - ' }' + - '];' - }, - { - sTitle: - 'Ignorance with regard to a Directive Prologue in global code.', - sInput: - '"abcdefghijklmnopqrstuvwxyz";' + - 'void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];', - sOutput: - '"abcdefghijklmnopqrstuvwxyz";' + - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}());' - }, - { - sTitle: - 'Ignorance with regard to a Directive Prologue in a function' + - 'declaration.', - sInput: - 'function foo() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - '}', - sOutput: - 'function foo() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}' - }, - { - sTitle: - 'Ignorance with regard to a Directive Prologue in a function' + - 'expression.', - sInput: - '(function() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - '}());', - sOutput: - '(function() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}());' - }, - // 15.1 The Global Object. - { - sTitle: - 'Preservation of a property of the global object.', - sInput: - 'void [undefined, undefined, undefined, undefined, undefined];' - }, - // 15.1.2.1.1 Direct Call to Eval. - { - sTitle: - 'Exclusion of a direct call to the eval function in the same ' + - 'syntactic code unit.', - sInput: - '/*jshint evil:true */' + - 'void ["abcdefghijklmnopqrstuvwxyz"];' + - 'eval("");' + - 'void ["abcdefghijklmnopqrstuvwxyz"];' - }, - { - sTitle: - 'Exclusion of a direct call to the eval function in nested ' + - 'function code.', - sInput: - '/*jshint evil:true */' + - 'void ["abcdefghijklmnopqrstuvwxyz"];' + - '(function() {' + - ' eval("");' + - '}());' + - 'void ["abcdefghijklmnopqrstuvwxyz"];' - }, - { - sTitle: - 'Consolidation within a direct call to the eval function.', - sInput: - '/*jshint evil:true */' + - 'eval(function() {' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - '}());', - sOutput: - '/*jshint evil:true */' + - 'eval(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}());' - }, - // Consolidation proper. - { - sTitle: - 'No consolidation if it does not result in a reduction of the ' + - 'number of source characters.', - sInput: - '(function() {' + - ' var foo;' + - ' void ["ab", "ab", "abc", "abc"];' + - '}());' - }, - { - sTitle: - 'Identification of a range of source elements at the beginning ' + - 'of global code.', - sInput: - '/*jshint evil:true */' + - '"abcdefghijklmnopqrstuvwxyz";' + - 'void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - 'eval("");', - sOutput: - '/*jshint evil:true */' + - '"abcdefghijklmnopqrstuvwxyz";' + - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}());' + - 'eval("");' - }, - { - sTitle: - 'Identification of a range of source elements in the middle of ' + - 'global code.', - sInput: - '/*jshint evil:true */' + - '"abcdefghijklmnopqrstuvwxyz";' + - 'eval("");' + - 'void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - 'eval("");', - sOutput: - '/*jshint evil:true */' + - '"abcdefghijklmnopqrstuvwxyz";' + - 'eval("");' + - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}());' + - 'eval("");' - }, - { - sTitle: - 'Identification of a range of source elements at the end of ' + - 'global code.', - sInput: - '/*jshint evil:true */' + - '"abcdefghijklmnopqrstuvwxyz";' + - 'eval("");' + - 'void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];', - sOutput: - '/*jshint evil:true */' + - '"abcdefghijklmnopqrstuvwxyz";' + - 'eval("");' + - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}());' - }, - { - sTitle: - 'Identification of a range of source elements at the beginning ' + - 'of function code.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - ' eval("");' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' (function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - ' }());' + - ' eval("");' + - '}());' - }, - { - sTitle: - 'Identification of a range of source elements in the middle of ' + - 'function code.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' eval("");' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - ' eval("");' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' eval("");' + - ' (function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - ' }());' + - ' eval("");' + - '}());' - }, - { - sTitle: - 'Identification of a range of source elements at the end of ' + - 'function code.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' eval("");' + - ' void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' "abcdefghijklmnopqrstuvwxyz";' + - ' eval("");' + - ' (function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - ' }());' + - '}());' - }, - { - sTitle: - 'Evaluation with regard to String values of String literals and ' + - 'String values derived from identifier names used as property' + - 'accessors.', - sInput: - '(function() {' + - ' var foo;' + - ' void ["abcdefg", Math.abcdefg, "abcdef", Math.abcdef];' + - '}());', - sOutput: - '(function() {' + - ' var a = "abcdefg", foo;' + - ' void [a, Math[a], "abcdef", Math.abcdef];' + - '}());' - }, - { - sTitle: - 'Evaluation with regard to the necessity of adding a variable ' + - 'statement.', - sInput: - '/*jshint evil:true */' + - '(function() {' + - ' void ["abcdefgh", "abcdefgh"];' + - '}());' + - 'eval("");' + - '(function() {' + - ' void ["abcdefg", "abcdefg"];' + - '}());' + - 'eval("");' + - '(function() {' + - ' var foo;' + - ' void ["abcd", "abcd"];' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' var a = "abcdefgh";' + - ' void [a, a];' + - '}());' + - 'eval("");' + - '(function() {' + - ' void ["abcdefg", "abcdefg"];' + - '}());' + - 'eval("");' + - '(function() {' + - ' var a = "abcd", foo;' + - ' void [a, a];' + - '}());' - }, - { - sTitle: - 'Evaluation with regard to the necessity of enclosing source ' + - 'elements.', - sInput: - '/*jshint evil:true */' + - 'void ["abcdefghijklmnopqrstuvwxy", "abcdefghijklmnopqrstuvwxy"];' + - 'eval("");' + - 'void ["abcdefghijklmnopqrstuvwx", "abcdefghijklmnopqrstuvwx"];' + - 'eval("");' + - '(function() {' + - ' void ["abcdefgh", "abcdefgh"];' + - '}());' + - '(function() {' + - ' void ["abcdefghijklmnopqrstuvwxy",' + - ' "abcdefghijklmnopqrstuvwxy"];' + - ' eval("");' + - ' void ["abcdefghijklmnopqrstuvwx",' + - ' "abcdefghijklmnopqrstuvwx"];' + - ' eval("");' + - ' (function() {' + - ' void ["abcdefgh", "abcdefgh"];' + - ' }());' + - '}());', - sOutput: - '/*jshint evil:true */' + - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxy";' + - ' void [a, a];' + - '}());' + - 'eval("");' + - 'void ["abcdefghijklmnopqrstuvwx", "abcdefghijklmnopqrstuvwx"];' + - 'eval("");' + - '(function() {' + - ' var a = "abcdefgh";' + - ' void [a, a];' + - '}());' + - '(function() {' + - ' (function() {' + - ' var a = "abcdefghijklmnopqrstuvwxy";' + - ' void [a, a];' + - ' }());' + - ' eval("");' + - ' void ["abcdefghijklmnopqrstuvwx", "abcdefghijklmnopqrstuvwx"];' + - ' eval("");' + - ' (function() {' + - ' var a = "abcdefgh";' + - ' void [a, a];' + - ' }());' + - '}());' - }, - { - sTitle: - 'Employment of a closure while consolidating in global code.', - sInput: - 'void ["abcdefghijklmnopqrstuvwxyz",' + - ' "abcdefghijklmnopqrstuvwxyz"];', - sOutput: - '(function() {' + - ' var a = "abcdefghijklmnopqrstuvwxyz";' + - ' void [a, a];' + - '}());' - }, - { - sTitle: - 'Assignment of a shorter identifier to a value whose ' + - 'consolidation results in a greater reduction of the number of ' + - 'source characters.', - sInput: - '(function() {' + - ' var b, c, d, e, f, g, h, i, j, k, l, m,' + - ' n, o, p, q, r, s, t, u, v, w, x, y, z,' + - ' A, B, C, D, E, F, G, H, I, J, K, L, M,' + - ' N, O, P, Q, R, S, T, U, V, W, X, Y, Z,' + - ' $, _;' + - ' void ["abcde", "abcde", "edcba", "edcba", "edcba"];' + - '}());', - sOutput: - '(function() {' + - ' var a = "edcba",' + - ' b, c, d, e, f, g, h, i, j, k, l, m,' + - ' n, o, p, q, r, s, t, u, v, w, x, y, z,' + - ' A, B, C, D, E, F, G, H, I, J, K, L, M,' + - ' N, O, P, Q, R, S, T, U, V, W, X, Y, Z,' + - ' $, _;' + - ' void ["abcde", "abcde", a, a, a];' + - '}());' - } - ].forEach(cAssert); - }()); -} - -/* Local Variables: */ -/* mode: js */ -/* coding: utf-8 */ -/* indent-tabs-mode: nil */ -/* tab-width: 2 */ -/* End: */ -/* vim: set ft=javascript fenc=utf-8 et ts=2 sts=2 sw=2: */ -/* :mode=javascript:noTabs=true:tabSize=2:indentSize=2:deepIndent=true: */ - -}); -define('uglifyjs/parse-js', ["exports"], function(exports) { - -/*********************************************************************** - - A JavaScript tokenizer / parser / beautifier / compressor. - - This version is suitable for Node.js. With minimal changes (the - exports stuff) it should work on any JS platform. - - This file contains the tokenizer/parser. It is a port to JavaScript - of parse-js [1], a JavaScript parser library written in Common Lisp - by Marijn Haverbeke. Thank you Marijn! - - [1] http://marijn.haverbeke.nl/parse-js/ - - Exported functions: - - - tokenizer(code) -- returns a function. Call the returned - function to fetch the next token. - - - parse(code) -- returns an AST of the given JavaScript code. - - -------------------------------- (C) --------------------------------- - - Author: Mihai Bazon - - http://mihai.bazon.net/blog - - Distributed under the BSD license: - - Copyright 2010 (c) Mihai Bazon - Based on parse-js (http://marijn.haverbeke.nl/parse-js/). - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above - copyright notice, this list of conditions and the following - disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials - provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF - THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - - ***********************************************************************/ - -/* -----[ Tokenizer (constants) ]----- */ - -var KEYWORDS = array_to_hash([ - "break", - "case", - "catch", - "const", - "continue", - "debugger", - "default", - "delete", - "do", - "else", - "finally", - "for", - "function", - "if", - "in", - "instanceof", - "new", - "return", - "switch", - "throw", - "try", - "typeof", - "var", - "void", - "while", - "with" -]); - -var RESERVED_WORDS = array_to_hash([ - "abstract", - "boolean", - "byte", - "char", - "class", - "double", - "enum", - "export", - "extends", - "final", - "float", - "goto", - "implements", - "import", - "int", - "interface", - "long", - "native", - "package", - "private", - "protected", - "public", - "short", - "static", - "super", - "synchronized", - "throws", - "transient", - "volatile" -]); - -var KEYWORDS_BEFORE_EXPRESSION = array_to_hash([ - "return", - "new", - "delete", - "throw", - "else", - "case" -]); - -var KEYWORDS_ATOM = array_to_hash([ - "false", - "null", - "true", - "undefined" -]); - -var OPERATOR_CHARS = array_to_hash(characters("+-*&%=<>!?|~^")); - -var RE_HEX_NUMBER = /^0x[0-9a-f]+$/i; -var RE_OCT_NUMBER = /^0[0-7]+$/; -var RE_DEC_NUMBER = /^\d*\.?\d*(?:e[+-]?\d*(?:\d\.?|\.?\d)\d*)?$/i; - -var OPERATORS = array_to_hash([ - "in", - "instanceof", - "typeof", - "new", - "void", - "delete", - "++", - "--", - "+", - "-", - "!", - "~", - "&", - "|", - "^", - "*", - "/", - "%", - ">>", - "<<", - ">>>", - "<", - ">", - "<=", - ">=", - "==", - "===", - "!=", - "!==", - "?", - "=", - "+=", - "-=", - "/=", - "*=", - "%=", - ">>=", - "<<=", - ">>>=", - "|=", - "^=", - "&=", - "&&", - "||" -]); - -var WHITESPACE_CHARS = array_to_hash(characters(" \u00a0\n\r\t\f\u000b\u200b\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000")); - -var PUNC_BEFORE_EXPRESSION = array_to_hash(characters("[{(,.;:")); - -var PUNC_CHARS = array_to_hash(characters("[]{}(),;:")); - -var REGEXP_MODIFIERS = array_to_hash(characters("gmsiy")); - -/* -----[ Tokenizer ]----- */ - -// regexps adapted from http://xregexp.com/plugins/#unicode -var UNICODE = { - letter: new RegExp("[\\u0041-\\u005A\\u0061-\\u007A\\u00AA\\u00B5\\u00BA\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u0523\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0621-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971\\u0972\\u097B-\\u097F\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D28\\u0D2A-\\u0D39\\u0D3D\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC\\u0EDD\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8B\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10D0-\\u10FA\\u10FC\\u1100-\\u1159\\u115F-\\u11A2\\u11A8-\\u11F9\\u1200-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u1676\\u1681-\\u169A\\u16A0-\\u16EA\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u1900-\\u191C\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19A9\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u2094\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2183\\u2184\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2C6F\\u2C71-\\u2C7D\\u2C80-\\u2CE4\\u2D00-\\u2D25\\u2D30-\\u2D65\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005\\u3006\\u3031-\\u3035\\u303B\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31B7\\u31F0-\\u31FF\\u3400\\u4DB5\\u4E00\\u9FC3\\uA000-\\uA48C\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA65F\\uA662-\\uA66E\\uA67F-\\uA697\\uA717-\\uA71F\\uA722-\\uA788\\uA78B\\uA78C\\uA7FB-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA90A-\\uA925\\uA930-\\uA946\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAC00\\uD7A3\\uF900-\\uFA2D\\uFA30-\\uFA6A\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]"), - non_spacing_mark: new RegExp("[\\u0300-\\u036F\\u0483-\\u0487\\u0591-\\u05BD\\u05BF\\u05C1\\u05C2\\u05C4\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065E\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u07A6-\\u07B0\\u07EB-\\u07F3\\u0816-\\u0819\\u081B-\\u0823\\u0825-\\u0827\\u0829-\\u082D\\u0900-\\u0902\\u093C\\u0941-\\u0948\\u094D\\u0951-\\u0955\\u0962\\u0963\\u0981\\u09BC\\u09C1-\\u09C4\\u09CD\\u09E2\\u09E3\\u0A01\\u0A02\\u0A3C\\u0A41\\u0A42\\u0A47\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A70\\u0A71\\u0A75\\u0A81\\u0A82\\u0ABC\\u0AC1-\\u0AC5\\u0AC7\\u0AC8\\u0ACD\\u0AE2\\u0AE3\\u0B01\\u0B3C\\u0B3F\\u0B41-\\u0B44\\u0B4D\\u0B56\\u0B62\\u0B63\\u0B82\\u0BC0\\u0BCD\\u0C3E-\\u0C40\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55\\u0C56\\u0C62\\u0C63\\u0CBC\\u0CBF\\u0CC6\\u0CCC\\u0CCD\\u0CE2\\u0CE3\\u0D41-\\u0D44\\u0D4D\\u0D62\\u0D63\\u0DCA\\u0DD2-\\u0DD4\\u0DD6\\u0E31\\u0E34-\\u0E3A\\u0E47-\\u0E4E\\u0EB1\\u0EB4-\\u0EB9\\u0EBB\\u0EBC\\u0EC8-\\u0ECD\\u0F18\\u0F19\\u0F35\\u0F37\\u0F39\\u0F71-\\u0F7E\\u0F80-\\u0F84\\u0F86\\u0F87\\u0F90-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u102D-\\u1030\\u1032-\\u1037\\u1039\\u103A\\u103D\\u103E\\u1058\\u1059\\u105E-\\u1060\\u1071-\\u1074\\u1082\\u1085\\u1086\\u108D\\u109D\\u135F\\u1712-\\u1714\\u1732-\\u1734\\u1752\\u1753\\u1772\\u1773\\u17B7-\\u17BD\\u17C6\\u17C9-\\u17D3\\u17DD\\u180B-\\u180D\\u18A9\\u1920-\\u1922\\u1927\\u1928\\u1932\\u1939-\\u193B\\u1A17\\u1A18\\u1A56\\u1A58-\\u1A5E\\u1A60\\u1A62\\u1A65-\\u1A6C\\u1A73-\\u1A7C\\u1A7F\\u1B00-\\u1B03\\u1B34\\u1B36-\\u1B3A\\u1B3C\\u1B42\\u1B6B-\\u1B73\\u1B80\\u1B81\\u1BA2-\\u1BA5\\u1BA8\\u1BA9\\u1C2C-\\u1C33\\u1C36\\u1C37\\u1CD0-\\u1CD2\\u1CD4-\\u1CE0\\u1CE2-\\u1CE8\\u1CED\\u1DC0-\\u1DE6\\u1DFD-\\u1DFF\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2CEF-\\u2CF1\\u2DE0-\\u2DFF\\u302A-\\u302F\\u3099\\u309A\\uA66F\\uA67C\\uA67D\\uA6F0\\uA6F1\\uA802\\uA806\\uA80B\\uA825\\uA826\\uA8C4\\uA8E0-\\uA8F1\\uA926-\\uA92D\\uA947-\\uA951\\uA980-\\uA982\\uA9B3\\uA9B6-\\uA9B9\\uA9BC\\uAA29-\\uAA2E\\uAA31\\uAA32\\uAA35\\uAA36\\uAA43\\uAA4C\\uAAB0\\uAAB2-\\uAAB4\\uAAB7\\uAAB8\\uAABE\\uAABF\\uAAC1\\uABE5\\uABE8\\uABED\\uFB1E\\uFE00-\\uFE0F\\uFE20-\\uFE26]"), - space_combining_mark: new RegExp("[\\u0903\\u093E-\\u0940\\u0949-\\u094C\\u094E\\u0982\\u0983\\u09BE-\\u09C0\\u09C7\\u09C8\\u09CB\\u09CC\\u09D7\\u0A03\\u0A3E-\\u0A40\\u0A83\\u0ABE-\\u0AC0\\u0AC9\\u0ACB\\u0ACC\\u0B02\\u0B03\\u0B3E\\u0B40\\u0B47\\u0B48\\u0B4B\\u0B4C\\u0B57\\u0BBE\\u0BBF\\u0BC1\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCC\\u0BD7\\u0C01-\\u0C03\\u0C41-\\u0C44\\u0C82\\u0C83\\u0CBE\\u0CC0-\\u0CC4\\u0CC7\\u0CC8\\u0CCA\\u0CCB\\u0CD5\\u0CD6\\u0D02\\u0D03\\u0D3E-\\u0D40\\u0D46-\\u0D48\\u0D4A-\\u0D4C\\u0D57\\u0D82\\u0D83\\u0DCF-\\u0DD1\\u0DD8-\\u0DDF\\u0DF2\\u0DF3\\u0F3E\\u0F3F\\u0F7F\\u102B\\u102C\\u1031\\u1038\\u103B\\u103C\\u1056\\u1057\\u1062-\\u1064\\u1067-\\u106D\\u1083\\u1084\\u1087-\\u108C\\u108F\\u109A-\\u109C\\u17B6\\u17BE-\\u17C5\\u17C7\\u17C8\\u1923-\\u1926\\u1929-\\u192B\\u1930\\u1931\\u1933-\\u1938\\u19B0-\\u19C0\\u19C8\\u19C9\\u1A19-\\u1A1B\\u1A55\\u1A57\\u1A61\\u1A63\\u1A64\\u1A6D-\\u1A72\\u1B04\\u1B35\\u1B3B\\u1B3D-\\u1B41\\u1B43\\u1B44\\u1B82\\u1BA1\\u1BA6\\u1BA7\\u1BAA\\u1C24-\\u1C2B\\u1C34\\u1C35\\u1CE1\\u1CF2\\uA823\\uA824\\uA827\\uA880\\uA881\\uA8B4-\\uA8C3\\uA952\\uA953\\uA983\\uA9B4\\uA9B5\\uA9BA\\uA9BB\\uA9BD-\\uA9C0\\uAA2F\\uAA30\\uAA33\\uAA34\\uAA4D\\uAA7B\\uABE3\\uABE4\\uABE6\\uABE7\\uABE9\\uABEA\\uABEC]"), - connector_punctuation: new RegExp("[\\u005F\\u203F\\u2040\\u2054\\uFE33\\uFE34\\uFE4D-\\uFE4F\\uFF3F]") -}; - -function is_letter(ch) { - return UNICODE.letter.test(ch); -}; - -function is_digit(ch) { - ch = ch.charCodeAt(0); - return ch >= 48 && ch <= 57; //XXX: find out if "UnicodeDigit" means something else than 0..9 -}; - -function is_alphanumeric_char(ch) { - return is_digit(ch) || is_letter(ch); -}; - -function is_unicode_combining_mark(ch) { - return UNICODE.non_spacing_mark.test(ch) || UNICODE.space_combining_mark.test(ch); -}; - -function is_unicode_connector_punctuation(ch) { - return UNICODE.connector_punctuation.test(ch); -}; - -function is_identifier_start(ch) { - return ch == "$" || ch == "_" || is_letter(ch); -}; - -function is_identifier_char(ch) { - return is_identifier_start(ch) - || is_unicode_combining_mark(ch) - || is_digit(ch) - || is_unicode_connector_punctuation(ch) - || ch == "\u200c" // zero-width non-joiner - || ch == "\u200d" // zero-width joiner (in my ECMA-262 PDF, this is also 200c) - ; -}; - -function parse_js_number(num) { - if (RE_HEX_NUMBER.test(num)) { - return parseInt(num.substr(2), 16); - } else if (RE_OCT_NUMBER.test(num)) { - return parseInt(num.substr(1), 8); - } else if (RE_DEC_NUMBER.test(num)) { - return parseFloat(num); - } -}; - -function JS_Parse_Error(message, line, col, pos) { - this.message = message; - this.line = line + 1; - this.col = col + 1; - this.pos = pos + 1; - this.stack = new Error().stack; -}; - -JS_Parse_Error.prototype.toString = function() { - return this.message + " (line: " + this.line + ", col: " + this.col + ", pos: " + this.pos + ")" + "\n\n" + this.stack; -}; - -function js_error(message, line, col, pos) { - throw new JS_Parse_Error(message, line, col, pos); -}; - -function is_token(token, type, val) { - return token.type == type && (val == null || token.value == val); -}; - -var EX_EOF = {}; - -function tokenizer($TEXT) { - - var S = { - text : $TEXT.replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, ''), - pos : 0, - tokpos : 0, - line : 0, - tokline : 0, - col : 0, - tokcol : 0, - newline_before : false, - regex_allowed : false, - comments_before : [] - }; - - function peek() { return S.text.charAt(S.pos); }; - - function next(signal_eof, in_string) { - var ch = S.text.charAt(S.pos++); - if (signal_eof && !ch) - throw EX_EOF; - if (ch == "\n") { - S.newline_before = S.newline_before || !in_string; - ++S.line; - S.col = 0; - } else { - ++S.col; - } - return ch; - }; - - function eof() { - return !S.peek(); - }; - - function find(what, signal_eof) { - var pos = S.text.indexOf(what, S.pos); - if (signal_eof && pos == -1) throw EX_EOF; - return pos; - }; - - function start_token() { - S.tokline = S.line; - S.tokcol = S.col; - S.tokpos = S.pos; - }; - - function token(type, value, is_comment) { - S.regex_allowed = ((type == "operator" && !HOP(UNARY_POSTFIX, value)) || - (type == "keyword" && HOP(KEYWORDS_BEFORE_EXPRESSION, value)) || - (type == "punc" && HOP(PUNC_BEFORE_EXPRESSION, value))); - var ret = { - type : type, - value : value, - line : S.tokline, - col : S.tokcol, - pos : S.tokpos, - endpos : S.pos, - nlb : S.newline_before - }; - if (!is_comment) { - ret.comments_before = S.comments_before; - S.comments_before = []; - } - S.newline_before = false; - return ret; - }; - - function skip_whitespace() { - while (HOP(WHITESPACE_CHARS, peek())) - next(); - }; - - function read_while(pred) { - var ret = "", ch = peek(), i = 0; - while (ch && pred(ch, i++)) { - ret += next(); - ch = peek(); - } - return ret; - }; - - function parse_error(err) { - js_error(err, S.tokline, S.tokcol, S.tokpos); - }; - - function read_num(prefix) { - var has_e = false, after_e = false, has_x = false, has_dot = prefix == "."; - var num = read_while(function(ch, i){ - if (ch == "x" || ch == "X") { - if (has_x) return false; - return has_x = true; - } - if (!has_x && (ch == "E" || ch == "e")) { - if (has_e) return false; - return has_e = after_e = true; - } - if (ch == "-") { - if (after_e || (i == 0 && !prefix)) return true; - return false; - } - if (ch == "+") return after_e; - after_e = false; - if (ch == ".") { - if (!has_dot && !has_x) - return has_dot = true; - return false; - } - return is_alphanumeric_char(ch); - }); - if (prefix) - num = prefix + num; - var valid = parse_js_number(num); - if (!isNaN(valid)) { - return token("num", valid); - } else { - parse_error("Invalid syntax: " + num); - } - }; - - function read_escaped_char(in_string) { - var ch = next(true, in_string); - switch (ch) { - case "n" : return "\n"; - case "r" : return "\r"; - case "t" : return "\t"; - case "b" : return "\b"; - case "v" : return "\u000b"; - case "f" : return "\f"; - case "0" : return "\0"; - case "x" : return String.fromCharCode(hex_bytes(2)); - case "u" : return String.fromCharCode(hex_bytes(4)); - case "\n": return ""; - default : return ch; - } - }; - - function hex_bytes(n) { - var num = 0; - for (; n > 0; --n) { - var digit = parseInt(next(true), 16); - if (isNaN(digit)) - parse_error("Invalid hex-character pattern in string"); - num = (num << 4) | digit; - } - return num; - }; - - function read_string() { - return with_eof_error("Unterminated string constant", function(){ - var quote = next(), ret = ""; - for (;;) { - var ch = next(true); - if (ch == "\\") { - // read OctalEscapeSequence (XXX: deprecated if "strict mode") - // https://github.com/mishoo/UglifyJS/issues/178 - var octal_len = 0, first = null; - ch = read_while(function(ch){ - if (ch >= "0" && ch <= "7") { - if (!first) { - first = ch; - return ++octal_len; - } - else if (first <= "3" && octal_len <= 2) return ++octal_len; - else if (first >= "4" && octal_len <= 1) return ++octal_len; - } - return false; - }); - if (octal_len > 0) ch = String.fromCharCode(parseInt(ch, 8)); - else ch = read_escaped_char(true); - } - else if (ch == quote) break; - ret += ch; - } - return token("string", ret); - }); - }; - - function read_line_comment() { - next(); - var i = find("\n"), ret; - if (i == -1) { - ret = S.text.substr(S.pos); - S.pos = S.text.length; - } else { - ret = S.text.substring(S.pos, i); - S.pos = i; - } - return token("comment1", ret, true); - }; - - function read_multiline_comment() { - next(); - return with_eof_error("Unterminated multiline comment", function(){ - var i = find("*/", true), - text = S.text.substring(S.pos, i); - S.pos = i + 2; - S.line += text.split("\n").length - 1; - S.newline_before = text.indexOf("\n") >= 0; - - // https://github.com/mishoo/UglifyJS/issues/#issue/100 - if (/^@cc_on/i.test(text)) { - warn("WARNING: at line " + S.line); - warn("*** Found \"conditional comment\": " + text); - warn("*** UglifyJS DISCARDS ALL COMMENTS. This means your code might no longer work properly in Internet Explorer."); - } - - return token("comment2", text, true); - }); - }; - - function read_name() { - var backslash = false, name = "", ch, escaped = false, hex; - while ((ch = peek()) != null) { - if (!backslash) { - if (ch == "\\") escaped = backslash = true, next(); - else if (is_identifier_char(ch)) name += next(); - else break; - } - else { - if (ch != "u") parse_error("Expecting UnicodeEscapeSequence -- uXXXX"); - ch = read_escaped_char(); - if (!is_identifier_char(ch)) parse_error("Unicode char: " + ch.charCodeAt(0) + " is not valid in identifier"); - name += ch; - backslash = false; - } - } - if (HOP(KEYWORDS, name) && escaped) { - hex = name.charCodeAt(0).toString(16).toUpperCase(); - name = "\\u" + "0000".substr(hex.length) + hex + name.slice(1); - } - return name; - }; - - function read_regexp(regexp) { - return with_eof_error("Unterminated regular expression", function(){ - var prev_backslash = false, ch, in_class = false; - while ((ch = next(true))) if (prev_backslash) { - regexp += "\\" + ch; - prev_backslash = false; - } else if (ch == "[") { - in_class = true; - regexp += ch; - } else if (ch == "]" && in_class) { - in_class = false; - regexp += ch; - } else if (ch == "/" && !in_class) { - break; - } else if (ch == "\\") { - prev_backslash = true; - } else { - regexp += ch; - } - var mods = read_name(); - return token("regexp", [ regexp, mods ]); - }); - }; - - function read_operator(prefix) { - function grow(op) { - if (!peek()) return op; - var bigger = op + peek(); - if (HOP(OPERATORS, bigger)) { - next(); - return grow(bigger); - } else { - return op; - } - }; - return token("operator", grow(prefix || next())); - }; - - function handle_slash() { - next(); - var regex_allowed = S.regex_allowed; - switch (peek()) { - case "/": - S.comments_before.push(read_line_comment()); - S.regex_allowed = regex_allowed; - return next_token(); - case "*": - S.comments_before.push(read_multiline_comment()); - S.regex_allowed = regex_allowed; - return next_token(); - } - return S.regex_allowed ? read_regexp("") : read_operator("/"); - }; - - function handle_dot() { - next(); - return is_digit(peek()) - ? read_num(".") - : token("punc", "."); - }; - - function read_word() { - var word = read_name(); - return !HOP(KEYWORDS, word) - ? token("name", word) - : HOP(OPERATORS, word) - ? token("operator", word) - : HOP(KEYWORDS_ATOM, word) - ? token("atom", word) - : token("keyword", word); - }; - - function with_eof_error(eof_error, cont) { - try { - return cont(); - } catch(ex) { - if (ex === EX_EOF) parse_error(eof_error); - else throw ex; - } - }; - - function next_token(force_regexp) { - if (force_regexp != null) - return read_regexp(force_regexp); - skip_whitespace(); - start_token(); - var ch = peek(); - if (!ch) return token("eof"); - if (is_digit(ch)) return read_num(); - if (ch == '"' || ch == "'") return read_string(); - if (HOP(PUNC_CHARS, ch)) return token("punc", next()); - if (ch == ".") return handle_dot(); - if (ch == "/") return handle_slash(); - if (HOP(OPERATOR_CHARS, ch)) return read_operator(); - if (ch == "\\" || is_identifier_start(ch)) return read_word(); - parse_error("Unexpected character '" + ch + "'"); - }; - - next_token.context = function(nc) { - if (nc) S = nc; - return S; - }; - - return next_token; - -}; - -/* -----[ Parser (constants) ]----- */ - -var UNARY_PREFIX = array_to_hash([ - "typeof", - "void", - "delete", - "--", - "++", - "!", - "~", - "-", - "+" -]); - -var UNARY_POSTFIX = array_to_hash([ "--", "++" ]); - -var ASSIGNMENT = (function(a, ret, i){ - while (i < a.length) { - ret[a[i]] = a[i].substr(0, a[i].length - 1); - i++; - } - return ret; -})( - ["+=", "-=", "/=", "*=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&="], - { "=": true }, - 0 -); - -var PRECEDENCE = (function(a, ret){ - for (var i = 0, n = 1; i < a.length; ++i, ++n) { - var b = a[i]; - for (var j = 0; j < b.length; ++j) { - ret[b[j]] = n; - } - } - return ret; -})( - [ - ["||"], - ["&&"], - ["|"], - ["^"], - ["&"], - ["==", "===", "!=", "!=="], - ["<", ">", "<=", ">=", "in", "instanceof"], - [">>", "<<", ">>>"], - ["+", "-"], - ["*", "/", "%"] - ], - {} -); - -var STATEMENTS_WITH_LABELS = array_to_hash([ "for", "do", "while", "switch" ]); - -var ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "name" ]); - -/* -----[ Parser ]----- */ - -function NodeWithToken(str, start, end) { - this.name = str; - this.start = start; - this.end = end; -}; - -NodeWithToken.prototype.toString = function() { return this.name; }; - -function parse($TEXT, exigent_mode, embed_tokens) { - - var S = { - input : typeof $TEXT == "string" ? tokenizer($TEXT, true) : $TEXT, - token : null, - prev : null, - peeked : null, - in_function : 0, - in_loop : 0, - labels : [] - }; - - S.token = next(); - - function is(type, value) { - return is_token(S.token, type, value); - }; - - function peek() { return S.peeked || (S.peeked = S.input()); }; - - function next() { - S.prev = S.token; - if (S.peeked) { - S.token = S.peeked; - S.peeked = null; - } else { - S.token = S.input(); - } - return S.token; - }; - - function prev() { - return S.prev; - }; - - function croak(msg, line, col, pos) { - var ctx = S.input.context(); - js_error(msg, - line != null ? line : ctx.tokline, - col != null ? col : ctx.tokcol, - pos != null ? pos : ctx.tokpos); - }; - - function token_error(token, msg) { - croak(msg, token.line, token.col); - }; - - function unexpected(token) { - if (token == null) - token = S.token; - token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")"); - }; - - function expect_token(type, val) { - if (is(type, val)) { - return next(); - } - token_error(S.token, "Unexpected token " + S.token.type + ", expected " + type); - }; - - function expect(punc) { return expect_token("punc", punc); }; - - function can_insert_semicolon() { - return !exigent_mode && ( - S.token.nlb || is("eof") || is("punc", "}") - ); - }; - - function semicolon() { - if (is("punc", ";")) next(); - else if (!can_insert_semicolon()) unexpected(); - }; - - function as() { - return slice(arguments); - }; - - function parenthesised() { - expect("("); - var ex = expression(); - expect(")"); - return ex; - }; - - function add_tokens(str, start, end) { - return str instanceof NodeWithToken ? str : new NodeWithToken(str, start, end); - }; - - function maybe_embed_tokens(parser) { - if (embed_tokens) return function() { - var start = S.token; - var ast = parser.apply(this, arguments); - ast[0] = add_tokens(ast[0], start, prev()); - return ast; - }; - else return parser; - }; - - var statement = maybe_embed_tokens(function() { - if (is("operator", "/") || is("operator", "/=")) { - S.peeked = null; - S.token = S.input(S.token.value.substr(1)); // force regexp - } - switch (S.token.type) { - case "num": - case "string": - case "regexp": - case "operator": - case "atom": - return simple_statement(); - - case "name": - return is_token(peek(), "punc", ":") - ? labeled_statement(prog1(S.token.value, next, next)) - : simple_statement(); - - case "punc": - switch (S.token.value) { - case "{": - return as("block", block_()); - case "[": - case "(": - return simple_statement(); - case ";": - next(); - return as("block"); - default: - unexpected(); - } - - case "keyword": - switch (prog1(S.token.value, next)) { - case "break": - return break_cont("break"); - - case "continue": - return break_cont("continue"); - - case "debugger": - semicolon(); - return as("debugger"); - - case "do": - return (function(body){ - expect_token("keyword", "while"); - return as("do", prog1(parenthesised, semicolon), body); - })(in_loop(statement)); - - case "for": - return for_(); - - case "function": - return function_(true); - - case "if": - return if_(); - - case "return": - if (S.in_function == 0) - croak("'return' outside of function"); - return as("return", - is("punc", ";") - ? (next(), null) - : can_insert_semicolon() - ? null - : prog1(expression, semicolon)); - - case "switch": - return as("switch", parenthesised(), switch_block_()); - - case "throw": - if (S.token.nlb) - croak("Illegal newline after 'throw'"); - return as("throw", prog1(expression, semicolon)); - - case "try": - return try_(); - - case "var": - return prog1(var_, semicolon); - - case "const": - return prog1(const_, semicolon); - - case "while": - return as("while", parenthesised(), in_loop(statement)); - - case "with": - return as("with", parenthesised(), statement()); - - default: - unexpected(); - } - } - }); - - function labeled_statement(label) { - S.labels.push(label); - var start = S.token, stat = statement(); - if (exigent_mode && !HOP(STATEMENTS_WITH_LABELS, stat[0])) - unexpected(start); - S.labels.pop(); - return as("label", label, stat); - }; - - function simple_statement() { - return as("stat", prog1(expression, semicolon)); - }; - - function break_cont(type) { - var name; - if (!can_insert_semicolon()) { - name = is("name") ? S.token.value : null; - } - if (name != null) { - next(); - if (!member(name, S.labels)) - croak("Label " + name + " without matching loop or statement"); - } - else if (S.in_loop == 0) - croak(type + " not inside a loop or switch"); - semicolon(); - return as(type, name); - }; - - function for_() { - expect("("); - var init = null; - if (!is("punc", ";")) { - init = is("keyword", "var") - ? (next(), var_(true)) - : expression(true, true); - if (is("operator", "in")) { - if (init[0] == "var" && init[1].length > 1) - croak("Only one variable declaration allowed in for..in loop"); - return for_in(init); - } - } - return regular_for(init); - }; - - function regular_for(init) { - expect(";"); - var test = is("punc", ";") ? null : expression(); - expect(";"); - var step = is("punc", ")") ? null : expression(); - expect(")"); - return as("for", init, test, step, in_loop(statement)); - }; - - function for_in(init) { - var lhs = init[0] == "var" ? as("name", init[1][0]) : init; - next(); - var obj = expression(); - expect(")"); - return as("for-in", init, lhs, obj, in_loop(statement)); - }; - - var function_ = function(in_statement) { - var name = is("name") ? prog1(S.token.value, next) : null; - if (in_statement && !name) - unexpected(); - expect("("); - return as(in_statement ? "defun" : "function", - name, - // arguments - (function(first, a){ - while (!is("punc", ")")) { - if (first) first = false; else expect(","); - if (!is("name")) unexpected(); - a.push(S.token.value); - next(); - } - next(); - return a; - })(true, []), - // body - (function(){ - ++S.in_function; - var loop = S.in_loop; - S.in_loop = 0; - var a = block_(); - --S.in_function; - S.in_loop = loop; - return a; - })()); - }; - - function if_() { - var cond = parenthesised(), body = statement(), belse; - if (is("keyword", "else")) { - next(); - belse = statement(); - } - return as("if", cond, body, belse); - }; - - function block_() { - expect("{"); - var a = []; - while (!is("punc", "}")) { - if (is("eof")) unexpected(); - a.push(statement()); - } - next(); - return a; - }; - - var switch_block_ = curry(in_loop, function(){ - expect("{"); - var a = [], cur = null; - while (!is("punc", "}")) { - if (is("eof")) unexpected(); - if (is("keyword", "case")) { - next(); - cur = []; - a.push([ expression(), cur ]); - expect(":"); - } - else if (is("keyword", "default")) { - next(); - expect(":"); - cur = []; - a.push([ null, cur ]); - } - else { - if (!cur) unexpected(); - cur.push(statement()); - } - } - next(); - return a; - }); - - function try_() { - var body = block_(), bcatch, bfinally; - if (is("keyword", "catch")) { - next(); - expect("("); - if (!is("name")) - croak("Name expected"); - var name = S.token.value; - next(); - expect(")"); - bcatch = [ name, block_() ]; - } - if (is("keyword", "finally")) { - next(); - bfinally = block_(); - } - if (!bcatch && !bfinally) - croak("Missing catch/finally blocks"); - return as("try", body, bcatch, bfinally); - }; - - function vardefs(no_in) { - var a = []; - for (;;) { - if (!is("name")) - unexpected(); - var name = S.token.value; - next(); - if (is("operator", "=")) { - next(); - a.push([ name, expression(false, no_in) ]); - } else { - a.push([ name ]); - } - if (!is("punc", ",")) - break; - next(); - } - return a; - }; - - function var_(no_in) { - return as("var", vardefs(no_in)); - }; - - function const_() { - return as("const", vardefs()); - }; - - function new_() { - var newexp = expr_atom(false), args; - if (is("punc", "(")) { - next(); - args = expr_list(")"); - } else { - args = []; - } - return subscripts(as("new", newexp, args), true); - }; - - var expr_atom = maybe_embed_tokens(function(allow_calls) { - if (is("operator", "new")) { - next(); - return new_(); - } - if (is("punc")) { - switch (S.token.value) { - case "(": - next(); - return subscripts(prog1(expression, curry(expect, ")")), allow_calls); - case "[": - next(); - return subscripts(array_(), allow_calls); - case "{": - next(); - return subscripts(object_(), allow_calls); - } - unexpected(); - } - if (is("keyword", "function")) { - next(); - return subscripts(function_(false), allow_calls); - } - if (HOP(ATOMIC_START_TOKEN, S.token.type)) { - var atom = S.token.type == "regexp" - ? as("regexp", S.token.value[0], S.token.value[1]) - : as(S.token.type, S.token.value); - return subscripts(prog1(atom, next), allow_calls); - } - unexpected(); - }); - - function expr_list(closing, allow_trailing_comma, allow_empty) { - var first = true, a = []; - while (!is("punc", closing)) { - if (first) first = false; else expect(","); - if (allow_trailing_comma && is("punc", closing)) break; - if (is("punc", ",") && allow_empty) { - a.push([ "atom", "undefined" ]); - } else { - a.push(expression(false)); - } - } - next(); - return a; - }; - - function array_() { - return as("array", expr_list("]", !exigent_mode, true)); - }; - - function object_() { - var first = true, a = []; - while (!is("punc", "}")) { - if (first) first = false; else expect(","); - if (!exigent_mode && is("punc", "}")) - // allow trailing comma - break; - var type = S.token.type; - var name = as_property_name(); - if (type == "name" && (name == "get" || name == "set") && !is("punc", ":")) { - a.push([ as_name(), function_(false), name ]); - } else { - expect(":"); - a.push([ name, expression(false) ]); - } - } - next(); - return as("object", a); - }; - - function as_property_name() { - switch (S.token.type) { - case "num": - case "string": - return prog1(S.token.value, next); - } - return as_name(); - }; - - function as_name() { - switch (S.token.type) { - case "name": - case "operator": - case "keyword": - case "atom": - return prog1(S.token.value, next); - default: - unexpected(); - } - }; - - function subscripts(expr, allow_calls) { - if (is("punc", ".")) { - next(); - return subscripts(as("dot", expr, as_name()), allow_calls); - } - if (is("punc", "[")) { - next(); - return subscripts(as("sub", expr, prog1(expression, curry(expect, "]"))), allow_calls); - } - if (allow_calls && is("punc", "(")) { - next(); - return subscripts(as("call", expr, expr_list(")")), true); - } - return expr; - }; - - function maybe_unary(allow_calls) { - if (is("operator") && HOP(UNARY_PREFIX, S.token.value)) { - return make_unary("unary-prefix", - prog1(S.token.value, next), - maybe_unary(allow_calls)); - } - var val = expr_atom(allow_calls); - while (is("operator") && HOP(UNARY_POSTFIX, S.token.value) && !S.token.nlb) { - val = make_unary("unary-postfix", S.token.value, val); - next(); - } - return val; - }; - - function make_unary(tag, op, expr) { - if ((op == "++" || op == "--") && !is_assignable(expr)) - croak("Invalid use of " + op + " operator"); - return as(tag, op, expr); - }; - - function expr_op(left, min_prec, no_in) { - var op = is("operator") ? S.token.value : null; - if (op && op == "in" && no_in) op = null; - var prec = op != null ? PRECEDENCE[op] : null; - if (prec != null && prec > min_prec) { - next(); - var right = expr_op(maybe_unary(true), prec, no_in); - return expr_op(as("binary", op, left, right), min_prec, no_in); - } - return left; - }; - - function expr_ops(no_in) { - return expr_op(maybe_unary(true), 0, no_in); - }; - - function maybe_conditional(no_in) { - var expr = expr_ops(no_in); - if (is("operator", "?")) { - next(); - var yes = expression(false); - expect(":"); - return as("conditional", expr, yes, expression(false, no_in)); - } - return expr; - }; - - function is_assignable(expr) { - if (!exigent_mode) return true; - switch (expr[0]+"") { - case "dot": - case "sub": - case "new": - case "call": - return true; - case "name": - return expr[1] != "this"; - } - }; - - function maybe_assign(no_in) { - var left = maybe_conditional(no_in), val = S.token.value; - if (is("operator") && HOP(ASSIGNMENT, val)) { - if (is_assignable(left)) { - next(); - return as("assign", ASSIGNMENT[val], left, maybe_assign(no_in)); - } - croak("Invalid assignment"); - } - return left; - }; - - var expression = maybe_embed_tokens(function(commas, no_in) { - if (arguments.length == 0) - commas = true; - var expr = maybe_assign(no_in); - if (commas && is("punc", ",")) { - next(); - return as("seq", expr, expression(true, no_in)); - } - return expr; - }); - - function in_loop(cont) { - try { - ++S.in_loop; - return cont(); - } finally { - --S.in_loop; - } - }; - - return as("toplevel", (function(a){ - while (!is("eof")) - a.push(statement()); - return a; - })([])); - -}; - -/* -----[ Utilities ]----- */ - -function curry(f) { - var args = slice(arguments, 1); - return function() { return f.apply(this, args.concat(slice(arguments))); }; -}; - -function prog1(ret) { - if (ret instanceof Function) - ret = ret(); - for (var i = 1, n = arguments.length; --n > 0; ++i) - arguments[i](); - return ret; -}; - -function array_to_hash(a) { - var ret = {}; - for (var i = 0; i < a.length; ++i) - ret[a[i]] = true; - return ret; -}; - -function slice(a, start) { - return Array.prototype.slice.call(a, start || 0); -}; - -function characters(str) { - return str.split(""); -}; - -function member(name, array) { - for (var i = array.length; --i >= 0;) - if (array[i] == name) - return true; - return false; -}; - -function HOP(obj, prop) { - return Object.prototype.hasOwnProperty.call(obj, prop); -}; - -var warn = function() {}; - -/* -----[ Exports ]----- */ - -exports.tokenizer = tokenizer; -exports.parse = parse; -exports.slice = slice; -exports.curry = curry; -exports.member = member; -exports.array_to_hash = array_to_hash; -exports.PRECEDENCE = PRECEDENCE; -exports.KEYWORDS_ATOM = KEYWORDS_ATOM; -exports.RESERVED_WORDS = RESERVED_WORDS; -exports.KEYWORDS = KEYWORDS; -exports.ATOMIC_START_TOKEN = ATOMIC_START_TOKEN; -exports.OPERATORS = OPERATORS; -exports.is_alphanumeric_char = is_alphanumeric_char; -exports.set_logger = function(logger) { - warn = logger; -}; - -}); -define('uglifyjs/squeeze-more', ["require", "exports", "module", "./parse-js", "./process"], function(require, exports, module) { - -var jsp = require("./parse-js"), - pro = require("./process"), - slice = jsp.slice, - member = jsp.member, - curry = jsp.curry, - MAP = pro.MAP, - PRECEDENCE = jsp.PRECEDENCE, - OPERATORS = jsp.OPERATORS; - -function ast_squeeze_more(ast) { - var w = pro.ast_walker(), walk = w.walk, scope; - function with_scope(s, cont) { - var save = scope, ret; - scope = s; - ret = cont(); - scope = save; - return ret; - }; - function _lambda(name, args, body) { - return [ this[0], name, args, with_scope(body.scope, curry(MAP, body, walk)) ]; - }; - return w.with_walkers({ - "toplevel": function(body) { - return [ this[0], with_scope(this.scope, curry(MAP, body, walk)) ]; - }, - "function": _lambda, - "defun": _lambda, - "new": function(ctor, args) { - if (ctor[0] == "name") { - if (ctor[1] == "Array" && !scope.has("Array")) { - if (args.length != 1) { - return [ "array", args ]; - } else { - return walk([ "call", [ "name", "Array" ], args ]); - } - } else if (ctor[1] == "Object" && !scope.has("Object")) { - if (!args.length) { - return [ "object", [] ]; - } else { - return walk([ "call", [ "name", "Object" ], args ]); - } - } else if ((ctor[1] == "RegExp" || ctor[1] == "Function" || ctor[1] == "Error") && !scope.has(ctor[1])) { - return walk([ "call", [ "name", ctor[1] ], args]); - } - } - }, - "call": function(expr, args) { - if (expr[0] == "dot" && expr[1][0] == "string" && args.length == 1 - && (args[0][1] > 0 && expr[2] == "substring" || expr[2] == "substr")) { - return [ "call", [ "dot", expr[1], "slice"], args]; - } - if (expr[0] == "dot" && expr[2] == "toString" && args.length == 0) { - // foo.toString() ==> foo+"" - return [ "binary", "+", expr[1], [ "string", "" ]]; - } - if (expr[0] == "name") { - if (expr[1] == "Array" && args.length != 1 && !scope.has("Array")) { - return [ "array", args ]; - } - if (expr[1] == "Object" && !args.length && !scope.has("Object")) { - return [ "object", [] ]; - } - if (expr[1] == "String" && !scope.has("String")) { - return [ "binary", "+", args[0], [ "string", "" ]]; - } - } - } - }, function() { - return walk(pro.ast_add_scope(ast)); - }); -}; - -exports.ast_squeeze_more = ast_squeeze_more; - -});define('uglifyjs/process', ["require", "exports", "module", "./parse-js", "./squeeze-more"], function(require, exports, module) { - -/*********************************************************************** - - A JavaScript tokenizer / parser / beautifier / compressor. - - This version is suitable for Node.js. With minimal changes (the - exports stuff) it should work on any JS platform. - - This file implements some AST processors. They work on data built - by parse-js. - - Exported functions: - - - ast_mangle(ast, options) -- mangles the variable/function names - in the AST. Returns an AST. - - - ast_squeeze(ast) -- employs various optimizations to make the - final generated code even smaller. Returns an AST. - - - gen_code(ast, options) -- generates JS code from the AST. Pass - true (or an object, see the code for some options) as second - argument to get "pretty" (indented) code. - - -------------------------------- (C) --------------------------------- - - Author: Mihai Bazon - - http://mihai.bazon.net/blog - - Distributed under the BSD license: - - Copyright 2010 (c) Mihai Bazon - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above - copyright notice, this list of conditions and the following - disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials - provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF - THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - - ***********************************************************************/ - -var jsp = require("./parse-js"), - slice = jsp.slice, - member = jsp.member, - PRECEDENCE = jsp.PRECEDENCE, - OPERATORS = jsp.OPERATORS; - -/* -----[ helper for AST traversal ]----- */ - -function ast_walker() { - function _vardefs(defs) { - return [ this[0], MAP(defs, function(def){ - var a = [ def[0] ]; - if (def.length > 1) - a[1] = walk(def[1]); - return a; - }) ]; - }; - function _block(statements) { - var out = [ this[0] ]; - if (statements != null) - out.push(MAP(statements, walk)); - return out; - }; - var walkers = { - "string": function(str) { - return [ this[0], str ]; - }, - "num": function(num) { - return [ this[0], num ]; - }, - "name": function(name) { - return [ this[0], name ]; - }, - "toplevel": function(statements) { - return [ this[0], MAP(statements, walk) ]; - }, - "block": _block, - "splice": _block, - "var": _vardefs, - "const": _vardefs, - "try": function(t, c, f) { - return [ - this[0], - MAP(t, walk), - c != null ? [ c[0], MAP(c[1], walk) ] : null, - f != null ? MAP(f, walk) : null - ]; - }, - "throw": function(expr) { - return [ this[0], walk(expr) ]; - }, - "new": function(ctor, args) { - return [ this[0], walk(ctor), MAP(args, walk) ]; - }, - "switch": function(expr, body) { - return [ this[0], walk(expr), MAP(body, function(branch){ - return [ branch[0] ? walk(branch[0]) : null, - MAP(branch[1], walk) ]; - }) ]; - }, - "break": function(label) { - return [ this[0], label ]; - }, - "continue": function(label) { - return [ this[0], label ]; - }, - "conditional": function(cond, t, e) { - return [ this[0], walk(cond), walk(t), walk(e) ]; - }, - "assign": function(op, lvalue, rvalue) { - return [ this[0], op, walk(lvalue), walk(rvalue) ]; - }, - "dot": function(expr) { - return [ this[0], walk(expr) ].concat(slice(arguments, 1)); - }, - "call": function(expr, args) { - return [ this[0], walk(expr), MAP(args, walk) ]; - }, - "function": function(name, args, body) { - return [ this[0], name, args.slice(), MAP(body, walk) ]; - }, - "debugger": function() { - return [ this[0] ]; - }, - "defun": function(name, args, body) { - return [ this[0], name, args.slice(), MAP(body, walk) ]; - }, - "if": function(conditional, t, e) { - return [ this[0], walk(conditional), walk(t), walk(e) ]; - }, - "for": function(init, cond, step, block) { - return [ this[0], walk(init), walk(cond), walk(step), walk(block) ]; - }, - "for-in": function(vvar, key, hash, block) { - return [ this[0], walk(vvar), walk(key), walk(hash), walk(block) ]; - }, - "while": function(cond, block) { - return [ this[0], walk(cond), walk(block) ]; - }, - "do": function(cond, block) { - return [ this[0], walk(cond), walk(block) ]; - }, - "return": function(expr) { - return [ this[0], walk(expr) ]; - }, - "binary": function(op, left, right) { - return [ this[0], op, walk(left), walk(right) ]; - }, - "unary-prefix": function(op, expr) { - return [ this[0], op, walk(expr) ]; - }, - "unary-postfix": function(op, expr) { - return [ this[0], op, walk(expr) ]; - }, - "sub": function(expr, subscript) { - return [ this[0], walk(expr), walk(subscript) ]; - }, - "object": function(props) { - return [ this[0], MAP(props, function(p){ - return p.length == 2 - ? [ p[0], walk(p[1]) ] - : [ p[0], walk(p[1]), p[2] ]; // get/set-ter - }) ]; - }, - "regexp": function(rx, mods) { - return [ this[0], rx, mods ]; - }, - "array": function(elements) { - return [ this[0], MAP(elements, walk) ]; - }, - "stat": function(stat) { - return [ this[0], walk(stat) ]; - }, - "seq": function() { - return [ this[0] ].concat(MAP(slice(arguments), walk)); - }, - "label": function(name, block) { - return [ this[0], name, walk(block) ]; - }, - "with": function(expr, block) { - return [ this[0], walk(expr), walk(block) ]; - }, - "atom": function(name) { - return [ this[0], name ]; - } - }; - - var user = {}; - var stack = []; - function walk(ast) { - if (ast == null) - return null; - try { - stack.push(ast); - var type = ast[0]; - var gen = user[type]; - if (gen) { - var ret = gen.apply(ast, ast.slice(1)); - if (ret != null) - return ret; - } - gen = walkers[type]; - return gen.apply(ast, ast.slice(1)); - } finally { - stack.pop(); - } - }; - - function dive(ast) { - if (ast == null) - return null; - try { - stack.push(ast); - return walkers[ast[0]].apply(ast, ast.slice(1)); - } finally { - stack.pop(); - } - }; - - function with_walkers(walkers, cont){ - var save = {}, i; - for (i in walkers) if (HOP(walkers, i)) { - save[i] = user[i]; - user[i] = walkers[i]; - } - var ret = cont(); - for (i in save) if (HOP(save, i)) { - if (!save[i]) delete user[i]; - else user[i] = save[i]; - } - return ret; - }; - - return { - walk: walk, - dive: dive, - with_walkers: with_walkers, - parent: function() { - return stack[stack.length - 2]; // last one is current node - }, - stack: function() { - return stack; - } - }; -}; - -/* -----[ Scope and mangling ]----- */ - -function Scope(parent) { - this.names = {}; // names defined in this scope - this.mangled = {}; // mangled names (orig.name => mangled) - this.rev_mangled = {}; // reverse lookup (mangled => orig.name) - this.cname = -1; // current mangled name - this.refs = {}; // names referenced from this scope - this.uses_with = false; // will become TRUE if with() is detected in this or any subscopes - this.uses_eval = false; // will become TRUE if eval() is detected in this or any subscopes - this.parent = parent; // parent scope - this.children = []; // sub-scopes - if (parent) { - this.level = parent.level + 1; - parent.children.push(this); - } else { - this.level = 0; - } -}; - -var base54 = (function(){ - var DIGITS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789"; - return function(num) { - var ret = "", base = 54; - do { - ret += DIGITS.charAt(num % base); - num = Math.floor(num / base); - base = 64; - } while (num > 0); - return ret; - }; -})(); - -Scope.prototype = { - has: function(name) { - for (var s = this; s; s = s.parent) - if (HOP(s.names, name)) - return s; - }, - has_mangled: function(mname) { - for (var s = this; s; s = s.parent) - if (HOP(s.rev_mangled, mname)) - return s; - }, - toJSON: function() { - return { - names: this.names, - uses_eval: this.uses_eval, - uses_with: this.uses_with - }; - }, - - next_mangled: function() { - // we must be careful that the new mangled name: - // - // 1. doesn't shadow a mangled name from a parent - // scope, unless we don't reference the original - // name from this scope OR from any sub-scopes! - // This will get slow. - // - // 2. doesn't shadow an original name from a parent - // scope, in the event that the name is not mangled - // in the parent scope and we reference that name - // here OR IN ANY SUBSCOPES! - // - // 3. doesn't shadow a name that is referenced but not - // defined (possibly global defined elsewhere). - for (;;) { - var m = base54(++this.cname), prior; - - // case 1. - prior = this.has_mangled(m); - if (prior && this.refs[prior.rev_mangled[m]] === prior) - continue; - - // case 2. - prior = this.has(m); - if (prior && prior !== this && this.refs[m] === prior && !prior.has_mangled(m)) - continue; - - // case 3. - if (HOP(this.refs, m) && this.refs[m] == null) - continue; - - // I got "do" once. :-/ - if (!is_identifier(m)) - continue; - - return m; - } - }, - set_mangle: function(name, m) { - this.rev_mangled[m] = name; - return this.mangled[name] = m; - }, - get_mangled: function(name, newMangle) { - if (this.uses_eval || this.uses_with) return name; // no mangle if eval or with is in use - var s = this.has(name); - if (!s) return name; // not in visible scope, no mangle - if (HOP(s.mangled, name)) return s.mangled[name]; // already mangled in this scope - if (!newMangle) return name; // not found and no mangling requested - return s.set_mangle(name, s.next_mangled()); - }, - references: function(name) { - return name && !this.parent || this.uses_with || this.uses_eval || this.refs[name]; - }, - define: function(name, type) { - if (name != null) { - if (type == "var" || !HOP(this.names, name)) - this.names[name] = type || "var"; - return name; - } - } -}; - -function ast_add_scope(ast) { - - var current_scope = null; - var w = ast_walker(), walk = w.walk; - var having_eval = []; - - function with_new_scope(cont) { - current_scope = new Scope(current_scope); - current_scope.labels = new Scope(); - var ret = current_scope.body = cont(); - ret.scope = current_scope; - current_scope = current_scope.parent; - return ret; - }; - - function define(name, type) { - return current_scope.define(name, type); - }; - - function reference(name) { - current_scope.refs[name] = true; - }; - - function _lambda(name, args, body) { - var is_defun = this[0] == "defun"; - return [ this[0], is_defun ? define(name, "defun") : name, args, with_new_scope(function(){ - if (!is_defun) define(name, "lambda"); - MAP(args, function(name){ define(name, "arg") }); - return MAP(body, walk); - })]; - }; - - function _vardefs(type) { - return function(defs) { - MAP(defs, function(d){ - define(d[0], type); - if (d[1]) reference(d[0]); - }); - }; - }; - - function _breacont(label) { - if (label) - current_scope.labels.refs[label] = true; - }; - - return with_new_scope(function(){ - // process AST - var ret = w.with_walkers({ - "function": _lambda, - "defun": _lambda, - "label": function(name, stat) { current_scope.labels.define(name) }, - "break": _breacont, - "continue": _breacont, - "with": function(expr, block) { - for (var s = current_scope; s; s = s.parent) - s.uses_with = true; - }, - "var": _vardefs("var"), - "const": _vardefs("const"), - "try": function(t, c, f) { - if (c != null) return [ - this[0], - MAP(t, walk), - [ define(c[0], "catch"), MAP(c[1], walk) ], - f != null ? MAP(f, walk) : null - ]; - }, - "name": function(name) { - if (name == "eval") - having_eval.push(current_scope); - reference(name); - } - }, function(){ - return walk(ast); - }); - - // the reason why we need an additional pass here is - // that names can be used prior to their definition. - - // scopes where eval was detected and their parents - // are marked with uses_eval, unless they define the - // "eval" name. - MAP(having_eval, function(scope){ - if (!scope.has("eval")) while (scope) { - scope.uses_eval = true; - scope = scope.parent; - } - }); - - // for referenced names it might be useful to know - // their origin scope. current_scope here is the - // toplevel one. - function fixrefs(scope, i) { - // do children first; order shouldn't matter - for (i = scope.children.length; --i >= 0;) - fixrefs(scope.children[i]); - for (i in scope.refs) if (HOP(scope.refs, i)) { - // find origin scope and propagate the reference to origin - for (var origin = scope.has(i), s = scope; s; s = s.parent) { - s.refs[i] = origin; - if (s === origin) break; - } - } - }; - fixrefs(current_scope); - - return ret; - }); - -}; - -/* -----[ mangle names ]----- */ - -function ast_mangle(ast, options) { - var w = ast_walker(), walk = w.walk, scope; - options = options || {}; - - function get_mangled(name, newMangle) { - if (!options.toplevel && !scope.parent) return name; // don't mangle toplevel - if (options.except && member(name, options.except)) - return name; - return scope.get_mangled(name, newMangle); - }; - - function get_define(name) { - if (options.defines) { - // we always lookup a defined symbol for the current scope FIRST, so declared - // vars trump a DEFINE symbol, but if no such var is found, then match a DEFINE value - if (!scope.has(name)) { - if (HOP(options.defines, name)) { - return options.defines[name]; - } - } - return null; - } - }; - - function _lambda(name, args, body) { - if (!options.no_functions) { - var is_defun = this[0] == "defun", extra; - if (name) { - if (is_defun) name = get_mangled(name); - else if (body.scope.references(name)) { - extra = {}; - if (!(scope.uses_eval || scope.uses_with)) - name = extra[name] = scope.next_mangled(); - else - extra[name] = name; - } - else name = null; - } - } - body = with_scope(body.scope, function(){ - args = MAP(args, function(name){ return get_mangled(name) }); - return MAP(body, walk); - }, extra); - return [ this[0], name, args, body ]; - }; - - function with_scope(s, cont, extra) { - var _scope = scope; - scope = s; - if (extra) for (var i in extra) if (HOP(extra, i)) { - s.set_mangle(i, extra[i]); - } - for (var i in s.names) if (HOP(s.names, i)) { - get_mangled(i, true); - } - var ret = cont(); - ret.scope = s; - scope = _scope; - return ret; - }; - - function _vardefs(defs) { - return [ this[0], MAP(defs, function(d){ - return [ get_mangled(d[0]), walk(d[1]) ]; - }) ]; - }; - - function _breacont(label) { - if (label) return [ this[0], scope.labels.get_mangled(label) ]; - }; - - return w.with_walkers({ - "function": _lambda, - "defun": function() { - // move function declarations to the top when - // they are not in some block. - var ast = _lambda.apply(this, arguments); - switch (w.parent()[0]) { - case "toplevel": - case "function": - case "defun": - return MAP.at_top(ast); - } - return ast; - }, - "label": function(label, stat) { - if (scope.labels.refs[label]) return [ - this[0], - scope.labels.get_mangled(label, true), - walk(stat) - ]; - return walk(stat); - }, - "break": _breacont, - "continue": _breacont, - "var": _vardefs, - "const": _vardefs, - "name": function(name) { - return get_define(name) || [ this[0], get_mangled(name) ]; - }, - "try": function(t, c, f) { - return [ this[0], - MAP(t, walk), - c != null ? [ get_mangled(c[0]), MAP(c[1], walk) ] : null, - f != null ? MAP(f, walk) : null ]; - }, - "toplevel": function(body) { - var self = this; - return with_scope(self.scope, function(){ - return [ self[0], MAP(body, walk) ]; - }); - } - }, function() { - return walk(ast_add_scope(ast)); - }); -}; - -/* -----[ - - compress foo["bar"] into foo.bar, - - remove block brackets {} where possible - - join consecutive var declarations - - various optimizations for IFs: - - if (cond) foo(); else bar(); ==> cond?foo():bar(); - - if (cond) foo(); ==> cond&&foo(); - - if (foo) return bar(); else return baz(); ==> return foo?bar():baz(); // also for throw - - if (foo) return bar(); else something(); ==> {if(foo)return bar();something()} - ]----- */ - -var warn = function(){}; - -function best_of(ast1, ast2) { - return gen_code(ast1).length > gen_code(ast2[0] == "stat" ? ast2[1] : ast2).length ? ast2 : ast1; -}; - -function last_stat(b) { - if (b[0] == "block" && b[1] && b[1].length > 0) - return b[1][b[1].length - 1]; - return b; -} - -function aborts(t) { - if (t) switch (last_stat(t)[0]) { - case "return": - case "break": - case "continue": - case "throw": - return true; - } -}; - -function boolean_expr(expr) { - return ( (expr[0] == "unary-prefix" - && member(expr[1], [ "!", "delete" ])) || - - (expr[0] == "binary" - && member(expr[1], [ "in", "instanceof", "==", "!=", "===", "!==", "<", "<=", ">=", ">" ])) || - - (expr[0] == "binary" - && member(expr[1], [ "&&", "||" ]) - && boolean_expr(expr[2]) - && boolean_expr(expr[3])) || - - (expr[0] == "conditional" - && boolean_expr(expr[2]) - && boolean_expr(expr[3])) || - - (expr[0] == "assign" - && expr[1] === true - && boolean_expr(expr[3])) || - - (expr[0] == "seq" - && boolean_expr(expr[expr.length - 1])) - ); -}; - -function empty(b) { - return !b || (b[0] == "block" && (!b[1] || b[1].length == 0)); -}; - -function is_string(node) { - return (node[0] == "string" || - node[0] == "unary-prefix" && node[1] == "typeof" || - node[0] == "binary" && node[1] == "+" && - (is_string(node[2]) || is_string(node[3]))); -}; - -var when_constant = (function(){ - - var $NOT_CONSTANT = {}; - - // this can only evaluate constant expressions. If it finds anything - // not constant, it throws $NOT_CONSTANT. - function evaluate(expr) { - switch (expr[0]) { - case "string": - case "num": - return expr[1]; - case "name": - case "atom": - switch (expr[1]) { - case "true": return true; - case "false": return false; - case "null": return null; - } - break; - case "unary-prefix": - switch (expr[1]) { - case "!": return !evaluate(expr[2]); - case "typeof": return typeof evaluate(expr[2]); - case "~": return ~evaluate(expr[2]); - case "-": return -evaluate(expr[2]); - case "+": return +evaluate(expr[2]); - } - break; - case "binary": - var left = expr[2], right = expr[3]; - switch (expr[1]) { - case "&&" : return evaluate(left) && evaluate(right); - case "||" : return evaluate(left) || evaluate(right); - case "|" : return evaluate(left) | evaluate(right); - case "&" : return evaluate(left) & evaluate(right); - case "^" : return evaluate(left) ^ evaluate(right); - case "+" : return evaluate(left) + evaluate(right); - case "*" : return evaluate(left) * evaluate(right); - case "/" : return evaluate(left) / evaluate(right); - case "%" : return evaluate(left) % evaluate(right); - case "-" : return evaluate(left) - evaluate(right); - case "<<" : return evaluate(left) << evaluate(right); - case ">>" : return evaluate(left) >> evaluate(right); - case ">>>" : return evaluate(left) >>> evaluate(right); - case "==" : return evaluate(left) == evaluate(right); - case "===" : return evaluate(left) === evaluate(right); - case "!=" : return evaluate(left) != evaluate(right); - case "!==" : return evaluate(left) !== evaluate(right); - case "<" : return evaluate(left) < evaluate(right); - case "<=" : return evaluate(left) <= evaluate(right); - case ">" : return evaluate(left) > evaluate(right); - case ">=" : return evaluate(left) >= evaluate(right); - case "in" : return evaluate(left) in evaluate(right); - case "instanceof" : return evaluate(left) instanceof evaluate(right); - } - } - throw $NOT_CONSTANT; - }; - - return function(expr, yes, no) { - try { - var val = evaluate(expr), ast; - switch (typeof val) { - case "string": ast = [ "string", val ]; break; - case "number": ast = [ "num", val ]; break; - case "boolean": ast = [ "name", String(val) ]; break; - default: - if (val === null) { ast = [ "atom", "null" ]; break; } - throw new Error("Can't handle constant of type: " + (typeof val)); - } - return yes.call(expr, ast, val); - } catch(ex) { - if (ex === $NOT_CONSTANT) { - if (expr[0] == "binary" - && (expr[1] == "===" || expr[1] == "!==") - && ((is_string(expr[2]) && is_string(expr[3])) - || (boolean_expr(expr[2]) && boolean_expr(expr[3])))) { - expr[1] = expr[1].substr(0, 2); - } - else if (no && expr[0] == "binary" - && (expr[1] == "||" || expr[1] == "&&")) { - // the whole expression is not constant but the lval may be... - try { - var lval = evaluate(expr[2]); - expr = ((expr[1] == "&&" && (lval ? expr[3] : lval)) || - (expr[1] == "||" && (lval ? lval : expr[3])) || - expr); - } catch(ex2) { - // IGNORE... lval is not constant - } - } - return no ? no.call(expr, expr) : null; - } - else throw ex; - } - }; - -})(); - -function warn_unreachable(ast) { - if (!empty(ast)) - warn("Dropping unreachable code: " + gen_code(ast, true)); -}; - -function prepare_ifs(ast) { - var w = ast_walker(), walk = w.walk; - // In this first pass, we rewrite ifs which abort with no else with an - // if-else. For example: - // - // if (x) { - // blah(); - // return y; - // } - // foobar(); - // - // is rewritten into: - // - // if (x) { - // blah(); - // return y; - // } else { - // foobar(); - // } - function redo_if(statements) { - statements = MAP(statements, walk); - - for (var i = 0; i < statements.length; ++i) { - var fi = statements[i]; - if (fi[0] != "if") continue; - - if (fi[3] && walk(fi[3])) continue; - - var t = walk(fi[2]); - if (!aborts(t)) continue; - - var conditional = walk(fi[1]); - - var e_body = redo_if(statements.slice(i + 1)); - var e = e_body.length == 1 ? e_body[0] : [ "block", e_body ]; - - return statements.slice(0, i).concat([ [ - fi[0], // "if" - conditional, // conditional - t, // then - e // else - ] ]); - } - - return statements; - }; - - function redo_if_lambda(name, args, body) { - body = redo_if(body); - return [ this[0], name, args, body ]; - }; - - function redo_if_block(statements) { - return [ this[0], statements != null ? redo_if(statements) : null ]; - }; - - return w.with_walkers({ - "defun": redo_if_lambda, - "function": redo_if_lambda, - "block": redo_if_block, - "splice": redo_if_block, - "toplevel": function(statements) { - return [ this[0], redo_if(statements) ]; - }, - "try": function(t, c, f) { - return [ - this[0], - redo_if(t), - c != null ? [ c[0], redo_if(c[1]) ] : null, - f != null ? redo_if(f) : null - ]; - } - }, function() { - return walk(ast); - }); -}; - -function for_side_effects(ast, handler) { - var w = ast_walker(), walk = w.walk; - var $stop = {}, $restart = {}; - function stop() { throw $stop }; - function restart() { throw $restart }; - function found(){ return handler.call(this, this, w, stop, restart) }; - function unary(op) { - if (op == "++" || op == "--") - return found.apply(this, arguments); - }; - return w.with_walkers({ - "try": found, - "throw": found, - "return": found, - "new": found, - "switch": found, - "break": found, - "continue": found, - "assign": found, - "call": found, - "if": found, - "for": found, - "for-in": found, - "while": found, - "do": found, - "return": found, - "unary-prefix": unary, - "unary-postfix": unary, - "defun": found - }, function(){ - while (true) try { - walk(ast); - break; - } catch(ex) { - if (ex === $stop) break; - if (ex === $restart) continue; - throw ex; - } - }); -}; - -function ast_lift_variables(ast) { - var w = ast_walker(), walk = w.walk, scope; - function do_body(body, env) { - var _scope = scope; - scope = env; - body = MAP(body, walk); - var hash = {}, names = MAP(env.names, function(type, name){ - if (type != "var") return MAP.skip; - if (!env.references(name)) return MAP.skip; - hash[name] = true; - return [ name ]; - }); - if (names.length > 0) { - // looking for assignments to any of these variables. - // we can save considerable space by moving the definitions - // in the var declaration. - for_side_effects([ "block", body ], function(ast, walker, stop, restart) { - if (ast[0] == "assign" - && ast[1] === true - && ast[2][0] == "name" - && HOP(hash, ast[2][1])) { - // insert the definition into the var declaration - for (var i = names.length; --i >= 0;) { - if (names[i][0] == ast[2][1]) { - if (names[i][1]) // this name already defined, we must stop - stop(); - names[i][1] = ast[3]; // definition - names.push(names.splice(i, 1)[0]); - break; - } - } - // remove this assignment from the AST. - var p = walker.parent(); - if (p[0] == "seq") { - var a = p[2]; - a.unshift(0, p.length); - p.splice.apply(p, a); - } - else if (p[0] == "stat") { - p.splice(0, p.length, "block"); // empty statement - } - else { - stop(); - } - restart(); - } - stop(); - }); - body.unshift([ "var", names ]); - } - scope = _scope; - return body; - }; - function _vardefs(defs) { - var ret = null; - for (var i = defs.length; --i >= 0;) { - var d = defs[i]; - if (!d[1]) continue; - d = [ "assign", true, [ "name", d[0] ], d[1] ]; - if (ret == null) ret = d; - else ret = [ "seq", d, ret ]; - } - if (ret == null) { - if (w.parent()[0] == "for-in") - return [ "name", defs[0][0] ]; - return MAP.skip; - } - return [ "stat", ret ]; - }; - function _toplevel(body) { - return [ this[0], do_body(body, this.scope) ]; - }; - return w.with_walkers({ - "function": function(name, args, body){ - for (var i = args.length; --i >= 0 && !body.scope.references(args[i]);) - args.pop(); - if (!body.scope.references(name)) name = null; - return [ this[0], name, args, do_body(body, body.scope) ]; - }, - "defun": function(name, args, body){ - if (!scope.references(name)) return MAP.skip; - for (var i = args.length; --i >= 0 && !body.scope.references(args[i]);) - args.pop(); - return [ this[0], name, args, do_body(body, body.scope) ]; - }, - "var": _vardefs, - "toplevel": _toplevel - }, function(){ - return walk(ast_add_scope(ast)); - }); -}; - -function ast_squeeze(ast, options) { - options = defaults(options, { - make_seqs : true, - dead_code : true, - no_warnings : false, - keep_comps : true - }); - - var w = ast_walker(), walk = w.walk; - - function negate(c) { - var not_c = [ "unary-prefix", "!", c ]; - switch (c[0]) { - case "unary-prefix": - return c[1] == "!" && boolean_expr(c[2]) ? c[2] : not_c; - case "seq": - c = slice(c); - c[c.length - 1] = negate(c[c.length - 1]); - return c; - case "conditional": - return best_of(not_c, [ "conditional", c[1], negate(c[2]), negate(c[3]) ]); - case "binary": - var op = c[1], left = c[2], right = c[3]; - if (!options.keep_comps) switch (op) { - case "<=" : return [ "binary", ">", left, right ]; - case "<" : return [ "binary", ">=", left, right ]; - case ">=" : return [ "binary", "<", left, right ]; - case ">" : return [ "binary", "<=", left, right ]; - } - switch (op) { - case "==" : return [ "binary", "!=", left, right ]; - case "!=" : return [ "binary", "==", left, right ]; - case "===" : return [ "binary", "!==", left, right ]; - case "!==" : return [ "binary", "===", left, right ]; - case "&&" : return best_of(not_c, [ "binary", "||", negate(left), negate(right) ]); - case "||" : return best_of(not_c, [ "binary", "&&", negate(left), negate(right) ]); - } - break; - } - return not_c; - }; - - function make_conditional(c, t, e) { - var make_real_conditional = function() { - if (c[0] == "unary-prefix" && c[1] == "!") { - return e ? [ "conditional", c[2], e, t ] : [ "binary", "||", c[2], t ]; - } else { - return e ? best_of( - [ "conditional", c, t, e ], - [ "conditional", negate(c), e, t ] - ) : [ "binary", "&&", c, t ]; - } - }; - // shortcut the conditional if the expression has a constant value - return when_constant(c, function(ast, val){ - warn_unreachable(val ? e : t); - return (val ? t : e); - }, make_real_conditional); - }; - - function rmblock(block) { - if (block != null && block[0] == "block" && block[1]) { - if (block[1].length == 1) - block = block[1][0]; - else if (block[1].length == 0) - block = [ "block" ]; - } - return block; - }; - - function _lambda(name, args, body) { - return [ this[0], name, args, tighten(body, "lambda") ]; - }; - - // this function does a few things: - // 1. discard useless blocks - // 2. join consecutive var declarations - // 3. remove obviously dead code - // 4. transform consecutive statements using the comma operator - // 5. if block_type == "lambda" and it detects constructs like if(foo) return ... - rewrite like if (!foo) { ... } - function tighten(statements, block_type) { - statements = MAP(statements, walk); - - statements = statements.reduce(function(a, stat){ - if (stat[0] == "block") { - if (stat[1]) { - a.push.apply(a, stat[1]); - } - } else { - a.push(stat); - } - return a; - }, []); - - statements = (function(a, prev){ - statements.forEach(function(cur){ - if (prev && ((cur[0] == "var" && prev[0] == "var") || - (cur[0] == "const" && prev[0] == "const"))) { - prev[1] = prev[1].concat(cur[1]); - } else { - a.push(cur); - prev = cur; - } - }); - return a; - })([]); - - if (options.dead_code) statements = (function(a, has_quit){ - statements.forEach(function(st){ - if (has_quit) { - if (st[0] == "function" || st[0] == "defun") { - a.push(st); - } - else if (st[0] == "var" || st[0] == "const") { - if (!options.no_warnings) - warn("Variables declared in unreachable code"); - st[1] = MAP(st[1], function(def){ - if (def[1] && !options.no_warnings) - warn_unreachable([ "assign", true, [ "name", def[0] ], def[1] ]); - return [ def[0] ]; - }); - a.push(st); - } - else if (!options.no_warnings) - warn_unreachable(st); - } - else { - a.push(st); - if (member(st[0], [ "return", "throw", "break", "continue" ])) - has_quit = true; - } - }); - return a; - })([]); - - if (options.make_seqs) statements = (function(a, prev) { - statements.forEach(function(cur){ - if (prev && prev[0] == "stat" && cur[0] == "stat") { - prev[1] = [ "seq", prev[1], cur[1] ]; - } else { - a.push(cur); - prev = cur; - } - }); - if (a.length >= 2 - && a[a.length-2][0] == "stat" - && (a[a.length-1][0] == "return" || a[a.length-1][0] == "throw") - && a[a.length-1][1]) - { - a.splice(a.length - 2, 2, - [ a[a.length-1][0], - [ "seq", a[a.length-2][1], a[a.length-1][1] ]]); - } - return a; - })([]); - - // this increases jQuery by 1K. Probably not such a good idea after all.. - // part of this is done in prepare_ifs anyway. - // if (block_type == "lambda") statements = (function(i, a, stat){ - // while (i < statements.length) { - // stat = statements[i++]; - // if (stat[0] == "if" && !stat[3]) { - // if (stat[2][0] == "return" && stat[2][1] == null) { - // a.push(make_if(negate(stat[1]), [ "block", statements.slice(i) ])); - // break; - // } - // var last = last_stat(stat[2]); - // if (last[0] == "return" && last[1] == null) { - // a.push(make_if(stat[1], [ "block", stat[2][1].slice(0, -1) ], [ "block", statements.slice(i) ])); - // break; - // } - // } - // a.push(stat); - // } - // return a; - // })(0, []); - - return statements; - }; - - function make_if(c, t, e) { - return when_constant(c, function(ast, val){ - if (val) { - t = walk(t); - warn_unreachable(e); - return t || [ "block" ]; - } else { - e = walk(e); - warn_unreachable(t); - return e || [ "block" ]; - } - }, function() { - return make_real_if(c, t, e); - }); - }; - - function abort_else(c, t, e) { - var ret = [ [ "if", negate(c), e ] ]; - if (t[0] == "block") { - if (t[1]) ret = ret.concat(t[1]); - } else { - ret.push(t); - } - return walk([ "block", ret ]); - }; - - function make_real_if(c, t, e) { - c = walk(c); - t = walk(t); - e = walk(e); - - if (empty(t)) { - c = negate(c); - t = e; - e = null; - } else if (empty(e)) { - e = null; - } else { - // if we have both else and then, maybe it makes sense to switch them? - (function(){ - var a = gen_code(c); - var n = negate(c); - var b = gen_code(n); - if (b.length < a.length) { - var tmp = t; - t = e; - e = tmp; - c = n; - } - })(); - } - if (empty(e) && empty(t)) - return [ "stat", c ]; - var ret = [ "if", c, t, e ]; - if (t[0] == "if" && empty(t[3]) && empty(e)) { - ret = best_of(ret, walk([ "if", [ "binary", "&&", c, t[1] ], t[2] ])); - } - else if (t[0] == "stat") { - if (e) { - if (e[0] == "stat") - ret = best_of(ret, [ "stat", make_conditional(c, t[1], e[1]) ]); - else if (aborts(e)) - ret = abort_else(c, t, e); - } - else { - ret = best_of(ret, [ "stat", make_conditional(c, t[1]) ]); - } - } - else if (e && t[0] == e[0] && (t[0] == "return" || t[0] == "throw") && t[1] && e[1]) { - ret = best_of(ret, [ t[0], make_conditional(c, t[1], e[1] ) ]); - } - else if (e && aborts(t)) { - ret = [ [ "if", c, t ] ]; - if (e[0] == "block") { - if (e[1]) ret = ret.concat(e[1]); - } - else { - ret.push(e); - } - ret = walk([ "block", ret ]); - } - else if (t && aborts(e)) { - ret = abort_else(c, t, e); - } - return ret; - }; - - function _do_while(cond, body) { - return when_constant(cond, function(cond, val){ - if (!val) { - warn_unreachable(body); - return [ "block" ]; - } else { - return [ "for", null, null, null, walk(body) ]; - } - }); - }; - - return w.with_walkers({ - "sub": function(expr, subscript) { - if (subscript[0] == "string") { - var name = subscript[1]; - if (is_identifier(name)) - return [ "dot", walk(expr), name ]; - else if (/^[1-9][0-9]*$/.test(name) || name === "0") - return [ "sub", walk(expr), [ "num", parseInt(name, 10) ] ]; - } - }, - "if": make_if, - "toplevel": function(body) { - return [ "toplevel", tighten(body) ]; - }, - "switch": function(expr, body) { - var last = body.length - 1; - return [ "switch", walk(expr), MAP(body, function(branch, i){ - var block = tighten(branch[1]); - if (i == last && block.length > 0) { - var node = block[block.length - 1]; - if (node[0] == "break" && !node[1]) - block.pop(); - } - return [ branch[0] ? walk(branch[0]) : null, block ]; - }) ]; - }, - "function": _lambda, - "defun": _lambda, - "block": function(body) { - if (body) return rmblock([ "block", tighten(body) ]); - }, - "binary": function(op, left, right) { - return when_constant([ "binary", op, walk(left), walk(right) ], function yes(c){ - return best_of(walk(c), this); - }, function no() { - return function(){ - if(op != "==" && op != "!=") return; - var l = walk(left), r = walk(right); - if(l && l[0] == "unary-prefix" && l[1] == "!" && l[2][0] == "num") - left = ['num', +!l[2][1]]; - else if (r && r[0] == "unary-prefix" && r[1] == "!" && r[2][0] == "num") - right = ['num', +!r[2][1]]; - return ["binary", op, left, right]; - }() || this; - }); - }, - "conditional": function(c, t, e) { - return make_conditional(walk(c), walk(t), walk(e)); - }, - "try": function(t, c, f) { - return [ - "try", - tighten(t), - c != null ? [ c[0], tighten(c[1]) ] : null, - f != null ? tighten(f) : null - ]; - }, - "unary-prefix": function(op, expr) { - expr = walk(expr); - var ret = [ "unary-prefix", op, expr ]; - if (op == "!") - ret = best_of(ret, negate(expr)); - return when_constant(ret, function(ast, val){ - return walk(ast); // it's either true or false, so minifies to !0 or !1 - }, function() { return ret }); - }, - "name": function(name) { - switch (name) { - case "true": return [ "unary-prefix", "!", [ "num", 0 ]]; - case "false": return [ "unary-prefix", "!", [ "num", 1 ]]; - } - }, - "while": _do_while, - "assign": function(op, lvalue, rvalue) { - lvalue = walk(lvalue); - rvalue = walk(rvalue); - var okOps = [ '+', '-', '/', '*', '%', '>>', '<<', '>>>', '|', '^', '&' ]; - if (op === true && lvalue[0] === "name" && rvalue[0] === "binary" && - ~okOps.indexOf(rvalue[1]) && rvalue[2][0] === "name" && - rvalue[2][1] === lvalue[1]) { - return [ this[0], rvalue[1], lvalue, rvalue[3] ] - } - return [ this[0], op, lvalue, rvalue ]; - } - }, function() { - for (var i = 0; i < 2; ++i) { - ast = prepare_ifs(ast); - ast = walk(ast); - } - return ast; - }); -}; - -/* -----[ re-generate code from the AST ]----- */ - -var DOT_CALL_NO_PARENS = jsp.array_to_hash([ - "name", - "array", - "object", - "string", - "dot", - "sub", - "call", - "regexp", - "defun" -]); - -function make_string(str, ascii_only) { - var dq = 0, sq = 0; - str = str.replace(/[\\\b\f\n\r\t\x22\x27\u2028\u2029\0]/g, function(s){ - switch (s) { - case "\\": return "\\\\"; - case "\b": return "\\b"; - case "\f": return "\\f"; - case "\n": return "\\n"; - case "\r": return "\\r"; - case "\u2028": return "\\u2028"; - case "\u2029": return "\\u2029"; - case '"': ++dq; return '"'; - case "'": ++sq; return "'"; - case "\0": return "\\0"; - } - return s; - }); - if (ascii_only) str = to_ascii(str); - if (dq > sq) return "'" + str.replace(/\x27/g, "\\'") + "'"; - else return '"' + str.replace(/\x22/g, '\\"') + '"'; -}; - -function to_ascii(str) { - return str.replace(/[\u0080-\uffff]/g, function(ch) { - var code = ch.charCodeAt(0).toString(16); - while (code.length < 4) code = "0" + code; - return "\\u" + code; - }); -}; - -var SPLICE_NEEDS_BRACKETS = jsp.array_to_hash([ "if", "while", "do", "for", "for-in", "with" ]); - -function gen_code(ast, options) { - options = defaults(options, { - indent_start : 0, - indent_level : 4, - quote_keys : false, - space_colon : false, - beautify : false, - ascii_only : false, - inline_script: false - }); - var beautify = !!options.beautify; - var indentation = 0, - newline = beautify ? "\n" : "", - space = beautify ? " " : ""; - - function encode_string(str) { - var ret = make_string(str, options.ascii_only); - if (options.inline_script) - ret = ret.replace(/<\x2fscript([>\/\t\n\f\r ])/gi, "<\\/script$1"); - return ret; - }; - - function make_name(name) { - name = name.toString(); - if (options.ascii_only) - name = to_ascii(name); - return name; - }; - - function indent(line) { - if (line == null) - line = ""; - if (beautify) - line = repeat_string(" ", options.indent_start + indentation * options.indent_level) + line; - return line; - }; - - function with_indent(cont, incr) { - if (incr == null) incr = 1; - indentation += incr; - try { return cont.apply(null, slice(arguments, 1)); } - finally { indentation -= incr; } - }; - - function add_spaces(a) { - if (beautify) - return a.join(" "); - var b = []; - for (var i = 0; i < a.length; ++i) { - var next = a[i + 1]; - b.push(a[i]); - if (next && - ((/[a-z0-9_\x24]$/i.test(a[i].toString()) && /^[a-z0-9_\x24]/i.test(next.toString())) || - (/[\+\-]$/.test(a[i].toString()) && /^[\+\-]/.test(next.toString())))) { - b.push(" "); - } - } - return b.join(""); - }; - - function add_commas(a) { - return a.join("," + space); - }; - - function parenthesize(expr) { - var gen = make(expr); - for (var i = 1; i < arguments.length; ++i) { - var el = arguments[i]; - if ((el instanceof Function && el(expr)) || expr[0] == el) - return "(" + gen + ")"; - } - return gen; - }; - - function best_of(a) { - if (a.length == 1) { - return a[0]; - } - if (a.length == 2) { - var b = a[1]; - a = a[0]; - return a.length <= b.length ? a : b; - } - return best_of([ a[0], best_of(a.slice(1)) ]); - }; - - function needs_parens(expr) { - if (expr[0] == "function" || expr[0] == "object") { - // dot/call on a literal function requires the - // function literal itself to be parenthesized - // only if it's the first "thing" in a - // statement. This means that the parent is - // "stat", but it could also be a "seq" and - // we're the first in this "seq" and the - // parent is "stat", and so on. Messy stuff, - // but it worths the trouble. - var a = slice(w.stack()), self = a.pop(), p = a.pop(); - while (p) { - if (p[0] == "stat") return true; - if (((p[0] == "seq" || p[0] == "call" || p[0] == "dot" || p[0] == "sub" || p[0] == "conditional") && p[1] === self) || - ((p[0] == "binary" || p[0] == "assign" || p[0] == "unary-postfix") && p[2] === self)) { - self = p; - p = a.pop(); - } else { - return false; - } - } - } - return !HOP(DOT_CALL_NO_PARENS, expr[0]); - }; - - function make_num(num) { - var str = num.toString(10), a = [ str.replace(/^0\./, ".") ], m; - if (Math.floor(num) === num) { - if (num >= 0) { - a.push("0x" + num.toString(16).toLowerCase(), // probably pointless - "0" + num.toString(8)); // same. - } else { - a.push("-0x" + (-num).toString(16).toLowerCase(), // probably pointless - "-0" + (-num).toString(8)); // same. - } - if ((m = /^(.*?)(0+)$/.exec(num))) { - a.push(m[1] + "e" + m[2].length); - } - } else if ((m = /^0?\.(0+)(.*)$/.exec(num))) { - a.push(m[2] + "e-" + (m[1].length + m[2].length), - str.substr(str.indexOf("."))); - } - return best_of(a); - }; - - var w = ast_walker(); - var make = w.walk; - return w.with_walkers({ - "string": encode_string, - "num": make_num, - "name": make_name, - "debugger": function(){ return "debugger" }, - "toplevel": function(statements) { - return make_block_statements(statements) - .join(newline + newline); - }, - "splice": function(statements) { - var parent = w.parent(); - if (HOP(SPLICE_NEEDS_BRACKETS, parent)) { - // we need block brackets in this case - return make_block.apply(this, arguments); - } else { - return MAP(make_block_statements(statements, true), - function(line, i) { - // the first line is already indented - return i > 0 ? indent(line) : line; - }).join(newline); - } - }, - "block": make_block, - "var": function(defs) { - return "var " + add_commas(MAP(defs, make_1vardef)) + ";"; - }, - "const": function(defs) { - return "const " + add_commas(MAP(defs, make_1vardef)) + ";"; - }, - "try": function(tr, ca, fi) { - var out = [ "try", make_block(tr) ]; - if (ca) out.push("catch", "(" + ca[0] + ")", make_block(ca[1])); - if (fi) out.push("finally", make_block(fi)); - return add_spaces(out); - }, - "throw": function(expr) { - return add_spaces([ "throw", make(expr) ]) + ";"; - }, - "new": function(ctor, args) { - args = args.length > 0 ? "(" + add_commas(MAP(args, function(expr){ - return parenthesize(expr, "seq"); - })) + ")" : ""; - return add_spaces([ "new", parenthesize(ctor, "seq", "binary", "conditional", "assign", function(expr){ - var w = ast_walker(), has_call = {}; - try { - w.with_walkers({ - "call": function() { throw has_call }, - "function": function() { return this } - }, function(){ - w.walk(expr); - }); - } catch(ex) { - if (ex === has_call) - return true; - throw ex; - } - }) + args ]); - }, - "switch": function(expr, body) { - return add_spaces([ "switch", "(" + make(expr) + ")", make_switch_block(body) ]); - }, - "break": function(label) { - var out = "break"; - if (label != null) - out += " " + make_name(label); - return out + ";"; - }, - "continue": function(label) { - var out = "continue"; - if (label != null) - out += " " + make_name(label); - return out + ";"; - }, - "conditional": function(co, th, el) { - return add_spaces([ parenthesize(co, "assign", "seq", "conditional"), "?", - parenthesize(th, "seq"), ":", - parenthesize(el, "seq") ]); - }, - "assign": function(op, lvalue, rvalue) { - if (op && op !== true) op += "="; - else op = "="; - return add_spaces([ make(lvalue), op, parenthesize(rvalue, "seq") ]); - }, - "dot": function(expr) { - var out = make(expr), i = 1; - if (expr[0] == "num") { - if (!/\./.test(expr[1])) - out += "."; - } else if (expr[0] != "function" && needs_parens(expr)) - out = "(" + out + ")"; - while (i < arguments.length) - out += "." + make_name(arguments[i++]); - return out; - }, - "call": function(func, args) { - var f = make(func); - if (f.charAt(0) != "(" && needs_parens(func)) - f = "(" + f + ")"; - return f + "(" + add_commas(MAP(args, function(expr){ - return parenthesize(expr, "seq"); - })) + ")"; - }, - "function": make_function, - "defun": make_function, - "if": function(co, th, el) { - var out = [ "if", "(" + make(co) + ")", el ? make_then(th) : make(th) ]; - if (el) { - out.push("else", make(el)); - } - return add_spaces(out); - }, - "for": function(init, cond, step, block) { - var out = [ "for" ]; - init = (init != null ? make(init) : "").replace(/;*\s*$/, ";" + space); - cond = (cond != null ? make(cond) : "").replace(/;*\s*$/, ";" + space); - step = (step != null ? make(step) : "").replace(/;*\s*$/, ""); - var args = init + cond + step; - if (args == "; ; ") args = ";;"; - out.push("(" + args + ")", make(block)); - return add_spaces(out); - }, - "for-in": function(vvar, key, hash, block) { - return add_spaces([ "for", "(" + - (vvar ? make(vvar).replace(/;+$/, "") : make(key)), - "in", - make(hash) + ")", make(block) ]); - }, - "while": function(condition, block) { - return add_spaces([ "while", "(" + make(condition) + ")", make(block) ]); - }, - "do": function(condition, block) { - return add_spaces([ "do", make(block), "while", "(" + make(condition) + ")" ]) + ";"; - }, - "return": function(expr) { - var out = [ "return" ]; - if (expr != null) out.push(make(expr)); - return add_spaces(out) + ";"; - }, - "binary": function(operator, lvalue, rvalue) { - var left = make(lvalue), right = make(rvalue); - // XXX: I'm pretty sure other cases will bite here. - // we need to be smarter. - // adding parens all the time is the safest bet. - if (member(lvalue[0], [ "assign", "conditional", "seq" ]) || - lvalue[0] == "binary" && PRECEDENCE[operator] > PRECEDENCE[lvalue[1]] || - lvalue[0] == "function" && needs_parens(this)) { - left = "(" + left + ")"; - } - if (member(rvalue[0], [ "assign", "conditional", "seq" ]) || - rvalue[0] == "binary" && PRECEDENCE[operator] >= PRECEDENCE[rvalue[1]] && - !(rvalue[1] == operator && member(operator, [ "&&", "||", "*" ]))) { - right = "(" + right + ")"; - } - else if (!beautify && options.inline_script && (operator == "<" || operator == "<<") - && rvalue[0] == "regexp" && /^script/i.test(rvalue[1])) { - right = " " + right; - } - return add_spaces([ left, operator, right ]); - }, - "unary-prefix": function(operator, expr) { - var val = make(expr); - if (!(expr[0] == "num" || (expr[0] == "unary-prefix" && !HOP(OPERATORS, operator + expr[1])) || !needs_parens(expr))) - val = "(" + val + ")"; - return operator + (jsp.is_alphanumeric_char(operator.charAt(0)) ? " " : "") + val; - }, - "unary-postfix": function(operator, expr) { - var val = make(expr); - if (!(expr[0] == "num" || (expr[0] == "unary-postfix" && !HOP(OPERATORS, operator + expr[1])) || !needs_parens(expr))) - val = "(" + val + ")"; - return val + operator; - }, - "sub": function(expr, subscript) { - var hash = make(expr); - if (needs_parens(expr)) - hash = "(" + hash + ")"; - return hash + "[" + make(subscript) + "]"; - }, - "object": function(props) { - var obj_needs_parens = needs_parens(this); - if (props.length == 0) - return obj_needs_parens ? "({})" : "{}"; - var out = "{" + newline + with_indent(function(){ - return MAP(props, function(p){ - if (p.length == 3) { - // getter/setter. The name is in p[0], the arg.list in p[1][2], the - // body in p[1][3] and type ("get" / "set") in p[2]. - return indent(make_function(p[0], p[1][2], p[1][3], p[2], true)); - } - var key = p[0], val = parenthesize(p[1], "seq"); - if (options.quote_keys) { - key = encode_string(key); - } else if ((typeof key == "number" || !beautify && +key + "" == key) - && parseFloat(key) >= 0) { - key = make_num(+key); - } else if (!is_identifier(key)) { - key = encode_string(key); - } - return indent(add_spaces(beautify && options.space_colon - ? [ key, ":", val ] - : [ key + ":", val ])); - }).join("," + newline); - }) + newline + indent("}"); - return obj_needs_parens ? "(" + out + ")" : out; - }, - "regexp": function(rx, mods) { - return "/" + rx + "/" + mods; - }, - "array": function(elements) { - if (elements.length == 0) return "[]"; - return add_spaces([ "[", add_commas(MAP(elements, function(el, i){ - if (!beautify && el[0] == "atom" && el[1] == "undefined") return i === elements.length - 1 ? "," : ""; - return parenthesize(el, "seq"); - })), "]" ]); - }, - "stat": function(stmt) { - return make(stmt).replace(/;*\s*$/, ";"); - }, - "seq": function() { - return add_commas(MAP(slice(arguments), make)); - }, - "label": function(name, block) { - return add_spaces([ make_name(name), ":", make(block) ]); - }, - "with": function(expr, block) { - return add_spaces([ "with", "(" + make(expr) + ")", make(block) ]); - }, - "atom": function(name) { - return make_name(name); - } - }, function(){ return make(ast) }); - - // The squeezer replaces "block"-s that contain only a single - // statement with the statement itself; technically, the AST - // is correct, but this can create problems when we output an - // IF having an ELSE clause where the THEN clause ends in an - // IF *without* an ELSE block (then the outer ELSE would refer - // to the inner IF). This function checks for this case and - // adds the block brackets if needed. - function make_then(th) { - if (th == null) return ";"; - if (th[0] == "do") { - // https://github.com/mishoo/UglifyJS/issues/#issue/57 - // IE croaks with "syntax error" on code like this: - // if (foo) do ... while(cond); else ... - // we need block brackets around do/while - return make_block([ th ]); - } - var b = th; - while (true) { - var type = b[0]; - if (type == "if") { - if (!b[3]) - // no else, we must add the block - return make([ "block", [ th ]]); - b = b[3]; - } - else if (type == "while" || type == "do") b = b[2]; - else if (type == "for" || type == "for-in") b = b[4]; - else break; - } - return make(th); - }; - - function make_function(name, args, body, keyword, no_parens) { - var out = keyword || "function"; - if (name) { - out += " " + make_name(name); - } - out += "(" + add_commas(MAP(args, make_name)) + ")"; - out = add_spaces([ out, make_block(body) ]); - return (!no_parens && needs_parens(this)) ? "(" + out + ")" : out; - }; - - function must_has_semicolon(node) { - switch (node[0]) { - case "with": - case "while": - return empty(node[2]); // `with' or `while' with empty body? - case "for": - case "for-in": - return empty(node[4]); // `for' with empty body? - case "if": - if (empty(node[2]) && !node[3]) return true; // `if' with empty `then' and no `else' - if (node[3]) { - if (empty(node[3])) return true; // `else' present but empty - return must_has_semicolon(node[3]); // dive into the `else' branch - } - return must_has_semicolon(node[2]); // dive into the `then' branch - } - }; - - function make_block_statements(statements, noindent) { - for (var a = [], last = statements.length - 1, i = 0; i <= last; ++i) { - var stat = statements[i]; - var code = make(stat); - if (code != ";") { - if (!beautify && i == last && !must_has_semicolon(stat)) { - code = code.replace(/;+\s*$/, ""); - } - a.push(code); - } - } - return noindent ? a : MAP(a, indent); - }; - - function make_switch_block(body) { - var n = body.length; - if (n == 0) return "{}"; - return "{" + newline + MAP(body, function(branch, i){ - var has_body = branch[1].length > 0, code = with_indent(function(){ - return indent(branch[0] - ? add_spaces([ "case", make(branch[0]) + ":" ]) - : "default:"); - }, 0.5) + (has_body ? newline + with_indent(function(){ - return make_block_statements(branch[1]).join(newline); - }) : ""); - if (!beautify && has_body && i < n - 1) - code += ";"; - return code; - }).join(newline) + newline + indent("}"); - }; - - function make_block(statements) { - if (!statements) return ";"; - if (statements.length == 0) return "{}"; - return "{" + newline + with_indent(function(){ - return make_block_statements(statements).join(newline); - }) + newline + indent("}"); - }; - - function make_1vardef(def) { - var name = def[0], val = def[1]; - if (val != null) - name = add_spaces([ make_name(name), "=", parenthesize(val, "seq") ]); - return name; - }; - -}; - -function split_lines(code, max_line_length) { - var splits = [ 0 ]; - jsp.parse(function(){ - var next_token = jsp.tokenizer(code); - var last_split = 0; - var prev_token; - function current_length(tok) { - return tok.pos - last_split; - }; - function split_here(tok) { - last_split = tok.pos; - splits.push(last_split); - }; - function custom(){ - var tok = next_token.apply(this, arguments); - out: { - if (prev_token) { - if (prev_token.type == "keyword") break out; - } - if (current_length(tok) > max_line_length) { - switch (tok.type) { - case "keyword": - case "atom": - case "name": - case "punc": - split_here(tok); - break out; - } - } - } - prev_token = tok; - return tok; - }; - custom.context = function() { - return next_token.context.apply(this, arguments); - }; - return custom; - }()); - return splits.map(function(pos, i){ - return code.substring(pos, splits[i + 1] || code.length); - }).join("\n"); -}; - -/* -----[ Utilities ]----- */ - -function repeat_string(str, i) { - if (i <= 0) return ""; - if (i == 1) return str; - var d = repeat_string(str, i >> 1); - d += d; - if (i & 1) d += str; - return d; -}; - -function defaults(args, defs) { - var ret = {}; - if (args === true) - args = {}; - for (var i in defs) if (HOP(defs, i)) { - ret[i] = (args && HOP(args, i)) ? args[i] : defs[i]; - } - return ret; -}; - -function is_identifier(name) { - return /^[a-z_$][a-z0-9_$]*$/i.test(name) - && name != "this" - && !HOP(jsp.KEYWORDS_ATOM, name) - && !HOP(jsp.RESERVED_WORDS, name) - && !HOP(jsp.KEYWORDS, name); -}; - -function HOP(obj, prop) { - return Object.prototype.hasOwnProperty.call(obj, prop); -}; - -// some utilities - -var MAP; - -(function(){ - MAP = function(a, f, o) { - var ret = [], top = [], i; - function doit() { - var val = f.call(o, a[i], i); - if (val instanceof AtTop) { - val = val.v; - if (val instanceof Splice) { - top.push.apply(top, val.v); - } else { - top.push(val); - } - } - else if (val != skip) { - if (val instanceof Splice) { - ret.push.apply(ret, val.v); - } else { - ret.push(val); - } - } - }; - if (a instanceof Array) for (i = 0; i < a.length; ++i) doit(); - else for (i in a) if (HOP(a, i)) doit(); - return top.concat(ret); - }; - MAP.at_top = function(val) { return new AtTop(val) }; - MAP.splice = function(val) { return new Splice(val) }; - var skip = MAP.skip = {}; - function AtTop(val) { this.v = val }; - function Splice(val) { this.v = val }; -})(); - -/* -----[ Exports ]----- */ - -exports.ast_walker = ast_walker; -exports.ast_mangle = ast_mangle; -exports.ast_squeeze = ast_squeeze; -exports.ast_lift_variables = ast_lift_variables; -exports.gen_code = gen_code; -exports.ast_add_scope = ast_add_scope; -exports.set_logger = function(logger) { warn = logger }; -exports.make_string = make_string; -exports.split_lines = split_lines; -exports.MAP = MAP; - -// keep this last! -exports.ast_squeeze_more = require("./squeeze-more").ast_squeeze_more; - -});define('uglifyjs/index', ["require", "exports", "module", "./parse-js", "./process", "./consolidator"], function(require, exports, module) { - -//convienence function(src, [options]); -function uglify(orig_code, options){ - options || (options = {}); - var jsp = uglify.parser; - var pro = uglify.uglify; - - var ast = jsp.parse(orig_code, options.strict_semicolons); // parse code and get the initial AST - ast = pro.ast_mangle(ast, options.mangle_options); // get a new AST with mangled names - ast = pro.ast_squeeze(ast, options.squeeze_options); // get an AST with compression optimizations - var final_code = pro.gen_code(ast, options.gen_options); // compressed code here - return final_code; -}; - -uglify.parser = require("./parse-js"); -uglify.uglify = require("./process"); -uglify.consolidator = require("./consolidator"); - -module.exports = uglify - -});/** - * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint plusplus: false, strict: false */ -/*global define: false */ - -define('parse', ['./uglifyjs/index'], function (uglify) { - var parser = uglify.parser, - processor = uglify.uglify, - ostring = Object.prototype.toString, - isArray; - - if (Array.isArray) { - isArray = Array.isArray; - } else { - isArray = function (it) { - return ostring.call(it) === "[object Array]"; - }; - } - - /** - * Determines if the AST node is an array literal - */ - function isArrayLiteral(node) { - return node[0] === 'array'; - } - - /** - * Determines if the AST node is an object literal - */ - function isObjectLiteral(node) { - return node[0] === 'object'; - } - - /** - * Converts a regular JS array of strings to an AST node that - * represents that array. - * @param {Array} ary - * @param {Node} an AST node that represents an array of strings. - */ - function toAstArray(ary) { - var output = [ - 'array', - [] - ], - i, item; - - for (i = 0; (item = ary[i]); i++) { - output[1].push([ - 'string', - item - ]); - } - - return output; - } - - /** - * Validates a node as being an object literal (like for i18n bundles) - * or an array literal with just string members. If an array literal, - * only return array members that are full strings. So the caller of - * this function should use the return value as the new value for the - * node. - * - * This function does not need to worry about comments, they are not - * present in this AST. - * - * @param {Node} node an AST node. - * - * @returns {Node} an AST node to use for the valid dependencies. - * If null is returned, then it means the input node was not a valid - * dependency. - */ - function validateDeps(node) { - var newDeps = ['array', []], - arrayArgs, i, dep; - - if (!node) { - return null; - } - - if (isObjectLiteral(node) || node[0] === 'function') { - return node; - } - - //Dependencies can be an object literal or an array. - if (!isArrayLiteral(node)) { - return null; - } - - arrayArgs = node[1]; - - for (i = 0; i < arrayArgs.length; i++) { - dep = arrayArgs[i]; - if (dep[0] === 'string') { - newDeps[1].push(dep); - } - } - return newDeps[1].length ? newDeps : null; - } - - /** - * Gets dependencies from a node, but only if it is an array literal, - * and only if the dependency is a string literal. - * - * This function does not need to worry about comments, they are not - * present in this AST. - * - * @param {Node} node an AST node. - * - * @returns {Array} of valid dependencies. - * If null is returned, then it means the input node was not a valid - * array literal, or did not have any string literals.. - */ - function getValidDeps(node) { - var newDeps = [], - arrayArgs, i, dep; - - if (!node) { - return null; - } - - if (isObjectLiteral(node) || node[0] === 'function') { - return null; - } - - //Dependencies can be an object literal or an array. - if (!isArrayLiteral(node)) { - return null; - } - - arrayArgs = node[1]; - - for (i = 0; i < arrayArgs.length; i++) { - dep = arrayArgs[i]; - if (dep[0] === 'string') { - newDeps.push(dep[1]); - } - } - return newDeps.length ? newDeps : null; - } - - /** - * Main parse function. Returns a string of any valid require or define/require.def - * calls as part of one JavaScript source string. - * @param {String} moduleName the module name that represents this file. - * It is used to create a default define if there is not one already for the file. - * This allows properly tracing dependencies for builds. Otherwise, if - * the file just has a require() call, the file dependencies will not be - * properly reflected: the file will come before its dependencies. - * @param {String} moduleName - * @param {String} fileName - * @param {String} fileContents - * @param {Object} options optional options. insertNeedsDefine: true will - * add calls to require.needsDefine() if appropriate. - * @returns {String} JS source string or null, if no require or define/require.def - * calls are found. - */ - function parse(moduleName, fileName, fileContents, options) { - options = options || {}; - - //Set up source input - var moduleDeps = [], - result = '', - moduleList = [], - needsDefine = true, - astRoot = parser.parse(fileContents), - i, moduleCall, depString; - - parse.recurse(astRoot, function (callName, config, name, deps) { - //If name is an array, it means it is an anonymous module, - //so adjust args appropriately. An anonymous module could - //have a FUNCTION as the name type, but just ignore those - //since we just want to find dependencies. - if (name && isArrayLiteral(name)) { - deps = name; - name = null; - } - - if (!(deps = getValidDeps(deps))) { - deps = []; - } - - //Get the name as a string literal, if it is available. - if (name && name[0] === 'string') { - name = name[1]; - } else { - name = null; - } - - if (callName === 'define' && (!name || name === moduleName)) { - needsDefine = false; - } - - if (!name) { - //If there is no module name, the dependencies are for - //this file/default module name. - moduleDeps = moduleDeps.concat(deps); - } else { - moduleList.push({ - name: name, - deps: deps - }); - } - - //If define was found, no need to dive deeper, unless - //the config explicitly wants to dig deeper. - return !options.findNestedDependencies; - }, options); - - if (options.insertNeedsDefine && needsDefine) { - result += 'require.needsDefine("' + moduleName + '");'; - } - - if (moduleDeps.length || moduleList.length) { - for (i = 0; (moduleCall = moduleList[i]); i++) { - if (result) { - result += '\n'; - } - - //If this is the main module for this file, combine any - //"anonymous" dependencies (could come from a nested require - //call) with this module. - if (moduleCall.name === moduleName) { - moduleCall.deps = moduleCall.deps.concat(moduleDeps); - moduleDeps = []; - } - - depString = moduleCall.deps.length ? '["' + moduleCall.deps.join('","') + '"]' : '[]'; - result += 'define("' + moduleCall.name + '",' + depString + ');'; - } - if (moduleDeps.length) { - if (result) { - result += '\n'; - } - depString = moduleDeps.length ? '["' + moduleDeps.join('","') + '"]' : '[]'; - result += 'define("' + moduleName + '",' + depString + ');'; - } - } - - return result ? result : null; - } - - //Add some private methods to object for use in derived objects. - parse.isArray = isArray; - parse.isObjectLiteral = isObjectLiteral; - parse.isArrayLiteral = isArrayLiteral; - - /** - * Handles parsing a file recursively for require calls. - * @param {Array} parentNode the AST node to start with. - * @param {Function} onMatch function to call on a parse match. - * @param {Object} [options] This is normally the build config options if - * it is passed. - * @param {Function} [recurseCallback] function to call on each valid - * node, defaults to parse.parseNode. - */ - parse.recurse = function (parentNode, onMatch, options, recurseCallback) { - var hasHas = options && options.has, - i, node; - - recurseCallback = recurseCallback || this.parseNode; - - if (isArray(parentNode)) { - for (i = 0; i < parentNode.length; i++) { - node = parentNode[i]; - if (isArray(node)) { - //If has config is in play, if calls have been converted - //by this point to be true/false values. So, if - //options has a 'has' value, skip if branches that have - //literal false values. - - //uglify returns if constructs in an array: - //[0]: 'if' - //[1]: the condition, ['name', true | false] for the has replaced case. - //[2]: the block to process if true - //[3]: the block to process if false - //For if/else if/else, the else if is in the [3], - //so only ever have to deal with this structure. - if (hasHas && node[0] === 'if' && node[1] && node[1][0] === 'name' && - (node[1][1] === 'true' || node[1][1] === 'false')) { - if (node[1][1] === 'true') { - this.recurse([node[2]], onMatch, options, recurseCallback); - } else { - this.recurse([node[3]], onMatch, options, recurseCallback); - } - } else { - if (recurseCallback(node, onMatch)) { - //The onMatch indicated parsing should - //stop for children of this node. - continue; - } - this.recurse(node, onMatch, options, recurseCallback); - } - } - } - } - }; - - /** - * Determines if the file defines require(). - * @param {String} fileName - * @param {String} fileContents - * @returns {Boolean} - */ - parse.definesRequire = function (fileName, fileContents) { - var astRoot = parser.parse(fileContents); - return this.nodeHasRequire(astRoot); - }; - - /** - * Finds require("") calls inside a CommonJS anonymous module wrapped in a - * define(function(require, exports, module){}) wrapper. These dependencies - * will be added to a modified define() call that lists the dependencies - * on the outside of the function. - * @param {String} fileName - * @param {String} fileContents - * @returns {Array} an array of module names that are dependencies. Always - * returns an array, but could be of length zero. - */ - parse.getAnonDeps = function (fileName, fileContents) { - var astRoot = parser.parse(fileContents), - defFunc = this.findAnonDefineFactory(astRoot); - - return parse.getAnonDepsFromNode(defFunc); - }; - - /** - * Finds require("") calls inside a CommonJS anonymous module wrapped - * in a define function, given an AST node for the definition function. - * @param {Node} node the AST node for the definition function. - * @returns {Array} and array of dependency names. Can be of zero length. - */ - parse.getAnonDepsFromNode = function (node) { - var deps = [], - funcArgLength; - - if (node) { - this.findRequireDepNames(node, deps); - - //If no deps, still add the standard CommonJS require, exports, module, - //in that order, to the deps, but only if specified as function args. - //In particular, if exports is used, it is favored over the return - //value of the function, so only add it if asked. - funcArgLength = node[2] && node[2].length; - if (funcArgLength) { - deps = (funcArgLength > 1 ? ["require", "exports", "module"] : - ["require"]).concat(deps); - } - } - return deps; - }; - - /** - * Finds the function in define(function (require, exports, module){}); - * @param {Array} node - * @returns {Boolean} - */ - parse.findAnonDefineFactory = function (node) { - var callback, i, n, call, args; - - if (isArray(node)) { - if (node[0] === 'call') { - call = node[1]; - args = node[2]; - if ((call[0] === 'name' && call[1] === 'define') || - (call[0] === 'dot' && call[1][1] === 'require' && call[2] === 'def')) { - - //There should only be one argument and it should be a function, - //or a named module with function as second arg - if (args.length === 1 && args[0][0] === 'function') { - return args[0]; - } else if (args.length === 2 && args[0][0] === 'string' && - args[1][0] === 'function') { - return args[1]; - } - } - } - - //Check child nodes - for (i = 0; i < node.length; i++) { - n = node[i]; - if ((callback = this.findAnonDefineFactory(n))) { - return callback; - } - } - } - - return null; - }; - - /** - * Finds any config that is passed to requirejs. - * @param {String} fileName - * @param {String} fileContents - * - * @returns {Object} a config object. Will be null if no config. - * Can throw an error if the config in the file cannot be evaluated in - * a build context to valid JavaScript. - */ - parse.findConfig = function (fileName, fileContents) { - /*jslint evil: true */ - //This is a litle bit inefficient, it ends up with two uglifyjs parser - //calls. Can revisit later, but trying to build out larger functional - //pieces first. - var foundConfig = null, - astRoot = parser.parse(fileContents); - - parse.recurse(astRoot, function (configNode) { - var jsConfig; - - if (!foundConfig && configNode) { - jsConfig = parse.nodeToString(configNode); - foundConfig = eval('(' + jsConfig + ')'); - return foundConfig; - } - return undefined; - }, null, parse.parseConfigNode); - - return foundConfig; - }; - - /** - * Finds all dependencies specified in dependency arrays and inside - * simplified commonjs wrappers. - * @param {String} fileName - * @param {String} fileContents - * - * @returns {Array} an array of dependency strings. The dependencies - * have not been normalized, they may be relative IDs. - */ - parse.findDependencies = function (fileName, fileContents, options) { - //This is a litle bit inefficient, it ends up with two uglifyjs parser - //calls. Can revisit later, but trying to build out larger functional - //pieces first. - var dependencies = [], - astRoot = parser.parse(fileContents); - - parse.recurse(astRoot, function (callName, config, name, deps) { - //Normalize the input args. - if (name && isArrayLiteral(name)) { - deps = name; - name = null; - } - - if ((deps = getValidDeps(deps))) { - dependencies = dependencies.concat(deps); - } - }, options); - - return dependencies; - }; - - /** - * Finds only CJS dependencies, ones that are the form require('stringLiteral') - */ - parse.findCjsDependencies = function (fileName, fileContents, options) { - //This is a litle bit inefficient, it ends up with two uglifyjs parser - //calls. Can revisit later, but trying to build out larger functional - //pieces first. - var dependencies = [], - astRoot = parser.parse(fileContents); - - parse.recurse(astRoot, function (dep) { - dependencies.push(dep); - }, options, function (node, onMatch) { - - var call, args; - - if (!isArray(node)) { - return false; - } - - if (node[0] === 'call') { - call = node[1]; - args = node[2]; - - if (call) { - //A require('') use. - if (call[0] === 'name' && call[1] === 'require' && - args[0][0] === 'string') { - return onMatch(args[0][1]); - } - } - } - - return false; - - }); - - return dependencies; - }; - - /** - * Determines if define(), require({}|[]) or requirejs was called in the - * file. Also finds out if define() is declared and if define.amd is called. - */ - parse.usesAmdOrRequireJs = function (fileName, fileContents, options) { - var astRoot = parser.parse(fileContents), - uses; - - parse.recurse(astRoot, function (prop) { - if (!uses) { - uses = {}; - } - uses[prop] = true; - }, options, parse.findAmdOrRequireJsNode); - - return uses; - }; - - /** - * Determines if require(''), exports.x =, module.exports =, - * __dirname, __filename are used. So, not strictly traditional CommonJS, - * also checks for Node variants. - */ - parse.usesCommonJs = function (fileName, fileContents, options) { - var uses = null, - assignsExports = false, - astRoot = parser.parse(fileContents); - - parse.recurse(astRoot, function (prop) { - if (prop === 'varExports') { - assignsExports = true; - } else if (prop !== 'exports' || !assignsExports) { - if (!uses) { - uses = {}; - } - uses[prop] = true; - } - }, options, function (node, onMatch) { - - var call, args; - - if (!isArray(node)) { - return false; - } - - if (node[0] === 'name' && (node[1] === '__dirname' || node[1] === '__filename')) { - return onMatch(node[1].substring(2)); - } else if (node[0] === 'var' && node[1] && node[1][0] && node[1][0][0] === 'exports') { - //Hmm, a variable assignment for exports, so does not use cjs exports. - return onMatch('varExports'); - } else if (node[0] === 'assign' && node[2] && node[2][0] === 'dot') { - args = node[2][1]; - - if (args) { - //An exports or module.exports assignment. - if (args[0] === 'name' && args[1] === 'module' && - node[2][2] === 'exports') { - return onMatch('moduleExports'); - } else if (args[0] === 'name' && args[1] === 'exports') { - return onMatch('exports'); - } - } - } else if (node[0] === 'call') { - call = node[1]; - args = node[2]; - - if (call) { - //A require('') use. - if (call[0] === 'name' && call[1] === 'require' && - args[0][0] === 'string') { - return onMatch('require'); - } - } - } - - return false; - - }); - - return uses; - }; - - - parse.findRequireDepNames = function (node, deps) { - var moduleName, i, n, call, args; - - if (isArray(node)) { - if (node[0] === 'call') { - call = node[1]; - args = node[2]; - - if (call && call[0] === 'name' && call[1] === 'require') { - moduleName = args[0]; - if (moduleName[0] === 'string') { - deps.push(moduleName[1]); - } - } - - - } - - //Check child nodes - for (i = 0; i < node.length; i++) { - n = node[i]; - this.findRequireDepNames(n, deps); - } - } - }; - - /** - * Determines if a given node contains a require() definition. - * @param {Array} node - * @returns {Boolean} - */ - parse.nodeHasRequire = function (node) { - if (this.isDefineNode(node)) { - return true; - } - - if (isArray(node)) { - for (var i = 0, n; i < node.length; i++) { - n = node[i]; - if (this.nodeHasRequire(n)) { - return true; - } - } - } - - return false; - }; - - /** - * Is the given node the actual definition of define(). Actually uses - * the definition of define.amd to find require. - * @param {Array} node - * @returns {Boolean} - */ - parse.isDefineNode = function (node) { - //Actually look for the define.amd = assignment, since - //that is more indicative of RequireJS vs a plain require definition. - var assign; - if (!node) { - return null; - } - - if (node[0] === 'assign' && node[1] === true) { - assign = node[2]; - if (assign[0] === 'dot' && assign[1][0] === 'name' && - assign[1][1] === 'define' && assign[2] === 'amd') { - return true; - } - } - return false; - }; - - /** - * Determines if a specific node is a valid require or define/require.def call. - * @param {Array} node - * @param {Function} onMatch a function to call when a match is found. - * It is passed the match name, and the config, name, deps possible args. - * The config, name and deps args are not normalized. - * - * @returns {String} a JS source string with the valid require/define call. - * Otherwise null. - */ - parse.parseNode = function (node, onMatch) { - var call, name, config, deps, args, cjsDeps; - - if (!isArray(node)) { - return false; - } - - if (node[0] === 'call') { - call = node[1]; - args = node[2]; - - if (call) { - if (call[0] === 'name' && - (call[1] === 'require' || call[1] === 'requirejs')) { - - //It is a plain require() call. - config = args[0]; - deps = args[1]; - if (isArrayLiteral(config)) { - deps = config; - config = null; - } - - if (!(deps = validateDeps(deps))) { - return null; - } - - return onMatch("require", null, null, deps); - - } else if (call[0] === 'name' && call[1] === 'define') { - - //A define call - name = args[0]; - deps = args[1]; - //Only allow define calls that match what is expected - //in an AMD call: - //* first arg should be string, array, function or object - //* second arg optional, or array, function or object. - //This helps weed out calls to a non-AMD define, but it is - //not completely robust. Someone could create a define - //function that still matches this shape, but this is the - //best that is possible, and at least allows UglifyJS, - //which does create its own internal define in one file, - //to be inlined. - if (((name[0] === 'string' || isArrayLiteral(name) || - name[0] === 'function' || isObjectLiteral(name))) && - (!deps || isArrayLiteral(deps) || - deps[0] === 'function' || isObjectLiteral(deps) || - // allow define(['dep'], factory) pattern - (isArrayLiteral(name) && deps[0] === 'name' && args.length === 2))) { - - //If first arg is a function, could be a commonjs wrapper, - //look inside for commonjs dependencies. - //Also, if deps is a function look for commonjs deps. - if (name && name[0] === 'function') { - cjsDeps = parse.getAnonDepsFromNode(name); - if (cjsDeps.length) { - name = toAstArray(cjsDeps); - } - } else if (deps && deps[0] === 'function') { - cjsDeps = parse.getAnonDepsFromNode(deps); - if (cjsDeps.length) { - deps = toAstArray(cjsDeps); - } - } - - return onMatch("define", null, name, deps); - } - } - } - } - - return false; - }; - - /** - * Looks for define(), require({} || []), requirejs({} || []) calls. - */ - parse.findAmdOrRequireJsNode = function (node, onMatch) { - var call, args, configNode, type; - - if (!isArray(node)) { - return false; - } - - if (node[0] === 'defun' && node[1] === 'define') { - type = 'declaresDefine'; - } else if (node[0] === 'assign' && node[2] && node[2][2] === 'amd' && - node[2][1] && node[2][1][0] === 'name' && - node[2][1][1] === 'define') { - type = 'defineAmd'; - } else if (node[0] === 'call') { - call = node[1]; - args = node[2]; - - if (call) { - if ((call[0] === 'dot' && - (call[1] && call[1][0] === 'name' && - (call[1][1] === 'require' || call[1][1] === 'requirejs')) && - call[2] === 'config')) { - //A require.config() or requirejs.config() call. - type = call[1][1] + 'Config'; - } else if (call[0] === 'name' && - (call[1] === 'require' || call[1] === 'requirejs')) { - //A require() or requirejs() config call. - //Only want ones that start with an object or an array. - configNode = args[0]; - if (configNode[0] === 'object' || configNode[0] === 'array') { - type = call[1]; - } - } else if (call[0] === 'name' && call[1] === 'define') { - //A define call. - type = 'define'; - } - } - } - - if (type) { - return onMatch(type); - } - - return false; - }; - - /** - * Determines if a specific node is a valid require/requirejs config - * call. That includes calls to require/requirejs.config(). - * @param {Array} node - * @param {Function} onMatch a function to call when a match is found. - * It is passed the match name, and the config, name, deps possible args. - * The config, name and deps args are not normalized. - * - * @returns {String} a JS source string with the valid require/define call. - * Otherwise null. - */ - parse.parseConfigNode = function (node, onMatch) { - var call, configNode, args; - - if (!isArray(node)) { - return false; - } - - if (node[0] === 'call') { - call = node[1]; - args = node[2]; - - if (call) { - //A require.config() or requirejs.config() call. - if ((call[0] === 'dot' && - (call[1] && call[1][0] === 'name' && - (call[1][1] === 'require' || call[1][1] === 'requirejs')) && - call[2] === 'config') || - //A require() or requirejs() config call. - - (call[0] === 'name' && - (call[1] === 'require' || call[1] === 'requirejs')) - ) { - //It is a plain require() call. - configNode = args[0]; - - if (configNode[0] !== 'object') { - return null; - } - - return onMatch(configNode); - - } - } - } - - return false; - }; - - /** - * Converts an AST node into a JS source string. Does not maintain formatting - * or even comments from original source, just returns valid JS source. - * @param {Array} node - * @returns {String} a JS source string. - */ - parse.nodeToString = function (node) { - return processor.gen_code(node, true); - }; - - return parse; -}); -/** - * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint regexp: false, strict: false, plusplus: false */ -/*global define: false */ - -define('pragma', ['parse', 'logger'], function (parse, logger) { - - function Temp() {} - - function create(obj, mixin) { - Temp.prototype = obj; - var temp = new Temp(), prop; - - //Avoid any extra memory hanging around - Temp.prototype = null; - - if (mixin) { - for (prop in mixin) { - if (mixin.hasOwnProperty(prop) && !(prop in temp)) { - temp[prop] = mixin[prop]; - } - } - } - - return temp; // Object - } - - var pragma = { - conditionalRegExp: /(exclude|include)Start\s*\(\s*["'](\w+)["']\s*,(.*)\)/, - useStrictRegExp: /['"]use strict['"];/g, - hasRegExp: /has\s*\(\s*['"]([^'"]+)['"]\s*\)/g, - nsRegExp: /(^|[^\.])(requirejs|require|define)\s*\(/, - nsWrapRegExp: /\/\*requirejs namespace: true \*\//, - apiDefRegExp: /var requirejs, require, define;/, - defineCheckRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd/g, - defineJQueryRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd\s*&&\s*define\s*\.\s*amd\s*\.\s*jQuery/g, - defineHasRegExp: /typeof\s+define\s*==(=)?\s*['"]function['"]\s*&&\s*typeof\s+define\.amd\s*==(=)?\s*['"]object['"]\s*&&\s*define\.amd/g, - defineTernaryRegExp: /typeof\s+define\s*===\s*['"]function["']\s*&&\s*define\s*\.\s*amd\s*\?\s*define/, - amdefineRegExp: /if\s*\(\s*typeof define\s*\!==\s*'function'\s*\)\s*\{\s*[^\{\}]+amdefine[^\{\}]+\}/g, - - removeStrict: function (contents, config) { - return config.useStrict ? contents : contents.replace(pragma.useStrictRegExp, ''); - }, - - namespace: function (fileContents, ns, onLifecycleName) { - if (ns) { - //Namespace require/define calls - fileContents = fileContents.replace(pragma.nsRegExp, '$1' + ns + '.$2('); - - //Namespace define ternary use: - fileContents = fileContents.replace(pragma.defineTernaryRegExp, - "typeof " + ns + ".define === 'function' && " + ns + ".define.amd ? " + ns + ".define"); - - //Namespace define jquery use: - fileContents = fileContents.replace(pragma.defineJQueryRegExp, - "typeof " + ns + ".define === 'function' && " + ns + ".define.amd && " + ns + ".define.amd.jQuery"); - - //Namespace has.js define use: - fileContents = fileContents.replace(pragma.defineHasRegExp, - "typeof " + ns + ".define === 'function' && typeof " + ns + ".define.amd === 'object' && " + ns + ".define.amd"); - - //Namespace define checks. - //Do this one last, since it is a subset of the more specific - //checks above. - fileContents = fileContents.replace(pragma.defineCheckRegExp, - "typeof " + ns + ".define === 'function' && " + ns + ".define.amd"); - - //Check for require.js with the require/define definitions - if (pragma.apiDefRegExp.test(fileContents) && - fileContents.indexOf("if (typeof " + ns + " === 'undefined')") === -1) { - //Wrap the file contents in a typeof check, and a function - //to contain the API globals. - fileContents = "var " + ns + ";(function () { if (typeof " + - ns + " === 'undefined') {\n" + - ns + ' = {};\n' + - fileContents + - "\n" + - ns + ".requirejs = requirejs;" + - ns + ".require = require;" + - ns + ".define = define;\n" + - "}\n}());"; - } - - //Finally, if the file wants a special wrapper because it ties - //in to the requirejs internals in a way that would not fit - //the above matches, do that. Look for /*requirejs namespace: true*/ - if (pragma.nsWrapRegExp.test(fileContents)) { - //Remove the pragma. - fileContents = fileContents.replace(pragma.nsWrapRegExp, ''); - - //Alter the contents. - fileContents = '(function () {\n' + - 'var require = ' + ns + '.require,' + - 'requirejs = ' + ns + '.requirejs,' + - 'define = ' + ns + '.define;\n' + - fileContents + - '\n}());' - } - } - - return fileContents; - }, - - /** - * processes the fileContents for some //>> conditional statements - */ - process: function (fileName, fileContents, config, onLifecycleName, pluginCollector) { - /*jslint evil: true */ - var foundIndex = -1, startIndex = 0, lineEndIndex, conditionLine, - matches, type, marker, condition, isTrue, endRegExp, endMatches, - endMarkerIndex, shouldInclude, startLength, lifecycleHas, deps, - i, dep, moduleName, - lifecyclePragmas, pragmas = config.pragmas, hasConfig = config.has, - //Legacy arg defined to help in dojo conversion script. Remove later - //when dojo no longer needs conversion: - kwArgs = pragmas; - - //Mix in a specific lifecycle scoped object, to allow targeting - //some pragmas/has tests to only when files are saved, or at different - //lifecycle events. Do not bother with kwArgs in this section, since - //the old dojo kwArgs were for all points in the build lifecycle. - if (onLifecycleName) { - lifecyclePragmas = config['pragmas' + onLifecycleName]; - lifecycleHas = config['has' + onLifecycleName]; - - if (lifecyclePragmas) { - pragmas = create(pragmas || {}, lifecyclePragmas); - } - - if (lifecycleHas) { - hasConfig = create(hasConfig || {}, lifecycleHas); - } - } - - //Replace has references if desired - if (hasConfig) { - fileContents = fileContents.replace(pragma.hasRegExp, function (match, test) { - if (test in hasConfig) { - return !!hasConfig[test]; - } - return match; - }); - } - - if (!config.skipPragmas) { - - while ((foundIndex = fileContents.indexOf("//>>", startIndex)) !== -1) { - //Found a conditional. Get the conditional line. - lineEndIndex = fileContents.indexOf("\n", foundIndex); - if (lineEndIndex === -1) { - lineEndIndex = fileContents.length - 1; - } - - //Increment startIndex past the line so the next conditional search can be done. - startIndex = lineEndIndex + 1; - - //Break apart the conditional. - conditionLine = fileContents.substring(foundIndex, lineEndIndex + 1); - matches = conditionLine.match(pragma.conditionalRegExp); - if (matches) { - type = matches[1]; - marker = matches[2]; - condition = matches[3]; - isTrue = false; - //See if the condition is true. - try { - isTrue = !!eval("(" + condition + ")"); - } catch (e) { - throw "Error in file: " + - fileName + - ". Conditional comment: " + - conditionLine + - " failed with this error: " + e; - } - - //Find the endpoint marker. - endRegExp = new RegExp('\\/\\/\\>\\>\\s*' + type + 'End\\(\\s*[\'"]' + marker + '[\'"]\\s*\\)', "g"); - endMatches = endRegExp.exec(fileContents.substring(startIndex, fileContents.length)); - if (endMatches) { - endMarkerIndex = startIndex + endRegExp.lastIndex - endMatches[0].length; - - //Find the next line return based on the match position. - lineEndIndex = fileContents.indexOf("\n", endMarkerIndex); - if (lineEndIndex === -1) { - lineEndIndex = fileContents.length - 1; - } - - //Should we include the segment? - shouldInclude = ((type === "exclude" && !isTrue) || (type === "include" && isTrue)); - - //Remove the conditional comments, and optionally remove the content inside - //the conditional comments. - startLength = startIndex - foundIndex; - fileContents = fileContents.substring(0, foundIndex) + - (shouldInclude ? fileContents.substring(startIndex, endMarkerIndex) : "") + - fileContents.substring(lineEndIndex + 1, fileContents.length); - - //Move startIndex to foundIndex, since that is the new position in the file - //where we need to look for more conditionals in the next while loop pass. - startIndex = foundIndex; - } else { - throw "Error in file: " + - fileName + - ". Cannot find end marker for conditional comment: " + - conditionLine; - - } - } - } - } - - //If need to find all plugin resources to optimize, do that now, - //before namespacing, since the namespacing will change the API - //names. - //If there is a plugin collector, scan the file for plugin resources. - if (config.optimizeAllPluginResources && pluginCollector) { - try { - deps = parse.findDependencies(fileName, fileContents); - if (deps.length) { - for (i = 0; (dep = deps[i]); i++) { - if (dep.indexOf('!') !== -1) { - (pluginCollector[moduleName] || - (pluginCollector[moduleName] = [])).push(dep); - } - } - } - } catch (eDep) { - logger.error('Parse error looking for plugin resources in ' + - fileName + ', skipping.'); - } - } - - //Strip amdefine use for node-shared modules. - fileContents = fileContents.replace(pragma.amdefineRegExp, ''); - - //Do namespacing - if (onLifecycleName === 'OnSave' && config.namespace) { - fileContents = pragma.namespace(fileContents, config.namespace, onLifecycleName); - } - - - return pragma.removeStrict(fileContents, config); - } - }; - - return pragma; -}); -if(env === 'node') { -/** - * @license Copyright (c) 2010-2011, 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 */ -/*global define: false */ - -define('node/optimize', {}); - -} - -if(env === 'rhino') { -/** - * @license Copyright (c) 2010-2011, 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 */ -/*global define: false, java: false, Packages: false */ - -define('rhino/optimize', ['logger'], function (logger) { - - //Add .reduce to Rhino so UglifyJS can run in Rhino, - //inspired by https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/reduce - //but rewritten for brevity, and to be good enough for use by UglifyJS. - if (!Array.prototype.reduce) { - Array.prototype.reduce = function (fn /*, initialValue */) { - var i = 0, - length = this.length, - accumulator; - - if (arguments.length >= 2) { - accumulator = arguments[1]; - } else { - do { - if (i in this) { - accumulator = this[i++]; - break; - } - } - while (true); - } - - for (; i < length; i++) { - if (i in this) { - accumulator = fn.call(undefined, accumulator, this[i], i, this); - } - } - - return accumulator; - }; - } - - var JSSourceFilefromCode, optimize; - - //Bind to Closure compiler, but if it is not available, do not sweat it. - try { - JSSourceFilefromCode = java.lang.Class.forName('com.google.javascript.jscomp.JSSourceFile').getMethod('fromCode', [java.lang.String, java.lang.String]); - } catch (e) {} - - //Helper for closure compiler, because of weird Java-JavaScript interactions. - function closurefromCode(filename, content) { - return JSSourceFilefromCode.invoke(null, [filename, content]); - } - - optimize = { - closure: function (fileName, fileContents, keepLines, config) { - config = config || {}; - var jscomp = Packages.com.google.javascript.jscomp, - flags = Packages.com.google.common.flags, - //Fake extern - externSourceFile = closurefromCode("fakeextern.js", " "), - //Set up source input - jsSourceFile = closurefromCode(String(fileName), String(fileContents)), - options, option, FLAG_compilation_level, compiler, - Compiler = Packages.com.google.javascript.jscomp.Compiler, - result; - - logger.trace("Minifying file: " + fileName); - - //Set up options - options = new jscomp.CompilerOptions(); - for (option in config.CompilerOptions) { - // options are false by default and jslint wanted an if statement in this for loop - if (config.CompilerOptions[option]) { - options[option] = config.CompilerOptions[option]; - } - - } - options.prettyPrint = keepLines || options.prettyPrint; - - FLAG_compilation_level = jscomp.CompilationLevel[config.CompilationLevel || 'SIMPLE_OPTIMIZATIONS']; - FLAG_compilation_level.setOptionsForCompilationLevel(options); - - //Trigger the compiler - Compiler.setLoggingLevel(Packages.java.util.logging.Level[config.loggingLevel || 'WARNING']); - compiler = new Compiler(); - - result = compiler.compile(externSourceFile, jsSourceFile, options); - if (!result.success) { - logger.error('Cannot closure compile file: ' + fileName + '. Skipping it.'); - } else { - fileContents = compiler.toSource(); - } - - return fileContents; - } - }; - - return optimize; -}); -} -/** - * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint plusplus: false, nomen: false, regexp: false */ -/*global define: false */ - -define('optimize', [ 'lang', 'logger', 'env!env/optimize', 'env!env/file', 'parse', - 'pragma', 'uglifyjs/index'], -function (lang, logger, envOptimize, file, parse, - pragma, uglify) { - - var optimize, - cssImportRegExp = /\@import\s+(url\()?\s*([^);]+)\s*(\))?([\w, ]*)(;)?/g, - cssCommentImportRegExp = /\/\*[^\*]*@import[^\*]*\*\//g, - cssUrlRegExp = /\url\(\s*([^\)]+)\s*\)?/g; - - /** - * If an URL from a CSS url value contains start/end quotes, remove them. - * This is not done in the regexp, since my regexp fu is not that strong, - * and the CSS spec allows for ' and " in the URL if they are backslash escaped. - * @param {String} url - */ - function cleanCssUrlQuotes(url) { - //Make sure we are not ending in whitespace. - //Not very confident of the css regexps above that there will not be ending - //whitespace. - url = url.replace(/\s+$/, ""); - - if (url.charAt(0) === "'" || url.charAt(0) === "\"") { - url = url.substring(1, url.length - 1); - } - - return url; - } - - /** - * Inlines nested stylesheets that have @import calls in them. - * @param {String} fileName the file name - * @param {String} fileContents the file contents - * @param {String} cssImportIgnore comma delimited string of files to ignore - * @param {Object} included an object used to track the files already imported - */ - function flattenCss(fileName, fileContents, cssImportIgnore, included) { - //Find the last slash in the name. - fileName = fileName.replace(lang.backSlashRegExp, "/"); - var endIndex = fileName.lastIndexOf("/"), - //Make a file path based on the last slash. - //If no slash, so must be just a file name. Use empty string then. - filePath = (endIndex !== -1) ? fileName.substring(0, endIndex + 1) : "", - //store a list of merged files - importList = []; - - //First make a pass by removing an commented out @import calls. - fileContents = fileContents.replace(cssCommentImportRegExp, ''); - - //Make sure we have a delimited ignore list to make matching faster - if (cssImportIgnore && cssImportIgnore.charAt(cssImportIgnore.length - 1) !== ",") { - cssImportIgnore += ","; - } - - fileContents = fileContents.replace(cssImportRegExp, function (fullMatch, urlStart, importFileName, urlEnd, mediaTypes) { - //Only process media type "all" or empty media type rules. - if (mediaTypes && ((mediaTypes.replace(/^\s\s*/, '').replace(/\s\s*$/, '')) !== "all")) { - return fullMatch; - } - - importFileName = cleanCssUrlQuotes(importFileName); - - //Ignore the file import if it is part of an ignore list. - if (cssImportIgnore && cssImportIgnore.indexOf(importFileName + ",") !== -1) { - return fullMatch; - } - - //Make sure we have a unix path for the rest of the operation. - importFileName = importFileName.replace(lang.backSlashRegExp, "/"); - - try { - //if a relative path, then tack on the filePath. - //If it is not a relative path, then the readFile below will fail, - //and we will just skip that import. - var fullImportFileName = importFileName.charAt(0) === "/" ? importFileName : filePath + importFileName, - importContents = file.readFile(fullImportFileName), i, - importEndIndex, importPath, fixedUrlMatch, colonIndex, parts, flat; - - //Skip the file if it has already been included. - if (included[fullImportFileName]) { - return ''; - } - included[fullImportFileName] = true; - - //Make sure to flatten any nested imports. - flat = flattenCss(fullImportFileName, importContents, cssImportIgnore, included); - importContents = flat.fileContents; - - if (flat.importList.length) { - importList.push.apply(importList, flat.importList); - } - - //Make the full import path - importEndIndex = importFileName.lastIndexOf("/"); - - //Make a file path based on the last slash. - //If no slash, so must be just a file name. Use empty string then. - importPath = (importEndIndex !== -1) ? importFileName.substring(0, importEndIndex + 1) : ""; - - //fix url() on relative import (#5) - importPath = importPath.replace(/^\.\//, ''); - - //Modify URL paths to match the path represented by this file. - importContents = importContents.replace(cssUrlRegExp, function (fullMatch, urlMatch) { - fixedUrlMatch = cleanCssUrlQuotes(urlMatch); - fixedUrlMatch = fixedUrlMatch.replace(lang.backSlashRegExp, "/"); - - //Only do the work for relative URLs. Skip things that start with / or have - //a protocol. - colonIndex = fixedUrlMatch.indexOf(":"); - if (fixedUrlMatch.charAt(0) !== "/" && (colonIndex === -1 || colonIndex > fixedUrlMatch.indexOf("/"))) { - //It is a relative URL, tack on the path prefix - urlMatch = importPath + fixedUrlMatch; - } else { - logger.trace(importFileName + "\n URL not a relative URL, skipping: " + urlMatch); - } - - //Collapse .. and . - parts = urlMatch.split("/"); - for (i = parts.length - 1; i > 0; i--) { - if (parts[i] === ".") { - parts.splice(i, 1); - } else if (parts[i] === "..") { - if (i !== 0 && parts[i - 1] !== "..") { - parts.splice(i - 1, 2); - i -= 1; - } - } - } - - return "url(" + parts.join("/") + ")"; - }); - - importList.push(fullImportFileName); - return importContents; - } catch (e) { - logger.warn(fileName + "\n Cannot inline css import, skipping: " + importFileName); - return fullMatch; - } - }); - - return { - importList : importList, - fileContents : fileContents - }; - } - - optimize = { - licenseCommentRegExp: /\/\*[\s\S]*?\*\//g, - - /** - * Optimizes a file that contains JavaScript content. Optionally collects - * plugin resources mentioned in a file, and then passes the content - * through an minifier if one is specified via config.optimize. - * - * @param {String} fileName the name of the file to optimize - * @param {String} fileContents the contents to optimize. If this is - * a null value, then fileName will be used to read the fileContents. - * @param {String} outFileName the name of the file to use for the - * saved optimized content. - * @param {Object} config the build config object. - * @param {Array} [pluginCollector] storage for any plugin resources - * found. - */ - jsFile: function (fileName, fileContents, outFileName, config, pluginCollector) { - var parts = (config.optimize + "").split('.'), - optimizerName = parts[0], - keepLines = parts[1] === 'keepLines'; - - if (!fileContents) { - fileContents = file.readFile(fileName); - } - - fileContents = optimize.js(fileName, fileContents, optimizerName, - keepLines, config, pluginCollector); - - file.saveUtf8File(outFileName, fileContents); - }, - - /** - * Optimizes a file that contains JavaScript content. Optionally collects - * plugin resources mentioned in a file, and then passes the content - * through an minifier if one is specified via config.optimize. - * - * @param {String} fileName the name of the file that matches the - * fileContents. - * @param {String} fileContents the string of JS to optimize. - * @param {String} [optimizerName] optional name of the optimizer to - * use. 'uglify' is default. - * @param {Boolean} [keepLines] whether to keep line returns in the optimization. - * @param {Object} [config] the build config object. - * @param {Array} [pluginCollector] storage for any plugin resources - * found. - */ - js: function (fileName, fileContents, optimizerName, keepLines, config, pluginCollector) { - var licenseContents = '', - optFunc, match, comment; - - config = config || {}; - - //Apply pragmas/namespace renaming - fileContents = pragma.process(fileName, fileContents, config, 'OnSave', pluginCollector); - - //Optimize the JS files if asked. - if (optimizerName && optimizerName !== 'none') { - optFunc = envOptimize[optimizerName] || optimize.optimizers[optimizerName]; - if (!optFunc) { - throw new Error('optimizer with name of "' + - optimizerName + - '" not found for this environment'); - } - - if (config.preserveLicenseComments) { - //Pull out any license comments for prepending after optimization. - optimize.licenseCommentRegExp.lastIndex = 0; - while ((match = optimize.licenseCommentRegExp.exec(fileContents))) { - comment = match[0]; - //Only keep the comments if they are license comments. - if (comment.indexOf('@license') !== -1 || - comment.indexOf('/*!') === 0) { - licenseContents += comment + '\n'; - } - } - } - - fileContents = licenseContents + optFunc(fileName, fileContents, keepLines, - config[optimizerName]); - } - - return fileContents; - }, - - /** - * Optimizes one CSS file, inlining @import calls, stripping comments, and - * optionally removes line returns. - * @param {String} fileName the path to the CSS file to optimize - * @param {String} outFileName the path to save the optimized file. - * @param {Object} config the config object with the optimizeCss and - * cssImportIgnore options. - */ - cssFile: function (fileName, outFileName, config) { - - //Read in the file. Make sure we have a JS string. - var originalFileContents = file.readFile(fileName), - flat = flattenCss(fileName, originalFileContents, config.cssImportIgnore, {}), - fileContents = flat.fileContents, - startIndex, endIndex, buildText; - - //Do comment removal. - try { - if (config.optimizeCss.indexOf(".keepComments") === -1) { - startIndex = -1; - //Get rid of comments. - while ((startIndex = fileContents.indexOf("/*")) !== -1) { - endIndex = fileContents.indexOf("*/", startIndex + 2); - if (endIndex === -1) { - throw "Improper comment in CSS file: " + fileName; - } - fileContents = fileContents.substring(0, startIndex) + fileContents.substring(endIndex + 2, fileContents.length); - } - } - //Get rid of newlines. - if (config.optimizeCss.indexOf(".keepLines") === -1) { - fileContents = fileContents.replace(/[\r\n]/g, ""); - fileContents = fileContents.replace(/\s+/g, " "); - fileContents = fileContents.replace(/\{\s/g, "{"); - fileContents = fileContents.replace(/\s\}/g, "}"); - } else { - //Remove multiple empty lines. - fileContents = fileContents.replace(/(\r\n)+/g, "\r\n"); - fileContents = fileContents.replace(/(\n)+/g, "\n"); - } - } catch (e) { - fileContents = originalFileContents; - logger.error("Could not optimized CSS file: " + fileName + ", error: " + e); - } - - file.saveUtf8File(outFileName, fileContents); - - //text output to stdout and/or written to build.txt file - buildText = "\n"+ outFileName.replace(config.dir, "") +"\n----------------\n"; - flat.importList.push(fileName); - buildText += flat.importList.map(function(path){ - return path.replace(config.dir, ""); - }).join("\n"); - return buildText +"\n"; - }, - - /** - * Optimizes CSS files, inlining @import calls, stripping comments, and - * optionally removes line returns. - * @param {String} startDir the path to the top level directory - * @param {Object} config the config object with the optimizeCss and - * cssImportIgnore options. - */ - css: function (startDir, config) { - var buildText = "", - i, fileName, fileList; - if (config.optimizeCss.indexOf("standard") !== -1) { - fileList = file.getFilteredFileList(startDir, /\.css$/, true); - if (fileList) { - for (i = 0; i < fileList.length; i++) { - fileName = fileList[i]; - logger.trace("Optimizing (" + config.optimizeCss + ") CSS file: " + fileName); - buildText += optimize.cssFile(fileName, fileName, config); - } - } - } - return buildText; - }, - - optimizers: { - uglify: function (fileName, fileContents, keepLines, config) { - var parser = uglify.parser, - processor = uglify.uglify, - ast; - - config = config || {}; - - logger.trace("Uglifying file: " + fileName); - - try { - ast = parser.parse(fileContents, config.strict_semicolons); - ast = processor.ast_mangle(ast, config); - ast = processor.ast_squeeze(ast, config); - - fileContents = processor.gen_code(ast, config); - } catch (e) { - logger.error('Cannot uglify file: ' + fileName + '. Skipping it. Error is:\n' + e.toString()); - } - return fileContents; - } - } - }; - - return optimize; -}); -/** - * @license RequireJS Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ -/* - * This file patches require.js to communicate with the build system. - */ - -/*jslint nomen: false, plusplus: false, regexp: false, strict: false */ -/*global require: false, define: true */ - -//NOT asking for require as a dependency since the goal is to modify the -//global require below -define('requirePatch', [ 'env!env/file', 'pragma', 'parse'], -function (file, pragma, parse) { - - var allowRun = true; - - //This method should be called when the patches to require should take hold. - return function () { - if (!allowRun) { - return; - } - allowRun = false; - - var layer, - pluginBuilderRegExp = /(["']?)pluginBuilder(["']?)\s*[=\:]\s*["']([^'"\s]+)["']/, - oldDef; - - - /** Print out some extrs info about the module tree that caused the error. **/ - require.onError = function (err) { - - var msg = '\nIn module tree:\n', - standardIndent = ' ', - tree = err.moduleTree, - i, j, mod; - - if (tree && tree.length > 0) { - for (i = tree.length - 1; i > -1 && (mod = tree[i]); i--) { - for (j = tree.length - i; j > -1; j--) { - msg += standardIndent; - } - msg += mod + '\n'; - } - - err = new Error(err.toString() + msg); - } - - throw err; - }; - - //Stored cached file contents for reuse in other layers. - require._cachedFileContents = {}; - - /** Reset state for each build layer pass. */ - require._buildReset = function () { - var oldContext = require.s.contexts._; - - //Clear up the existing context. - delete require.s.contexts._; - - //Set up new context, so the layer object can hold onto it. - require({}); - - layer = require._layer = { - buildPathMap: {}, - buildFileToModule: {}, - buildFilePaths: [], - pathAdded: {}, - modulesWithNames: {}, - needsDefine: {}, - existingRequireUrl: "", - context: require.s.contexts._ - }; - - //Return the previous context in case it is needed, like for - //the basic config object. - return oldContext; - }; - - require._buildReset(); - - /** - * Makes sure the URL is something that can be supported by the - * optimization tool. - * @param {String} url - * @returns {Boolean} - */ - require._isSupportedBuildUrl = function (url) { - //Ignore URLs with protocols, hosts or question marks, means either network - //access is needed to fetch it or it is too dynamic. Note that - //on Windows, full paths are used for some urls, which include - //the drive, like c:/something, so need to test for something other - //than just a colon. - return url.indexOf("://") === -1 && url.indexOf("?") === -1 && - url.indexOf('empty:') !== 0 && url.indexOf('//') !== 0; - }; - - //Override define() to catch modules that just define an object, so that - //a dummy define call is not put in the build file for them. They do - //not end up getting defined via require.execCb, so we need to catch them - //at the define call. - oldDef = define; - - //This function signature does not have to be exact, just match what we - //are looking for. - define = function (name, obj) { - if (typeof name === "string" && !layer.needsDefine[name]) { - layer.modulesWithNames[name] = true; - } - return oldDef.apply(require, arguments); - }; - - define.amd = oldDef.amd; - - //Add some utilities for plugins - require._readFile = file.readFile; - require._fileExists = function (path) { - return file.exists(path); - }; - - function normalizeUrlWithBase(context, moduleName, url) { - //Adjust the URL if it was not transformed to use baseUrl. - if (require.jsExtRegExp.test(moduleName)) { - url = (context.config.dir || context.config.dirBaseUrl) + url; - } - return url; - } - - //Override load so that the file paths can be collected. - require.load = function (context, moduleName, url) { - /*jslint evil: true */ - var contents, pluginBuilderMatch, builderName; - - context.scriptCount += 1; - - //Only handle urls that can be inlined, so that means avoiding some - //URLs like ones that require network access or may be too dynamic, - //like JSONP - if (require._isSupportedBuildUrl(url)) { - //Adjust the URL if it was not transformed to use baseUrl. - url = normalizeUrlWithBase(context, moduleName, url); - - //Save the module name to path and path to module name mappings. - layer.buildPathMap[moduleName] = url; - layer.buildFileToModule[url] = moduleName; - - if (moduleName in context.plugins) { - //plugins need to have their source evaled as-is. - context.needFullExec[moduleName] = true; - } - - try { - if (url in require._cachedFileContents && - (!context.needFullExec[moduleName] || context.fullExec[moduleName])) { - contents = require._cachedFileContents[url]; - } else { - //Load the file contents, process for conditionals, then - //evaluate it. - contents = file.readFile(url); - - //If there is a read filter, run it now. - if (context.config.onBuildRead) { - contents = context.config.onBuildRead(moduleName, url, contents); - } - - contents = pragma.process(url, contents, context.config, 'OnExecute'); - - //Find out if the file contains a require() definition. Need to know - //this so we can inject plugins right after it, but before they are needed, - //and to make sure this file is first, so that define calls work. - //This situation mainly occurs when the build is done on top of the output - //of another build, where the first build may include require somewhere in it. - try { - if (!layer.existingRequireUrl && parse.definesRequire(url, contents)) { - layer.existingRequireUrl = url; - } - } catch (e1) { - throw new Error('Parse error using UglifyJS ' + - 'for file: ' + url + '\n' + e1); - } - - if (moduleName in context.plugins) { - //This is a loader plugin, check to see if it has a build extension, - //otherwise the plugin will act as the plugin builder too. - pluginBuilderMatch = pluginBuilderRegExp.exec(contents); - if (pluginBuilderMatch) { - //Load the plugin builder for the plugin contents. - builderName = context.normalize(pluginBuilderMatch[3], moduleName); - contents = file.readFile(context.nameToUrl(builderName)); - } - } - - //Parse out the require and define calls. - //Do this even for plugins in case they have their own - //dependencies that may be separate to how the pluginBuilder works. - try { - if (!context.needFullExec[moduleName]) { - contents = parse(moduleName, url, contents, { - insertNeedsDefine: true, - has: context.config.has, - findNestedDependencies: context.config.findNestedDependencies - }); - } - } catch (e2) { - throw new Error('Parse error using UglifyJS ' + - 'for file: ' + url + '\n' + e2); - } - - require._cachedFileContents[url] = contents; - } - - if (contents) { - eval(contents); - } - - //Need to close out completion of this module - //so that listeners will get notified that it is available. - try { - context.completeLoad(moduleName); - } catch (e) { - //Track which module could not complete loading. - (e.moduleTree || (e.moduleTree = [])).push(moduleName); - throw e; - } - - } catch (eOuter) { - if (!eOuter.fileName) { - eOuter.fileName = url; - } - throw eOuter; - } - } else { - //With unsupported URLs still need to call completeLoad to - //finish loading. - context.completeLoad(moduleName); - } - - //Mark the module loaded. - context.loaded[moduleName] = true; - }; - - - //Called when execManager runs for a dependency. Used to figure out - //what order of execution. - require.onResourceLoad = function (context, map) { - var fullName = map.fullName, - url; - - //Ignore "fake" modules, usually generated by plugin code, since - //they do not map back to a real file to include in the optimizer, - //or it will be included, but in a different form. - if (context.fake[fullName]) { - return; - } - - //A plugin. - if (map.prefix) { - if (!layer.pathAdded[fullName]) { - layer.buildFilePaths.push(fullName); - //For plugins the real path is not knowable, use the name - //for both module to file and file to module mappings. - layer.buildPathMap[fullName] = fullName; - layer.buildFileToModule[fullName] = fullName; - layer.modulesWithNames[fullName] = true; - layer.pathAdded[fullName] = true; - } - } else if (map.url && require._isSupportedBuildUrl(map.url)) { - //If the url has not been added to the layer yet, and it - //is from an actual file that was loaded, add it now. - url = normalizeUrlWithBase(context, map.fullName, map.url); - if (!layer.pathAdded[url] && layer.buildPathMap[fullName]) { - //Remember the list of dependencies for this layer. - layer.buildFilePaths.push(url); - layer.pathAdded[url] = true; - } - } - }; - - //Called by output of the parse() function, when a file does not - //explicitly call define, probably just require, but the parse() - //function normalizes on define() for dependency mapping and file - //ordering works correctly. - require.needsDefine = function (moduleName) { - layer.needsDefine[moduleName] = true; - }; - - //Marks module has having a name, and optionally executes the - //callback, but only if it meets certain criteria. - require.execCb = function (name, cb, args, exports) { - if (!layer.needsDefine[name]) { - layer.modulesWithNames[name] = true; - } - if (cb.__requireJsBuild || layer.context.needFullExec[name]) { - return cb.apply(exports, args); - } - return undefined; - }; - }; -}); -/** - * @license RequireJS Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint plusplus: false, regexp: false, strict: false */ -/*global define: false, console: false */ - -define('commonJs', ['env!env/file', 'uglifyjs/index'], function (file, uglify) { - var commonJs = { - depRegExp: /require\s*\(\s*["']([\w-_\.\/]+)["']\s*\)/g, - - //Set this to false in non-rhino environments. If rhino, then it uses - //rhino's decompiler to remove comments before looking for require() calls, - //otherwise, it will use a crude regexp approach to remove comments. The - //rhino way is more robust, but he regexp is more portable across environments. - useRhino: true, - - //Set to false if you do not want this file to log. Useful in environments - //like node where you want the work to happen without noise. - useLog: true, - - convertDir: function (commonJsPath, savePath) { - var fileList, i, - jsFileRegExp = /\.js$/, - fileName, convertedFileName, fileContents; - - //Get list of files to convert. - fileList = file.getFilteredFileList(commonJsPath, /\w/, true); - - //Normalize on front slashes and make sure the paths do not end in a slash. - commonJsPath = commonJsPath.replace(/\\/g, "/"); - savePath = savePath.replace(/\\/g, "/"); - if (commonJsPath.charAt(commonJsPath.length - 1) === "/") { - commonJsPath = commonJsPath.substring(0, commonJsPath.length - 1); - } - if (savePath.charAt(savePath.length - 1) === "/") { - savePath = savePath.substring(0, savePath.length - 1); - } - - //Cycle through all the JS files and convert them. - if (!fileList || !fileList.length) { - if (commonJs.useLog) { - if (commonJsPath === "convert") { - //A request just to convert one file. - console.log('\n\n' + commonJs.convert(savePath, file.readFile(savePath))); - } else { - console.log("No files to convert in directory: " + commonJsPath); - } - } - } else { - for (i = 0; (fileName = fileList[i]); i++) { - convertedFileName = fileName.replace(commonJsPath, savePath); - - //Handle JS files. - if (jsFileRegExp.test(fileName)) { - fileContents = file.readFile(fileName); - fileContents = commonJs.convert(fileName, fileContents); - file.saveUtf8File(convertedFileName, fileContents); - } else { - //Just copy the file over. - file.copyFile(fileName, convertedFileName, true); - } - } - } - }, - - /** - * Removes the comments from a string. - * - * @param {String} fileContents - * @param {String} fileName mostly used for informative reasons if an error. - * - * @returns {String} a string of JS with comments removed. - */ - removeComments: function (fileContents, fileName) { - //Uglify's ast generation removes comments, so just convert to ast, - //then back to source code to get rid of comments. - return uglify.uglify.gen_code(uglify.parser.parse(fileContents), true); - }, - - /** - * Regexp for testing if there is already a require.def call in the file, - * in which case do not try to convert it. - */ - defRegExp: /define\s*\(\s*("|'|\[|function)/, - - /** - * Regexp for testing if there is a require([]) or require(function(){}) - * call, indicating the file is already in requirejs syntax. - */ - rjsRegExp: /require\s*\(\s*(\[|function)/, - - /** - * Does the actual file conversion. - * - * @param {String} fileName the name of the file. - * - * @param {String} fileContents the contents of a file :) - * - * @param {Boolean} skipDeps if true, require("") dependencies - * will not be searched, but the contents will just be wrapped in the - * standard require, exports, module dependencies. Only usable in sync - * environments like Node where the require("") calls can be resolved on - * the fly. - * - * @returns {String} the converted contents - */ - convert: function (fileName, fileContents, skipDeps) { - //Strip out comments. - try { - var deps = [], depName, match, - //Remove comments - tempContents = commonJs.removeComments(fileContents, fileName); - - //First see if the module is not already RequireJS-formatted. - if (commonJs.defRegExp.test(tempContents) || commonJs.rjsRegExp.test(tempContents)) { - return fileContents; - } - - //Reset the regexp to start at beginning of file. Do this - //since the regexp is reused across files. - commonJs.depRegExp.lastIndex = 0; - - if (!skipDeps) { - //Find dependencies in the code that was not in comments. - while ((match = commonJs.depRegExp.exec(tempContents))) { - depName = match[1]; - if (depName) { - deps.push('"' + depName + '"'); - } - } - } - - //Construct the wrapper boilerplate. - fileContents = 'define(["require", "exports", "module"' + - (deps.length ? ', ' + deps.join(",") : '') + '], ' + - 'function(require, exports, module) {\n' + - fileContents + - '\n});\n'; - } catch (e) { - console.log("COULD NOT CONVERT: " + fileName + ", so skipping it. Error was: " + e); - return fileContents; - } - - return fileContents; - } - }; - - return commonJs; -}); -/** - * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/*jslint plusplus: true, nomen: true */ -/*global define, require */ - - -define('build', [ 'lang', 'logger', 'env!env/file', 'parse', 'optimize', 'pragma', - 'env!env/load', 'requirePatch'], -function (lang, logger, file, parse, optimize, pragma, - load, requirePatch) { - 'use strict'; - - var build, buildBaseConfig, - endsWithSemiColonRegExp = /;\s*$/; - - buildBaseConfig = { - appDir: "", - pragmas: {}, - paths: {}, - optimize: "uglify", - optimizeCss: "standard.keepLines", - inlineText: true, - isBuild: true, - optimizeAllPluginResources: false, - findNestedDependencies: false, - preserveLicenseComments: true, - //By default, all files/directories are copied, unless - //they match this regexp, by default just excludes .folders - dirExclusionRegExp: file.dirExclusionRegExp - }; - - /** - * Some JS may not be valid if concatenated with other JS, in particular - * the style of omitting semicolons and rely on ASI. Add a semicolon in - * those cases. - */ - function addSemiColon(text) { - if (endsWithSemiColonRegExp.test(text)) { - return text; - } else { - return text + ";"; - } - } - - /** - * If the path looks like an URL, throw an error. This is to prevent - * people from using URLs with protocols in the build config, since - * the optimizer is not set up to do network access. However, be - * sure to allow absolute paths on Windows, like C:\directory. - */ - function disallowUrls(path) { - if ((path.indexOf('://') !== -1 || path.indexOf('//') === 0) && path !== 'empty:') { - throw new Error('Path is not supported: ' + path + - '\nOptimizer can only handle' + - ' local paths. Download the locally if necessary' + - ' and update the config to use a local path.\n' + - 'http://requirejs.org/docs/errors.html#pathnotsupported'); - } - } - - function endsWithSlash(dirName) { - if (dirName.charAt(dirName.length - 1) !== "/") { - dirName += "/"; - } - disallowUrls(dirName); - return dirName; - } - - //Method used by plugin writeFile calls, defined up here to avoid - //jslint warning about "making a function in a loop". - function makeWriteFile(anonDefRegExp, namespaceWithDot, layer) { - function writeFile(name, contents) { - logger.trace('Saving plugin-optimized file: ' + name); - file.saveUtf8File(name, contents); - } - - writeFile.asModule = function (moduleName, fileName, contents) { - writeFile(fileName, - build.toTransport(anonDefRegExp, namespaceWithDot, moduleName, fileName, contents, layer)); - }; - - return writeFile; - } - - /** - * Main API entry point into the build. The args argument can either be - * an array of arguments (like the onese passed on a command-line), - * or it can be a JavaScript object that has the format of a build profile - * file. - * - * If it is an object, then in addition to the normal properties allowed in - * a build profile file, the object should contain one other property: - * - * The object could also contain a "buildFile" property, which is a string - * that is the file path to a build profile that contains the rest - * of the build profile directives. - * - * This function does not return a status, it should throw an error if - * there is a problem completing the build. - */ - build = function (args) { - var buildFile, cmdConfig; - - if (!args || lang.isArray(args)) { - if (!args || args.length < 1) { - logger.error("build.js buildProfile.js\n" + - "where buildProfile.js is the name of the build file (see example.build.js for hints on how to make a build file)."); - return undefined; - } - - //Next args can include a build file path as well as other build args. - //build file path comes first. If it does not contain an = then it is - //a build file path. Otherwise, just all build args. - if (args[0].indexOf("=") === -1) { - buildFile = args[0]; - args.splice(0, 1); - } - - //Remaining args are options to the build - cmdConfig = build.convertArrayToObject(args); - cmdConfig.buildFile = buildFile; - } else { - cmdConfig = args; - } - - return build._run(cmdConfig); - }; - - build._run = function (cmdConfig) { - var buildFileContents = "", - pluginCollector = {}, - buildPaths, fileName, fileNames, - prop, paths, i, - baseConfig, config, - modules, builtModule, srcPath, buildContext, - destPath, moduleName, moduleMap, parentModuleMap, context, - resources, resource, pluginProcessed = {}, plugin, fileContents; - - //Can now run the patches to require.js to allow it to be used for - //build generation. Do it here instead of at the top of the module - //because we want normal require behavior to load the build tool - //then want to switch to build mode. - requirePatch(); - - config = build.createConfig(cmdConfig); - paths = config.paths; - - if (config.logLevel) { - logger.logLevel(config.logLevel); - } - - if (!config.out && !config.cssIn) { - //This is not just a one-off file build but a full build profile, with - //lots of files to process. - - //First copy all the baseUrl content - file.copyDir((config.appDir || config.baseUrl), config.dir, /\w/, true); - - //Adjust baseUrl if config.appDir is in play, and set up build output paths. - buildPaths = {}; - if (config.appDir) { - //All the paths should be inside the appDir, so just adjust - //the paths to use the dirBaseUrl - for (prop in paths) { - if (paths.hasOwnProperty(prop)) { - buildPaths[prop] = paths[prop].replace(config.appDir, config.dir); - } - } - } else { - //If no appDir, then make sure to copy the other paths to this directory. - for (prop in paths) { - if (paths.hasOwnProperty(prop)) { - //Set up build path for each path prefix. - buildPaths[prop] = paths[prop] === 'empty:' ? 'empty:' : prop.replace(/\./g, "/"); - - //Make sure source path is fully formed with baseUrl, - //if it is a relative URL. - srcPath = paths[prop]; - if (srcPath.indexOf('/') !== 0 && srcPath.indexOf(':') === -1) { - srcPath = config.baseUrl + srcPath; - } - - destPath = config.dirBaseUrl + buildPaths[prop]; - - //Skip empty: paths - if (srcPath !== 'empty:') { - //If the srcPath is a directory, copy the whole directory. - if (file.exists(srcPath) && file.isDirectory(srcPath)) { - //Copy files to build area. Copy all files (the /\w/ regexp) - file.copyDir(srcPath, destPath, /\w/, true); - } else { - //Try a .js extension - srcPath += '.js'; - destPath += '.js'; - file.copyFile(srcPath, destPath); - } - } - } - } - } - } - - //Figure out source file location for each module layer. Do this by seeding require - //with source area configuration. This is needed so that later the module layers - //can be manually copied over to the source area, since the build may be - //require multiple times and the above copyDir call only copies newer files. - require({ - baseUrl: config.baseUrl, - paths: paths, - packagePaths: config.packagePaths, - packages: config.packages - }); - buildContext = require.s.contexts._; - modules = config.modules; - - if (modules) { - modules.forEach(function (module) { - if (module.name) { - module._sourcePath = buildContext.nameToUrl(module.name); - //If the module does not exist, and this is not a "new" module layer, - //as indicated by a true "create" property on the module, and - //it is not a plugin-loaded resource, then throw an error. - if (!file.exists(module._sourcePath) && !module.create && - module.name.indexOf('!') === -1) { - throw new Error("ERROR: module path does not exist: " + - module._sourcePath + " for module named: " + module.name + - ". Path is relative to: " + file.absPath('.')); - } - } - }); - } - - if (config.out) { - //Just set up the _buildPath for the module layer. - require(config); - if (!config.cssIn) { - config.modules[0]._buildPath = config.out; - } - } else if (!config.cssIn) { - //Now set up the config for require to use the build area, and calculate the - //build file locations. Pass along any config info too. - baseConfig = { - baseUrl: config.dirBaseUrl, - paths: buildPaths - }; - - lang.mixin(baseConfig, config); - require(baseConfig); - - if (modules) { - modules.forEach(function (module) { - if (module.name) { - module._buildPath = buildContext.nameToUrl(module.name, null); - if (!module.create) { - file.copyFile(module._sourcePath, module._buildPath); - } - } - }); - } - } - - //Run CSS optimizations before doing JS module tracing, to allow - //things like text loader plugins loading CSS to get the optimized - //CSS. - if (config.optimizeCss && config.optimizeCss !== "none" && config.dir) { - buildFileContents += optimize.css(config.dir, config); - } - - if (modules) { - //For each module layer, call require to calculate dependencies. - modules.forEach(function (module) { - module.layer = build.traceDependencies(module, config); - }); - - //Now build up shadow layers for anything that should be excluded. - //Do this after tracing dependencies for each module, in case one - //of those modules end up being one of the excluded values. - modules.forEach(function (module) { - if (module.exclude) { - module.excludeLayers = []; - module.exclude.forEach(function (exclude, i) { - //See if it is already in the list of modules. - //If not trace dependencies for it. - module.excludeLayers[i] = build.findBuildModule(exclude, modules) || - {layer: build.traceDependencies({name: exclude}, config)}; - }); - } - }); - - modules.forEach(function (module) { - if (module.exclude) { - //module.exclude is an array of module names. For each one, - //get the nested dependencies for it via a matching entry - //in the module.excludeLayers array. - module.exclude.forEach(function (excludeModule, i) { - var excludeLayer = module.excludeLayers[i].layer, map = excludeLayer.buildPathMap, prop; - for (prop in map) { - if (map.hasOwnProperty(prop)) { - build.removeModulePath(prop, map[prop], module.layer); - } - } - }); - } - if (module.excludeShallow) { - //module.excludeShallow is an array of module names. - //shallow exclusions are just that module itself, and not - //its nested dependencies. - module.excludeShallow.forEach(function (excludeShallowModule) { - var path = module.layer.buildPathMap[excludeShallowModule]; - if (path) { - build.removeModulePath(excludeShallowModule, path, module.layer); - } - }); - } - - //Flatten them and collect the build output for each module. - builtModule = build.flattenModule(module, module.layer, config); - - //Save it to a temp file for now, in case there are other layers that - //contain optimized content that should not be included in later - //layer optimizations. See issue #56. - file.saveUtf8File(module._buildPath + '-temp', builtModule.text); - buildFileContents += builtModule.buildText; - }); - - //Now move the build layers to their final position. - modules.forEach(function (module) { - var finalPath = module._buildPath; - if (file.exists(finalPath)) { - file.deleteFile(finalPath); - } - file.renameFile(finalPath + '-temp', finalPath); - }); - } - - //Do other optimizations. - if (config.out && !config.cssIn) { - //Just need to worry about one JS file. - fileName = config.modules[0]._buildPath; - optimize.jsFile(fileName, null, fileName, config); - } else if (!config.cssIn) { - //Normal optimizations across modules. - - //JS optimizations. - fileNames = file.getFilteredFileList(config.dir, /\.js$/, true); - for (i = 0; (fileName = fileNames[i]); i++) { - //Generate the module name from the config.dir root. - moduleName = fileName.replace(config.dir, ''); - //Get rid of the extension - moduleName = moduleName.substring(0, moduleName.length - 3); - - //Convert the file to transport format, but without a name - //inserted (by passing null for moduleName) since the files are - //standalone, one module per file. - fileContents = file.readFile(fileName); - fileContents = build.toTransport(config.anonDefRegExp, - config.namespaceWithDot, - null, - fileName, - fileContents); - - optimize.jsFile(fileName, fileContents, fileName, config, pluginCollector); - } - - //Normalize all the plugin resources. - context = require.s.contexts._; - - for (moduleName in pluginCollector) { - if (pluginCollector.hasOwnProperty(moduleName)) { - parentModuleMap = context.makeModuleMap(moduleName); - resources = pluginCollector[moduleName]; - for (i = 0; (resource = resources[i]); i++) { - moduleMap = context.makeModuleMap(resource, parentModuleMap); - if (!context.plugins[moduleMap.prefix]) { - //Set the value in context.plugins so it - //will be evaluated as a full plugin. - context.plugins[moduleMap.prefix] = true; - - //Do not bother if the plugin is not available. - if (!file.exists(require.toUrl(moduleMap.prefix + '.js'))) { - continue; - } - - //Rely on the require in the build environment - //to be synchronous - context.require([moduleMap.prefix]); - - //Now that the plugin is loaded, redo the moduleMap - //since the plugin will need to normalize part of the path. - moduleMap = context.makeModuleMap(resource, parentModuleMap); - } - - //Only bother with plugin resources that can be handled - //processed by the plugin, via support of the writeFile - //method. - if (!pluginProcessed[moduleMap.fullName]) { - //Only do the work if the plugin was really loaded. - //Using an internal access because the file may - //not really be loaded. - plugin = context.defined[moduleMap.prefix]; - if (plugin && plugin.writeFile) { - plugin.writeFile( - moduleMap.prefix, - moduleMap.name, - require, - makeWriteFile( - config.anonDefRegExp, - config.namespaceWithDot - ), - context.config - ); - } - - pluginProcessed[moduleMap.fullName] = true; - } - } - - } - } - - //console.log('PLUGIN COLLECTOR: ' + JSON.stringify(pluginCollector, null, " ")); - - - //All module layers are done, write out the build.txt file. - file.saveUtf8File(config.dir + "build.txt", buildFileContents); - } - - //If just have one CSS file to optimize, do that here. - if (config.cssIn) { - buildFileContents += optimize.cssFile(config.cssIn, config.out, config); - } - - //Print out what was built into which layers. - if (buildFileContents) { - logger.info(buildFileContents); - return buildFileContents; - } - - return ''; - }; - - /** - * Converts command line args like "paths.foo=../some/path" - * result.paths = { foo: '../some/path' } where prop = paths, - * name = paths.foo and value = ../some/path, so it assumes the - * name=value splitting has already happened. - */ - function stringDotToObj(result, prop, name, value) { - if (!result[prop]) { - result[prop] = {}; - } - name = name.substring((prop + '.').length, name.length); - result[prop][name] = value; - } - - //Used by convertArrayToObject to convert some things from prop.name=value - //to a prop: { name: value} - build.dotProps = [ - 'paths.', - 'wrap.', - 'pragmas.', - 'pragmasOnSave.', - 'has.', - 'hasOnSave.', - 'wrap.', - 'uglify.', - 'closure.' - ]; - - build.hasDotPropMatch = function (prop) { - return build.dotProps.some(function (dotProp) { - return prop.indexOf(dotProp) === 0; - }); - }; - - /** - * Converts an array that has String members of "name=value" - * into an object, where the properties on the object are the names in the array. - * Also converts the strings "true" and "false" to booleans for the values. - * member name/value pairs, and converts some comma-separated lists into - * arrays. - * @param {Array} ary - */ - build.convertArrayToObject = function (ary) { - var result = {}, i, separatorIndex, prop, value, - needArray = { - "include": true, - "exclude": true, - "excludeShallow": true - }; - - for (i = 0; i < ary.length; i++) { - separatorIndex = ary[i].indexOf("="); - if (separatorIndex === -1) { - throw "Malformed name/value pair: [" + ary[i] + "]. Format should be name=value"; - } - - value = ary[i].substring(separatorIndex + 1, ary[i].length); - if (value === "true") { - value = true; - } else if (value === "false") { - value = false; - } - - prop = ary[i].substring(0, separatorIndex); - - //Convert to array if necessary - if (needArray[prop]) { - value = value.split(","); - } - - if (build.hasDotPropMatch(prop)) { - stringDotToObj(result, prop.split('.')[0], prop, value); - } else { - result[prop] = value; - } - } - return result; //Object - }; - - build.makeAbsPath = function (path, absFilePath) { - //Add abspath if necessary. If path starts with a slash or has a colon, - //then already is an abolute path. - if (path.indexOf('/') !== 0 && path.indexOf(':') === -1) { - path = absFilePath + - (absFilePath.charAt(absFilePath.length - 1) === '/' ? '' : '/') + - path; - path = file.normalize(path); - } - return path.replace(lang.backSlashRegExp, '/'); - }; - - build.makeAbsObject = function (props, obj, absFilePath) { - var i, prop; - if (obj) { - for (i = 0; (prop = props[i]); i++) { - if (obj.hasOwnProperty(prop)) { - obj[prop] = build.makeAbsPath(obj[prop], absFilePath); - } - } - } - }; - - /** - * For any path in a possible config, make it absolute relative - * to the absFilePath passed in. - */ - build.makeAbsConfig = function (config, absFilePath) { - var props, prop, i; - - props = ["appDir", "dir", "baseUrl"]; - for (i = 0; (prop = props[i]); i++) { - if (config[prop]) { - //Add abspath if necessary, make sure these paths end in - //slashes - if (prop === "baseUrl") { - config.originalBaseUrl = config.baseUrl; - if (config.appDir) { - //If baseUrl with an appDir, the baseUrl is relative to - //the appDir, *not* the absFilePath. appDir and dir are - //made absolute before baseUrl, so this will work. - config.baseUrl = build.makeAbsPath(config.originalBaseUrl, config.appDir); - } else { - //The dir output baseUrl is same as regular baseUrl, both - //relative to the absFilePath. - config.baseUrl = build.makeAbsPath(config[prop], absFilePath); - } - } else { - config[prop] = build.makeAbsPath(config[prop], absFilePath); - } - - config[prop] = endsWithSlash(config[prop]); - } - } - - //Do not allow URLs for paths resources. - if (config.paths) { - for (prop in config.paths) { - if (config.paths.hasOwnProperty(prop)) { - config.paths[prop] = build.makeAbsPath(config.paths[prop], - (config.baseUrl || absFilePath)); - } - } - } - - build.makeAbsObject(["out", "cssIn"], config, absFilePath); - build.makeAbsObject(["startFile", "endFile"], config.wrap, absFilePath); - }; - - build.nestedMix = { - paths: true, - has: true, - hasOnSave: true, - pragmas: true, - pragmasOnSave: true - }; - - /** - * Mixes additional source config into target config, and merges some - * nested config, like paths, correctly. - */ - function mixConfig(target, source) { - var prop, value; - - for (prop in source) { - if (source.hasOwnProperty(prop)) { - //If the value of the property is a plain object, then - //allow a one-level-deep mixing of it. - value = source[prop]; - if (typeof value === 'object' && value && - !lang.isArray(value) && !lang.isFunction(value) && - !lang.isRegExp(value)) { - target[prop] = lang.mixin({}, target[prop], value, true); - } else { - target[prop] = value; - } - } - } - } - - /** - * Creates a config object for an optimization build. - * It will also read the build profile if it is available, to create - * the configuration. - * - * @param {Object} cfg config options that take priority - * over defaults and ones in the build file. These options could - * be from a command line, for instance. - * - * @param {Object} the created config object. - */ - build.createConfig = function (cfg) { - /*jslint evil: true */ - var config = {}, buildFileContents, buildFileConfig, mainConfig, - mainConfigFile, prop, buildFile, absFilePath; - - //Make sure all paths are relative to current directory. - absFilePath = file.absPath('.'); - build.makeAbsConfig(cfg, absFilePath); - build.makeAbsConfig(buildBaseConfig, absFilePath); - - lang.mixin(config, buildBaseConfig); - lang.mixin(config, cfg, true); - - if (config.buildFile) { - //A build file exists, load it to get more config. - buildFile = file.absPath(config.buildFile); - - //Find the build file, and make sure it exists, if this is a build - //that has a build profile, and not just command line args with an in=path - if (!file.exists(buildFile)) { - throw new Error("ERROR: build file does not exist: " + buildFile); - } - - absFilePath = config.baseUrl = file.absPath(file.parent(buildFile)); - - //Load build file options. - buildFileContents = file.readFile(buildFile); - try { - buildFileConfig = eval("(" + buildFileContents + ")"); - build.makeAbsConfig(buildFileConfig, absFilePath); - - if (!buildFileConfig.out && !buildFileConfig.dir) { - buildFileConfig.dir = (buildFileConfig.baseUrl || config.baseUrl) + "/build/"; - } - - } catch (e) { - throw new Error("Build file " + buildFile + " is malformed: " + e); - } - } - - mainConfigFile = config.mainConfigFile || (buildFileConfig && buildFileConfig.mainConfigFile); - if (mainConfigFile) { - mainConfigFile = build.makeAbsPath(mainConfigFile, absFilePath); - if (!file.exists(mainConfigFile)) { - throw new Error(mainConfigFile + ' does not exist.'); - } - try { - mainConfig = parse.findConfig(mainConfigFile, file.readFile(mainConfigFile)); - } catch (configError) { - throw new Error('The config in mainConfigFile ' + - mainConfigFile + - ' cannot be used because it cannot be evaluated' + - ' correctly while running in the optimizer. Try only' + - ' using a config that is also valid JSON, or do not use' + - ' mainConfigFile and instead copy the config values needed' + - ' into a build file or command line arguments given to the optimizer.'); - } - if (mainConfig) { - //If no baseUrl, then use the directory holding the main config. - if (!mainConfig.baseUrl) { - mainConfig.baseUrl = mainConfigFile.substring(0, mainConfigFile.lastIndexOf('/')); - } - build.makeAbsConfig(mainConfig, mainConfigFile); - mixConfig(config, mainConfig); - } - } - - //Mix in build file config, but only after mainConfig has been mixed in. - if (buildFileConfig) { - mixConfig(config, buildFileConfig); - } - - //Re-apply the override config values. Command line - //args should take precedence over build file values. - mixConfig(config, cfg); - - - //Set final output dir - if (config.hasOwnProperty("baseUrl")) { - if (config.appDir) { - config.dirBaseUrl = build.makeAbsPath(config.originalBaseUrl, config.dir); - } else { - config.dirBaseUrl = config.dir || config.baseUrl; - } - //Make sure dirBaseUrl ends in a slash, since it is - //concatenated with other strings. - config.dirBaseUrl = endsWithSlash(config.dirBaseUrl); - } - - //Check for errors in config - if (config.cssIn && !config.out) { - throw new Error("ERROR: 'out' option missing."); - } - if (!config.cssIn && !config.baseUrl) { - throw new Error("ERROR: 'baseUrl' option missing."); - } - if (!config.out && !config.dir) { - throw new Error('Missing either an "out" or "dir" config value. ' + - 'If using "appDir" for a full project optimization, ' + - 'use "dir". If you want to optimize to one file, ' + - 'use "out".'); - } - if (config.appDir && config.out) { - throw new Error('"appDir" is not compatible with "out". Use "dir" ' + - 'instead. appDir is used to copy whole projects, ' + - 'where "out" is used to just optimize to one file.'); - } - if (config.out && config.dir) { - throw new Error('The "out" and "dir" options are incompatible.' + - ' Use "out" if you are targeting a single file for' + - ' for optimization, and "dir" if you want the appDir' + - ' or baseUrl directories optimized.'); - } - - if ((config.name || config.include) && !config.modules) { - //Just need to build one file, but may be part of a whole appDir/ - //baseUrl copy, but specified on the command line, so cannot do - //the modules array setup. So create a modules section in that - //case. - config.modules = [ - { - name: config.name, - out: config.out, - include: config.include, - exclude: config.exclude, - excludeShallow: config.excludeShallow - } - ]; - } - - if (config.out && !config.cssIn) { - //Just one file to optimize. - - //Does not have a build file, so set up some defaults. - //Optimizing CSS should not be allowed, unless explicitly - //asked for on command line. In that case the only task is - //to optimize a CSS file. - if (!cfg.optimizeCss) { - config.optimizeCss = "none"; - } - } - - //Do not allow URLs for paths resources. - if (config.paths) { - for (prop in config.paths) { - if (config.paths.hasOwnProperty(prop)) { - disallowUrls(config.paths[prop]); - } - } - } - - //Get any wrap text. - try { - if (config.wrap) { - if (config.wrap === true) { - //Use default values. - config.wrap = { - start: '(function () {', - end: '}());' - }; - } else { - config.wrap.start = config.wrap.start || - file.readFile(build.makeAbsPath(config.wrap.startFile, absFilePath)); - config.wrap.end = config.wrap.end || - file.readFile(build.makeAbsPath(config.wrap.endFile, absFilePath)); - } - } - } catch (wrapError) { - throw new Error('Malformed wrap config: need both start/end or ' + - 'startFile/endFile: ' + wrapError.toString()); - } - - - //Set up proper info for namespaces and using namespaces in transport - //wrappings. - config.namespaceWithDot = config.namespace ? config.namespace + '.' : ''; - config.anonDefRegExp = build.makeAnonDefRegExp(config.namespaceWithDot); - - //Do final input verification - if (config.context) { - throw new Error('The build argument "context" is not supported' + - ' in a build. It should only be used in web' + - ' pages.'); - } - - //Set file.fileExclusionRegExp if desired - if ('fileExclusionRegExp' in config) { - if (typeof config.fileExclusionRegExp === "string") { - file.exclusionRegExp = new RegExp(config.fileExclusionRegExp); - } else { - file.exclusionRegExp = config.fileExclusionRegExp; - } - } else if ('dirExclusionRegExp' in config) { - //Set file.dirExclusionRegExp if desired, this is the old - //name for fileExclusionRegExp before 1.0.2. Support for backwards - //compatibility - file.exclusionRegExp = config.dirExclusionRegExp; - } - - //Remove things that may cause problems in the build. - delete config.jQuery; - - return config; - }; - - /** - * finds the module being built/optimized with the given moduleName, - * or returns null. - * @param {String} moduleName - * @param {Array} modules - * @returns {Object} the module object from the build profile, or null. - */ - build.findBuildModule = function (moduleName, modules) { - var i, module; - for (i = 0; (module = modules[i]); i++) { - if (module.name === moduleName) { - return module; - } - } - return null; - }; - - /** - * Removes a module name and path from a layer, if it is supposed to be - * excluded from the layer. - * @param {String} moduleName the name of the module - * @param {String} path the file path for the module - * @param {Object} layer the layer to remove the module/path from - */ - build.removeModulePath = function (module, path, layer) { - var index = layer.buildFilePaths.indexOf(path); - if (index !== -1) { - layer.buildFilePaths.splice(index, 1); - } - - //Take it out of the specified modules. Specified modules are mostly - //used to find require modifiers. - delete layer.specified[module]; - }; - - /** - * Uses the module build config object to trace the dependencies for the - * given module. - * - * @param {Object} module the module object from the build config info. - * @param {Object} the build config object. - * - * @returns {Object} layer information about what paths and modules should - * be in the flattened module. - */ - build.traceDependencies = function (module, config) { - var include, override, layer, context, baseConfig, oldContext; - - //Reset some state set up in requirePatch.js, and clean up require's - //current context. - oldContext = require._buildReset(); - - //Grab the reset layer and context after the reset, but keep the - //old config to reuse in the new context. - baseConfig = oldContext.config; - layer = require._layer; - context = layer.context; - - //Put back basic config, use a fresh object for it. - //WARNING: probably not robust for paths and packages/packagePaths, - //since those property's objects can be modified. But for basic - //config clone it works out. - require(lang.delegate(baseConfig)); - - logger.trace("\nTracing dependencies for: " + (module.name || module.out)); - include = module.name && !module.create ? [module.name] : []; - if (module.include) { - include = include.concat(module.include); - } - - //If there are overrides to basic config, set that up now.; - if (module.override) { - override = lang.delegate(baseConfig); - lang.mixin(override, module.override, true); - require(override); - } - - //Figure out module layer dependencies by calling require to do the work. - require(include); - - //Pull out the layer dependencies. - layer.specified = context.specified; - - //Reset config - if (module.override) { - require(baseConfig); - } - - return layer; - }; - - /** - * Uses the module build config object to create an flattened version - * of the module, with deep dependencies included. - * - * @param {Object} module the module object from the build config info. - * - * @param {Object} layer the layer object returned from build.traceDependencies. - * - * @param {Object} the build config object. - * - * @returns {Object} with two properties: "text", the text of the flattened - * module, and "buildText", a string of text representing which files were - * included in the flattened module text. - */ - build.flattenModule = function (module, layer, config) { - var buildFileContents = "", - namespace = config.namespace ? config.namespace + '.' : '', - context = layer.context, - anonDefRegExp = config.anonDefRegExp, - path, reqIndex, fileContents, currContents, - i, moduleName, - parts, builder, writeApi; - - //Use override settings, particularly for pragmas - if (module.override) { - config = lang.delegate(config); - lang.mixin(config, module.override, true); - } - - //Start build output for the module. - buildFileContents += "\n" + - (config.dir ? module._buildPath.replace(config.dir, "") : module._buildPath) + - "\n----------------\n"; - - //If there was an existing file with require in it, hoist to the top. - if (layer.existingRequireUrl) { - reqIndex = layer.buildFilePaths.indexOf(layer.existingRequireUrl); - if (reqIndex !== -1) { - layer.buildFilePaths.splice(reqIndex, 1); - layer.buildFilePaths.unshift(layer.existingRequireUrl); - } - } - - //Write the built module to disk, and build up the build output. - fileContents = ""; - for (i = 0; (path = layer.buildFilePaths[i]); i++) { - moduleName = layer.buildFileToModule[path]; - - //Figure out if the module is a result of a build plugin, and if so, - //then delegate to that plugin. - parts = context.makeModuleMap(moduleName); - builder = parts.prefix && context.defined[parts.prefix]; - if (builder) { - if (builder.write) { - writeApi = function (input) { - fileContents += "\n" + addSemiColon(input); - if (config.onBuildWrite) { - fileContents = config.onBuildWrite(moduleName, path, fileContents); - } - }; - writeApi.asModule = function (moduleName, input) { - fileContents += "\n" + - addSemiColon( - build.toTransport(anonDefRegExp, namespace, moduleName, path, input, layer)); - if (config.onBuildWrite) { - fileContents = config.onBuildWrite(moduleName, path, fileContents); - } - }; - builder.write(parts.prefix, parts.name, writeApi); - } - } else { - currContents = file.readFile(path); - - if (config.onBuildRead) { - currContents = config.onBuildRead(moduleName, path, currContents); - } - - if (config.namespace) { - currContents = pragma.namespace(currContents, config.namespace); - } - - currContents = build.toTransport(anonDefRegExp, namespace, moduleName, path, currContents, layer); - - if (config.onBuildWrite) { - currContents = config.onBuildWrite(moduleName, path, currContents); - } - - //Semicolon is for files that are not well formed when - //concatenated with other content. - fileContents += "\n" + addSemiColon(currContents); - } - - buildFileContents += path.replace(config.dir, "") + "\n"; - //Some files may not have declared a require module, and if so, - //put in a placeholder call so the require does not try to load them - //after the module is processed. - //If we have a name, but no defined module, then add in the placeholder. - if (moduleName && !layer.modulesWithNames[moduleName] && !config.skipModuleInsertion) { - //If including jquery, register the module correctly, otherwise - //register an empty function. For jquery, make sure jQuery is - //a real object, and perhaps not some other file mapping, like - //to zepto. - if (moduleName === 'jquery') { - fileContents += '\n(function () {\n' + - 'var jq = typeof jQuery !== "undefined" && jQuery;\n' + - namespace + - 'define("jquery", [], function () { return jq; });\n' + - '}());\n'; - } else { - fileContents += '\n' + namespace + 'define("' + moduleName + '", function(){});\n'; - } - } - } - - return { - text: config.wrap ? - config.wrap.start + fileContents + config.wrap.end : - fileContents, - buildText: buildFileContents - }; - }; - - /** - * Creates the regexp to find anonymous defines. - * @param {String} namespace an optional namespace to use. The namespace - * should *include* a trailing dot. So a valid value would be 'foo.' - * @returns {RegExp} - */ - build.makeAnonDefRegExp = function (namespace) { - //This regexp is not bullet-proof, and it has one optional part to - //avoid issues with some Dojo transition modules that use a - //define(\n//begin v1.x content - //for a comment. - return new RegExp('(^|[^\\.])(' + (namespace || '').replace(/\./g, '\\.') + - 'define|define)\\s*\\(\\s*(\\/\\/[^\\n\\r]*[\\r\\n])?(\\[|function|[\\w\\d_\\-\\$]+\\s*\\)|\\{|["\']([^"\']+)["\'])(\\s*,\\s*f)?'); - }; - - build.leadingCommaRegExp = /^\s*,/; - - build.toTransport = function (anonDefRegExp, namespace, moduleName, path, contents, layer) { - - //If anonymous module, insert the module name. - return contents.replace(anonDefRegExp, function (match, start, callName, possibleComment, suffix, namedModule, namedFuncStart) { - //A named module with either listed dependencies or an object - //literal for a value. Skip it. If named module, only want ones - //whose next argument is a function literal to scan for - //require('') dependecies. - if (namedModule && !namedFuncStart) { - return match; - } - - //Only mark this module as having a name if not a named module, - //or if a named module and the name matches expectations. - if (layer && (!namedModule || namedModule === moduleName)) { - layer.modulesWithNames[moduleName] = true; - } - - var deps = null, - finalName; - - //Look for CommonJS require calls inside the function if this is - //an anonymous define call that just has a function registered. - //Also look if a named define function but has a factory function - //as the second arg that should be scanned for dependencies. - if (suffix.indexOf('f') !== -1 || (namedModule)) { - deps = parse.getAnonDeps(path, contents); - - if (deps.length) { - deps = deps.map(function (dep) { - return "'" + dep + "'"; - }); - } else { - deps = []; - } - } - - finalName = namedModule || moduleName || ''; - if (finalName) { - finalName = "'" + (namedModule || moduleName) + "',"; - } - - return start + namespace + "define(" + finalName + - (deps ? ('[' + deps.toString() + '],') : '') + - (namedModule ? namedFuncStart.replace(build.leadingCommaRegExp, '') : suffix); - }); - - }; - - return build; -}); - - } - - - /** - * Sets the default baseUrl for requirejs to be directory of top level - * script. - */ - function setBaseUrl(fileName) { - //Use the file name's directory as the baseUrl if available. - dir = fileName.replace(/\\/g, '/'); - if (dir.indexOf('/') !== -1) { - dir = dir.split('/'); - dir.pop(); - dir = dir.join('/'); - exec("require({baseUrl: '" + dir + "'});"); - } - } - - //If in Node, and included via a require('requirejs'), just export and - //THROW IT ON THE GROUND! - if (env === 'node' && reqMain !== module) { - setBaseUrl(path.resolve(reqMain ? reqMain.filename : '.')); - - //Create a method that will run the optimzer given an object - //config. - requirejs.optimize = function (config, callback) { - if (!loadedOptimizedLib) { - loadLib(); - loadedOptimizedLib = true; - } - - //Create the function that will be called once build modules - //have been loaded. - var runBuild = function (build, logger) { - //Make sure config has a log level, and if not, - //make it "silent" by default. - config.logLevel = config.hasOwnProperty('logLevel') ? - config.logLevel : logger.SILENT; - - var result = build(config); - - //Reset build internals on each run. - requirejs._buildReset(); - - if (callback) { - callback(result); - } - }; - - //Enable execution of this callback in a build setting. - //Normally, once requirePatch is run, by default it will - //not execute callbacks, unless this property is set on - //the callback. - runBuild.__requireJsBuild = true; - - requirejs({ - context: 'build' - }, ['build', 'logger'], runBuild); - }; - - requirejs.tools = { - useLib: function (contextName, callback) { - if (!callback) { - callback = contextName; - contextName = 'uselib'; - } - - if (!useLibLoaded[contextName]) { - loadLib(); - useLibLoaded[contextName] = true; - } - - var req = requirejs({ - context: contextName, - requireLoad: requirejsVars.nodeLoad, - requireExecCb: requirejsVars.nodeRequireExecCb - }); - - req(['build'], function () { - callback(req); - }); - } - }; - - requirejs.define = define; - - module.exports = requirejs; - return; - } - - if (commandOption === 'o') { - //Do the optimizer work. - loadLib(); - - /** - * @license Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - * Available via the MIT or new BSD license. - * see: http://github.com/jrburke/requirejs for details - */ - -/* - * Create a build.js file that has the build options you want and pass that - * build file to this file to do the build. See example.build.js for more information. - */ - -/*jslint strict: false, nomen: false */ -/*global require: false */ - -require({ - baseUrl: require.s.contexts._.config.baseUrl, - //Use a separate context than the default context so that the - //build can use the default context. - context: 'build', - catchError: { - define: true - } -}, ['env!env/args', 'build'], -function (args, build) { - build(args); -}); - - - } else if (commandOption === 'v') { - console.log('r.js: ' + version + ', RequireJS: ' + this.requirejsVars.require.version); - } else if (commandOption === 'convert') { - loadLib(); - - this.requirejsVars.require(['env!env/args', 'commonJs', 'env!env/print'], - function (args, commonJs, print) { - - var srcDir, outDir; - srcDir = args[0]; - outDir = args[1]; - - if (!srcDir || !outDir) { - print('Usage: path/to/commonjs/modules output/dir'); - return; - } - - commonJs.convertDir(args[0], args[1]); - }); - } else { - //Just run an app - - //Load the bundled libraries for use in the app. - if (commandOption === 'lib') { - loadLib(); - } - - setBaseUrl(fileName); - - if (exists(fileName)) { - exec(readFile(fileName), fileName); - } else { - showHelp(); - } - } - -}((typeof console !== 'undefined' ? console : undefined), - (typeof Packages !== 'undefined' ? Array.prototype.slice.call(arguments, 0) : []), - (typeof readFile !== 'undefined' ? readFile : undefined))); From e80ef3af9f03cb3aade27173b5fd47ed6c7cd299 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 17 Jan 2013 17:27:21 -0700 Subject: [PATCH 06/94] Whitespace --- js/requirejs.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/requirejs.config.js b/js/requirejs.config.js index 3e2915e388a..d97169c1376 100644 --- a/js/requirejs.config.js +++ b/js/requirejs.config.js @@ -5,5 +5,4 @@ requirejs.config({ "depend": "../external/requirejs/plugins/depend", "json": "../external/requirejs/plugins/json" } - }); From ccfa1256f3bb525523ffa91b526f4748053f7b54 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 17 Jan 2013 17:28:10 -0700 Subject: [PATCH 07/94] Following move of RequireJS plugins we now need to use the requirejs.config.js --- tests/unit/button-markup/index.html | 1 + tests/unit/button/index.html | 1 + tests/unit/checkboxradio/index.html | 1 + tests/unit/collapsible/index.html | 1 + tests/unit/controlgroup/index.html | 1 + tests/unit/core/index.html | 1 + tests/unit/degrade-inputs/index.html | 1 + tests/unit/dialog/data-attr-init-tests.html | 1 + tests/unit/dialog/index.html | 1 + tests/unit/dialog/no-hash-tests.html | 1 + tests/unit/field-contain/index.html | 1 + tests/unit/fixed-toolbar/index.html | 1 + tests/unit/init/dialog-load-tests.html | 1 + tests/unit/kitchensink/index.html | 1 + tests/unit/listview/index.html | 1 + tests/unit/listview/nested-tests.html | 1 + tests/unit/media/index.html | 1 + tests/unit/navbar/index.html | 1 + tests/unit/page-sections/index.html | 1 + tests/unit/page/index.html | 1 + tests/unit/panel/index.html | 1 + tests/unit/path/index.html | 1 + tests/unit/popup/index.html | 1 + tests/unit/rangeslider/index.html | 1 + tests/unit/reset/index.html | 2 ++ tests/unit/select/index.html | 1 + tests/unit/slider/index.html | 1 + tests/unit/support/index.html | 1 + tests/unit/table/index.html | 1 + tests/unit/textinput/index.html | 1 + tests/unit/widget/index.html | 2 ++ tests/unit/zoom/initial-disable.html | 1 + 32 files changed, 34 insertions(+) diff --git a/tests/unit/button-markup/index.html b/tests/unit/button-markup/index.html index 6a4ca9cb249..5ac56212aaf 100644 --- a/tests/unit/button-markup/index.html +++ b/tests/unit/button-markup/index.html @@ -5,6 +5,7 @@ jQuery Mobile Button Markup Test Suite + diff --git a/tests/unit/button/index.html b/tests/unit/button/index.html index b0ebe4ef327..9f4b5898b0f 100644 --- a/tests/unit/button/index.html +++ b/tests/unit/button/index.html @@ -6,6 +6,7 @@ jQuery Mobile Button Test Suite + diff --git a/tests/unit/checkboxradio/index.html b/tests/unit/checkboxradio/index.html index 7ad833401ec..50339dfe596 100644 --- a/tests/unit/checkboxradio/index.html +++ b/tests/unit/checkboxradio/index.html @@ -5,6 +5,7 @@ jQuery Mobile Checkboxradio Test Suite + diff --git a/tests/unit/collapsible/index.html b/tests/unit/collapsible/index.html index 1492deddaee..2728ff22b38 100644 --- a/tests/unit/collapsible/index.html +++ b/tests/unit/collapsible/index.html @@ -6,6 +6,7 @@ jQuery Mobile Collapsible Integration Test + diff --git a/tests/unit/controlgroup/index.html b/tests/unit/controlgroup/index.html index 99a0f4b4328..1b52695e6f8 100644 --- a/tests/unit/controlgroup/index.html +++ b/tests/unit/controlgroup/index.html @@ -6,6 +6,7 @@ jQuery Mobile Controlgroup Test Suite + diff --git a/tests/unit/core/index.html b/tests/unit/core/index.html index 84e71a7fa77..aa91bbf388e 100644 --- a/tests/unit/core/index.html +++ b/tests/unit/core/index.html @@ -6,6 +6,7 @@ jQuery Mobile Core Test Suite + diff --git a/tests/unit/degrade-inputs/index.html b/tests/unit/degrade-inputs/index.html index a847f9aee0f..a0574f030c2 100644 --- a/tests/unit/degrade-inputs/index.html +++ b/tests/unit/degrade-inputs/index.html @@ -6,6 +6,7 @@ jQuery Mobile Degrade Inputs Test Suite + diff --git a/tests/unit/dialog/data-attr-init-tests.html b/tests/unit/dialog/data-attr-init-tests.html index df65b090e31..ab99c95cfab 100644 --- a/tests/unit/dialog/data-attr-init-tests.html +++ b/tests/unit/dialog/data-attr-init-tests.html @@ -5,6 +5,7 @@ jQuery Mobile Dialog Test Suite + + + + diff --git a/tests/unit/fixed-toolbar/index.html b/tests/unit/fixed-toolbar/index.html index 4c8fba57b79..93debf81580 100644 --- a/tests/unit/fixed-toolbar/index.html +++ b/tests/unit/fixed-toolbar/index.html @@ -6,6 +6,7 @@ + diff --git a/tests/unit/init/dialog-load-tests.html b/tests/unit/init/dialog-load-tests.html index 1f1683f42cd..af6b2f381f3 100644 --- a/tests/unit/init/dialog-load-tests.html +++ b/tests/unit/init/dialog-load-tests.html @@ -8,6 +8,7 @@ + diff --git a/tests/unit/kitchensink/index.html b/tests/unit/kitchensink/index.html index 4307d42880c..dcb64ceeff5 100644 --- a/tests/unit/kitchensink/index.html +++ b/tests/unit/kitchensink/index.html @@ -5,6 +5,7 @@ jQuery Mobile Kitchen Sink Test Suite + diff --git a/tests/unit/listview/index.html b/tests/unit/listview/index.html index 03ee1f45b3a..247cc347fad 100644 --- a/tests/unit/listview/index.html +++ b/tests/unit/listview/index.html @@ -6,6 +6,7 @@ jQuery Mobile Listview Integration Test + diff --git a/tests/unit/listview/nested-tests.html b/tests/unit/listview/nested-tests.html index 1af9a334d79..036dd53b734 100644 --- a/tests/unit/listview/nested-tests.html +++ b/tests/unit/listview/nested-tests.html @@ -6,6 +6,7 @@ jQuery Mobile Listview Integration Test + diff --git a/tests/unit/media/index.html b/tests/unit/media/index.html index 52c39a59591..94bc55d913c 100644 --- a/tests/unit/media/index.html +++ b/tests/unit/media/index.html @@ -6,6 +6,7 @@ jQuery Mobile Media Test Suite + diff --git a/tests/unit/navbar/index.html b/tests/unit/navbar/index.html index 27fd46e65b4..262cea6402c 100644 --- a/tests/unit/navbar/index.html +++ b/tests/unit/navbar/index.html @@ -6,6 +6,7 @@ jQuery Mobile Navigation Test Suite + diff --git a/tests/unit/page-sections/index.html b/tests/unit/page-sections/index.html index d3850cfe794..71e99d6e085 100644 --- a/tests/unit/page-sections/index.html +++ b/tests/unit/page-sections/index.html @@ -6,6 +6,7 @@ jQuery Mobile Page Test Suite + diff --git a/tests/unit/page/index.html b/tests/unit/page/index.html index ab85991ba85..3127a287597 100644 --- a/tests/unit/page/index.html +++ b/tests/unit/page/index.html @@ -6,6 +6,7 @@ jQuery Mobile Page Test Suite + diff --git a/tests/unit/panel/index.html b/tests/unit/panel/index.html index de691c4ca14..de2d46927bf 100644 --- a/tests/unit/panel/index.html +++ b/tests/unit/panel/index.html @@ -6,6 +6,7 @@ jQuery Mobile Panel Integration Test + diff --git a/tests/unit/path/index.html b/tests/unit/path/index.html index 1c386123bff..494e7f2060e 100644 --- a/tests/unit/path/index.html +++ b/tests/unit/path/index.html @@ -5,6 +5,7 @@ jQuery Mobile Navigate Path Helpers Test Suite + diff --git a/tests/unit/popup/index.html b/tests/unit/popup/index.html index 6cf2d8c6aa6..11d7ccfb05d 100644 --- a/tests/unit/popup/index.html +++ b/tests/unit/popup/index.html @@ -6,6 +6,7 @@ jQuery Mobile Popup Test Suite + diff --git a/tests/unit/rangeslider/index.html b/tests/unit/rangeslider/index.html index 50543dc2687..cd946ea747c 100644 --- a/tests/unit/rangeslider/index.html +++ b/tests/unit/rangeslider/index.html @@ -6,6 +6,7 @@ jQuery Mobile Rangeslider Test Suite + diff --git a/tests/unit/reset/index.html b/tests/unit/reset/index.html index 36ae9adc35b..433f347b32f 100644 --- a/tests/unit/reset/index.html +++ b/tests/unit/reset/index.html @@ -6,6 +6,8 @@ jQuery Mobile Form Reset Test Suite + + diff --git a/tests/unit/select/index.html b/tests/unit/select/index.html index ddfd808c7b9..3eb5705a1e5 100644 --- a/tests/unit/select/index.html +++ b/tests/unit/select/index.html @@ -6,6 +6,7 @@ jQuery Mobile Select Events Test Suite + diff --git a/tests/unit/slider/index.html b/tests/unit/slider/index.html index 53c06bcd437..34985e489ac 100644 --- a/tests/unit/slider/index.html +++ b/tests/unit/slider/index.html @@ -6,6 +6,7 @@ jQuery Mobile Slider Test Suite + diff --git a/tests/unit/support/index.html b/tests/unit/support/index.html index dac7fb2f10a..3d0c0bd8353 100644 --- a/tests/unit/support/index.html +++ b/tests/unit/support/index.html @@ -6,6 +6,7 @@ jQuery Mobile Support Test Suite + diff --git a/tests/unit/table/index.html b/tests/unit/table/index.html index 035c202626a..8ab61f36daf 100644 --- a/tests/unit/table/index.html +++ b/tests/unit/table/index.html @@ -6,6 +6,7 @@ jQuery Mobile Table Integration Test + diff --git a/tests/unit/textinput/index.html b/tests/unit/textinput/index.html index a4671d18efb..480bf7dc56e 100644 --- a/tests/unit/textinput/index.html +++ b/tests/unit/textinput/index.html @@ -6,6 +6,7 @@ jQuery Mobile Textinput Test Suite + diff --git a/tests/unit/widget/index.html b/tests/unit/widget/index.html index e22d1f2cb8e..ae7f6116d43 100644 --- a/tests/unit/widget/index.html +++ b/tests/unit/widget/index.html @@ -6,6 +6,8 @@ jQuery Mobile Widget Test Suite + + diff --git a/tests/unit/zoom/initial-disable.html b/tests/unit/zoom/initial-disable.html index 0b9eaab135f..2e11db7eb2f 100644 --- a/tests/unit/zoom/initial-disable.html +++ b/tests/unit/zoom/initial-disable.html @@ -6,6 +6,7 @@ + From d24b45f5bc7cfa2649d22c85c8dd9eac7b856c3a Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 18 Jan 2013 00:02:41 -0700 Subject: [PATCH 08/94] Grunt migration: Added devDependency on grunt-contrib-qunit --- package.json | 67 ++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 70dee5eaa2f..21582d02959 100644 --- a/package.json +++ b/package.json @@ -1,35 +1,36 @@ { - "name": "jquery-mobile", - "title": "jQuery Mobile", - "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0pre", - "homepage": "http://jquerymobile.com", - "author": { - "name": "jQuery Foundation Inc. and other contributors", - "url": "https://github.com/jquery/jquery-mobile/blob/master/AUTHORS.txt" - }, - "repository": { - "type": "git", - "url": "https://github.com/jquery/jquery-mobile.git" - }, - "bugs": "https://github.com/jquery/jquery-mobile/issues", - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/jquery/jquery-mobile/blob/master/MIT-LICENSE.txt" - } - ], - "scripts": { - "test": "./node_modules/.bin/grunt" - }, - "dependencies": {}, - "devDependencies": { - "grunt": "0.4.x", - "grunt-contrib-jshint": "0.1.x", - "grunt-contrib-uglify": "0.1.x", - "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", - "grunt-contrib-requirejs": "0.3.4", - "grunt-git-authors": "1.1.0-beta.1" - }, - "keywords": [] + "name": "jquery-mobile", + "title": "jQuery Mobile", + "description": "Touch-Optimized Web Framework for Smartphones & Tablets", + "version": "1.4.0pre", + "homepage": "http://jquerymobile.com", + "author": { + "name": "jQuery Foundation Inc. and other contributors", + "url": "https://github.com/jquery/jquery-mobile/blob/master/AUTHORS.txt" + }, + "repository": { + "type": "git", + "url": "https://github.com/jquery/jquery-mobile.git" + }, + "bugs": "https://github.com/jquery/jquery-mobile/issues", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/jquery/jquery-mobile/blob/master/MIT-LICENSE.txt" + } + ], + "scripts": { + "test": "./node_modules/.bin/grunt" + }, + "dependencies": {}, + "devDependencies": { + "grunt": "0.4.x", + "grunt-contrib-jshint": "0.1.x", + "grunt-contrib-uglify": "0.1.1rc5", + "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", + "grunt-contrib-requirejs": "0.3.4", + "grunt-git-authors": "1.1.0-beta.1", + "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git" + }, + "keywords": [] } From 34a1cb07ab9017b59311ed473e56e486004a9708 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 18 Jan 2013 00:03:10 -0700 Subject: [PATCH 09/94] Upgraded to RequireJS 2.1.2 --- external/requirejs/plugins/text.js | 535 +++--- external/requirejs/require.js | 2852 ++++++++++++++-------------- 2 files changed, 1671 insertions(+), 1716 deletions(-) diff --git a/external/requirejs/plugins/text.js b/external/requirejs/plugins/text.js index 6ef7422e65f..bf61a3fe4fb 100644 --- a/external/requirejs/plugins/text.js +++ b/external/requirejs/plugins/text.js @@ -1,283 +1,308 @@ /** - * @license RequireJS text 1.0.2 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. + * @license RequireJS text 2.0.3 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 + * see: http://github.com/requirejs/text for details */ -/*jslint regexp: false, nomen: false, plusplus: false, strict: false */ +/*jslint regexp: true */ /*global require: false, XMLHttpRequest: false, ActiveXObject: false, define: false, window: false, process: false, Packages: false, java: false, location: false */ -(function () { - var progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'], +define(['module'], function (module) { + 'use strict'; + + var text, fs, + progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'], xmlRegExp = /^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im, bodyRegExp = /]*>\s*([\s\S]+)\s*<\/body>/im, hasLocation = typeof location !== 'undefined' && location.href, defaultProtocol = hasLocation && location.protocol && location.protocol.replace(/\:/, ''), defaultHostName = hasLocation && location.hostname, defaultPort = hasLocation && (location.port || undefined), - buildMap = []; - - define(function () { - var text, get, fs; - - if (typeof window !== "undefined" && window.navigator && window.document) { - get = function (url, callback) { - var xhr = text.createXhr(); - xhr.open('GET', url, true); - xhr.onreadystatechange = function (evt) { - //Do not explicitly handle errors, those should be - //visible via console output in the browser. - if (xhr.readyState === 4) { - callback(xhr.responseText); - } - }; - xhr.send(null); - }; - } else if (typeof process !== "undefined" && - process.versions && - !!process.versions.node) { - //Using special require.nodeRequire, something added by r.js. - fs = require.nodeRequire('fs'); - - get = function (url, callback) { - callback(fs.readFileSync(url, 'utf8')); - }; - } else if (typeof Packages !== 'undefined') { - //Why Java, why is this so awkward? - get = function (url, callback) { - var encoding = "utf-8", - file = new java.io.File(url), - lineSeparator = java.lang.System.getProperty("line.separator"), - input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), encoding)), - stringBuffer, line, - content = ''; - try { - stringBuffer = new java.lang.StringBuffer(); - line = input.readLine(); - - // Byte Order Mark (BOM) - The Unicode Standard, version 3.0, page 324 - // http://www.unicode.org/faq/utf_bom.html - - // Note that when we use utf-8, the BOM should appear as "EF BB BF", but it doesn't due to this bug in the JDK: - // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4508058 - if (line && line.length() && line.charAt(0) === 0xfeff) { - // Eat the BOM, since we've already found the encoding on this file, - // and we plan to concatenating this buffer with others; the BOM should - // only appear at the top of a file. - line = line.substring(1); + buildMap = [], + masterConfig = (module.config && module.config()) || {}; + + text = { + version: '2.0.3', + + strip: function (content) { + //Strips declarations so that external SVG and XML + //documents can be added to a document without worry. Also, if the string + //is an HTML document, only the part inside the body tag is returned. + if (content) { + content = content.replace(xmlRegExp, ""); + var matches = content.match(bodyRegExp); + if (matches) { + content = matches[1]; + } + } else { + content = ""; + } + return content; + }, + + jsEscape: function (content) { + return content.replace(/(['\\])/g, '\\$1') + .replace(/[\f]/g, "\\f") + .replace(/[\b]/g, "\\b") + .replace(/[\n]/g, "\\n") + .replace(/[\t]/g, "\\t") + .replace(/[\r]/g, "\\r") + .replace(/[\u2028]/g, "\\u2028") + .replace(/[\u2029]/g, "\\u2029"); + }, + + createXhr: masterConfig.createXhr || function () { + //Would love to dump the ActiveX crap in here. Need IE 6 to die first. + var xhr, i, progId; + if (typeof XMLHttpRequest !== "undefined") { + return new XMLHttpRequest(); + } else if (typeof ActiveXObject !== "undefined") { + for (i = 0; i < 3; i += 1) { + progId = progIds[i]; + try { + xhr = new ActiveXObject(progId); + } catch (e) {} + + if (xhr) { + progIds = [progId]; // so faster next time + break; } + } + } - stringBuffer.append(line); + return xhr; + }, + + /** + * Parses a resource name into its component parts. Resource names + * look like: module/name.ext!strip, where the !strip part is + * optional. + * @param {String} name the resource name + * @returns {Object} with properties "moduleName", "ext" and "strip" + * where strip is a boolean. + */ + parseName: function (name) { + var strip = false, index = name.indexOf("."), + modName = name.substring(0, index), + ext = name.substring(index + 1, name.length); + + index = ext.indexOf("!"); + if (index !== -1) { + //Pull off the strip arg. + strip = ext.substring(index + 1, ext.length); + strip = strip === "strip"; + ext = ext.substring(0, index); + } - while ((line = input.readLine()) !== null) { - stringBuffer.append(lineSeparator); - stringBuffer.append(line); - } - //Make sure we return a JavaScript string and not a Java string. - content = String(stringBuffer.toString()); //String - } finally { - input.close(); - } - callback(content); + return { + moduleName: modName, + ext: ext, + strip: strip }; - } + }, + + xdRegExp: /^((\w+)\:)?\/\/([^\/\\]+)/, + + /** + * Is an URL on another domain. Only works for browser use, returns + * false in non-browser environments. Only used to know if an + * optimized .js version of a text resource should be loaded + * instead. + * @param {String} url + * @returns Boolean + */ + useXhr: function (url, protocol, hostname, port) { + var uProtocol, uHostName, uPort, + match = text.xdRegExp.exec(url); + if (!match) { + return true; + } + uProtocol = match[2]; + uHostName = match[3]; + + uHostName = uHostName.split(':'); + uPort = uHostName[1]; + uHostName = uHostName[0]; + + return (!uProtocol || uProtocol === protocol) && + (!uHostName || uHostName.toLowerCase() === hostname.toLowerCase()) && + ((!uPort && !uHostName) || uPort === port); + }, + + finishLoad: function (name, strip, content, onLoad) { + content = strip ? text.strip(content) : content; + if (masterConfig.isBuild) { + buildMap[name] = content; + } + onLoad(content); + }, + + load: function (name, req, onLoad, config) { + //Name has format: some.module.filext!strip + //The strip part is optional. + //if strip is present, then that means only get the string contents + //inside a body tag in an HTML string. For XML/SVG content it means + //removing the declarations so the content can be inserted + //into the current doc without problems. + + // Do not bother with the work if a build and text will + // not be inlined. + if (config.isBuild && !config.inlineText) { + onLoad(); + return; + } - text = { - version: '1.0.2', - - strip: function (content) { - //Strips declarations so that external SVG and XML - //documents can be added to a document without worry. Also, if the string - //is an HTML document, only the part inside the body tag is returned. - if (content) { - content = content.replace(xmlRegExp, ""); - var matches = content.match(bodyRegExp); - if (matches) { - content = matches[1]; + masterConfig.isBuild = config.isBuild; + + var parsed = text.parseName(name), + nonStripName = parsed.moduleName + '.' + parsed.ext, + url = req.toUrl(nonStripName), + useXhr = (masterConfig.useXhr) || + text.useXhr; + + //Load the text. Use XHR if possible and in a browser. + if (!hasLocation || useXhr(url, defaultProtocol, defaultHostName, defaultPort)) { + text.get(url, function (content) { + text.finishLoad(name, parsed.strip, content, onLoad); + }, function (err) { + if (onLoad.error) { + onLoad.error(err); } - } else { - content = ""; - } - return content; - }, - - jsEscape: function (content) { - return content.replace(/(['\\])/g, '\\$1') - .replace(/[\f]/g, "\\f") - .replace(/[\b]/g, "\\b") - .replace(/[\n]/g, "\\n") - .replace(/[\t]/g, "\\t") - .replace(/[\r]/g, "\\r"); - }, - - createXhr: function () { - //Would love to dump the ActiveX crap in here. Need IE 6 to die first. - var xhr, i, progId; - if (typeof XMLHttpRequest !== "undefined") { - return new XMLHttpRequest(); - } else { - for (i = 0; i < 3; i++) { - progId = progIds[i]; - try { - xhr = new ActiveXObject(progId); - } catch (e) {} - - if (xhr) { - progIds = [progId]; // so faster next time - break; - } - } - } - - if (!xhr) { - throw new Error("createXhr(): XMLHttpRequest not available"); - } + }); + } else { + //Need to fetch the resource across domains. Assume + //the resource has been optimized into a JS module. Fetch + //by the module name + extension, but do not include the + //!strip part to avoid file system issues. + req([nonStripName], function (content) { + text.finishLoad(parsed.moduleName + '.' + parsed.ext, + parsed.strip, content, onLoad); + }); + } + }, + + write: function (pluginName, moduleName, write, config) { + if (buildMap.hasOwnProperty(moduleName)) { + var content = text.jsEscape(buildMap[moduleName]); + write.asModule(pluginName + "!" + moduleName, + "define(function () { return '" + + content + + "';});\n"); + } + }, + + writeFile: function (pluginName, moduleName, req, write, config) { + var parsed = text.parseName(moduleName), + nonStripName = parsed.moduleName + '.' + parsed.ext, + //Use a '.js' file name so that it indicates it is a + //script that can be loaded across domains. + fileName = req.toUrl(parsed.moduleName + '.' + + parsed.ext) + '.js'; + + //Leverage own load() method to load plugin value, but only + //write out values that do not have the strip argument, + //to avoid any potential issues with ! in file names. + text.load(nonStripName, req, function (value) { + //Use own write() method to construct full module value. + //But need to create shell that translates writeFile's + //write() to the right interface. + var textWrite = function (contents) { + return write(fileName, contents); + }; + textWrite.asModule = function (moduleName, contents) { + return write.asModule(moduleName, fileName, contents); + }; - return xhr; - }, - - get: get, - - /** - * Parses a resource name into its component parts. Resource names - * look like: module/name.ext!strip, where the !strip part is - * optional. - * @param {String} name the resource name - * @returns {Object} with properties "moduleName", "ext" and "strip" - * where strip is a boolean. - */ - parseName: function (name) { - var strip = false, index = name.indexOf("."), - modName = name.substring(0, index), - ext = name.substring(index + 1, name.length); - - index = ext.indexOf("!"); - if (index !== -1) { - //Pull off the strip arg. - strip = ext.substring(index + 1, ext.length); - strip = strip === "strip"; - ext = ext.substring(0, index); - } + text.write(pluginName, nonStripName, textWrite, config); + }, config); + } + }; + + if (masterConfig.env === 'node' || (!masterConfig.env && + typeof process !== "undefined" && + process.versions && + !!process.versions.node)) { + //Using special require.nodeRequire, something added by r.js. + fs = require.nodeRequire('fs'); + + text.get = function (url, callback) { + var file = fs.readFileSync(url, 'utf8'); + //Remove BOM (Byte Mark Order) from utf8 files if it is there. + if (file.indexOf('\uFEFF') === 0) { + file = file.substring(1); + } + callback(file); + }; + } else if (masterConfig.env === 'xhr' || (!masterConfig.env && + text.createXhr())) { + text.get = function (url, callback, errback) { + var xhr = text.createXhr(); + xhr.open('GET', url, true); + + //Allow overrides specified in config + if (masterConfig.onXhr) { + masterConfig.onXhr(xhr, url); + } - return { - moduleName: modName, - ext: ext, - strip: strip - }; - }, - - xdRegExp: /^((\w+)\:)?\/\/([^\/\\]+)/, - - /** - * Is an URL on another domain. Only works for browser use, returns - * false in non-browser environments. Only used to know if an - * optimized .js version of a text resource should be loaded - * instead. - * @param {String} url - * @returns Boolean - */ - useXhr: function (url, protocol, hostname, port) { - var match = text.xdRegExp.exec(url), - uProtocol, uHostName, uPort; - if (!match) { - return true; - } - uProtocol = match[2]; - uHostName = match[3]; - - uHostName = uHostName.split(':'); - uPort = uHostName[1]; - uHostName = uHostName[0]; - - return (!uProtocol || uProtocol === protocol) && - (!uHostName || uHostName === hostname) && - ((!uPort && !uHostName) || uPort === port); - }, - - finishLoad: function (name, strip, content, onLoad, config) { - content = strip ? text.strip(content) : content; - if (config.isBuild) { - buildMap[name] = content; + xhr.onreadystatechange = function (evt) { + var status, err; + //Do not explicitly handle errors, those should be + //visible via console output in the browser. + if (xhr.readyState === 4) { + status = xhr.status; + if (status > 399 && status < 600) { + //An http 4xx or 5xx error. Signal an error. + err = new Error(url + ' HTTP status: ' + status); + err.xhr = xhr; + errback(err); + } else { + callback(xhr.responseText); + } } - onLoad(content); - }, - - load: function (name, req, onLoad, config) { - //Name has format: some.module.filext!strip - //The strip part is optional. - //if strip is present, then that means only get the string contents - //inside a body tag in an HTML string. For XML/SVG content it means - //removing the declarations so the content can be inserted - //into the current doc without problems. - - // Do not bother with the work if a build and text will - // not be inlined. - if (config.isBuild && !config.inlineText) { - onLoad(); - return; + }; + xhr.send(null); + }; + } else if (masterConfig.env === 'rhino' || (!masterConfig.env && + typeof Packages !== 'undefined' && typeof java !== 'undefined')) { + //Why Java, why is this so awkward? + text.get = function (url, callback) { + var stringBuffer, line, + encoding = "utf-8", + file = new java.io.File(url), + lineSeparator = java.lang.System.getProperty("line.separator"), + input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), encoding)), + content = ''; + try { + stringBuffer = new java.lang.StringBuffer(); + line = input.readLine(); + + // Byte Order Mark (BOM) - The Unicode Standard, version 3.0, page 324 + // http://www.unicode.org/faq/utf_bom.html + + // Note that when we use utf-8, the BOM should appear as "EF BB BF", but it doesn't due to this bug in the JDK: + // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4508058 + if (line && line.length() && line.charAt(0) === 0xfeff) { + // Eat the BOM, since we've already found the encoding on this file, + // and we plan to concatenating this buffer with others; the BOM should + // only appear at the top of a file. + line = line.substring(1); } - var parsed = text.parseName(name), - nonStripName = parsed.moduleName + '.' + parsed.ext, - url = req.toUrl(nonStripName), - useXhr = (config && config.text && config.text.useXhr) || - text.useXhr; - - //Load the text. Use XHR if possible and in a browser. - if (!hasLocation || useXhr(url, defaultProtocol, defaultHostName, defaultPort)) { - text.get(url, function (content) { - text.finishLoad(name, parsed.strip, content, onLoad, config); - }); - } else { - //Need to fetch the resource across domains. Assume - //the resource has been optimized into a JS module. Fetch - //by the module name + extension, but do not include the - //!strip part to avoid file system issues. - req([nonStripName], function (content) { - text.finishLoad(parsed.moduleName + '.' + parsed.ext, - parsed.strip, content, onLoad, config); - }); - } - }, - - write: function (pluginName, moduleName, write, config) { - if (moduleName in buildMap) { - var content = text.jsEscape(buildMap[moduleName]); - write.asModule(pluginName + "!" + moduleName, - "define(function () { return '" + - content + - "';});\n"); + stringBuffer.append(line); + + while ((line = input.readLine()) !== null) { + stringBuffer.append(lineSeparator); + stringBuffer.append(line); } - }, - - writeFile: function (pluginName, moduleName, req, write, config) { - var parsed = text.parseName(moduleName), - nonStripName = parsed.moduleName + '.' + parsed.ext, - //Use a '.js' file name so that it indicates it is a - //script that can be loaded across domains. - fileName = req.toUrl(parsed.moduleName + '.' + - parsed.ext) + '.js'; - - //Leverage own load() method to load plugin value, but only - //write out values that do not have the strip argument, - //to avoid any potential issues with ! in file names. - text.load(nonStripName, req, function (value) { - //Use own write() method to construct full module value. - //But need to create shell that translates writeFile's - //write() to the right interface. - var textWrite = function (contents) { - return write(fileName, contents); - }; - textWrite.asModule = function (moduleName, contents) { - return write.asModule(moduleName, fileName, contents); - }; - - text.write(pluginName, nonStripName, textWrite, config); - }, config); + //Make sure we return a JavaScript string and not a Java string. + content = String(stringBuffer.toString()); //String + } finally { + input.close(); } + callback(content); }; + } - return text; - }); -}()); + return text; +}); diff --git a/external/requirejs/require.js b/external/requirejs/require.js index 068e34c8de8..0e7b81bc49f 100644 --- a/external/requirejs/require.js +++ b/external/requirejs/require.js @@ -1,202 +1,212 @@ /** 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.1.2 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 */ +//Not using strict: uneven strict support in browsers, #392, and causes +//problems with requirejs.exec()/transpiler plugins that may not be strict. +/*jslint regexp: true, nomen: true, sloppy: 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) { + var req, s, head, baseElement, dataMain, src, + interactiveScript, currentlyAddingScript, mainScript, subPath, + version = '2.1.2', commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, - cjsRequireRegExp = /require\(\s*["']([^'"\s]+)["']\s*\)/g, - currDirRegExp = /^\.\//, + cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, jsSuffixRegExp = /\.js$/, - ostring = Object.prototype.toString, + currDirRegExp = /^\.\//, + op = Object.prototype, + ostring = op.toString, + hasOwn = op.hasOwnProperty, 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; + useInteractive = false; 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]'; } /** - * Simple function to mix in properties from source into target, - * but only if target does not already have a property of the same name. - * This is not robust in IE for transferring methods that match - * Object.prototype names, but the uses of mixin here seem unlikely to - * trigger a problem related to that. + * Helper function for iterating over an array. If the func returns + * a true value, it will break out of the loop. */ - function mixin(target, source, force) { - for (var prop in source) { - if (!(prop in empty) && (!(prop in target) || force)) { - target[prop] = source[prop]; + function each(ary, func) { + if (ary) { + var i; + for (i = 0; i < ary.length; i += 1) { + if (ary[i] && func(ary[i], i, ary)) { + break; + } } } - return req; } /** - * Constructs an error with a pointer to an URL with more information. - * @param {String} id the error ID that maps to an ID on a web page. - * @param {String} message human readable error. - * @param {Error} [err] the original error, if there is one. - * - * @returns {Error} + * Helper function for iterating over an array backwards. If the func + * returns a true value, it will break out of the loop. */ - function makeError(id, msg, err) { - var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id); - if (err) { - e.originalError = err; + function eachReverse(ary, func) { + if (ary) { + var i; + for (i = ary.length - 1; i > -1; i -= 1) { + if (ary[i] && func(ary[i], i, ary)) { + break; + } + } + } + } + + function hasProp(obj, prop) { + return hasOwn.call(obj, prop); + } + + function getOwn(obj, prop) { + return hasProp(obj, prop) && obj[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 (hasProp(obj, prop)) { + if (func(obj[prop], prop)) { + break; + } + } } - 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. + * Simple function to mix in properties from source into target, + * but only if target does not already have a property of the same name. */ - function configurePackageDir(pkgs, currentPackages, dir) { - var i, location, pkgObj; + function mixin(target, source, force, deepStringMixin) { + if (source) { + eachProp(source, function (value, prop) { + if (force || !hasProp(target, prop)) { + if (deepStringMixin && typeof value !== 'string') { + if (!target[prop]) { + target[prop] = {}; + } + mixin(target[prop], value, force, deepStringMixin); + } else { + target[prop] = value; + } + } + }); + } + return target; + } - for (i = 0; (pkgObj = currentPackages[i]); i++) { - pkgObj = typeof pkgObj === "string" ? { name: pkgObj } : pkgObj; - location = pkgObj.location; + //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); + }; + } - //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); - } + function scripts() { + return document.getElementsByTagName('script'); + } - //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, '') - }; + //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; } /** - * 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. + * Constructs an error with a pointer to an URL with more information. + * @param {String} id the error ID that maps to an ID on a web page. + * @param {String} message human readable error. + * @param {Error} [err] the original error, if there is one. + * + * @returns {Error} */ - function jQueryHoldReady($, shouldHold) { - if ($.holdReady) { - $.holdReady(shouldHold); - } else if (shouldHold) { - $.readyWait += 1; - } else { - $.ready(true); + 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; } - 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, + var inCheckLoaded, Module, context, handlers, + checkLoadedTimeoutId, config = { waitSeconds: 7, - baseUrl: "./", + baseUrl: './', paths: {}, pkgs: {}, - catchError: {} + shim: {}, + map: {}, + config: {} }, + registry = {}, + undefEvents = {}, defQueue = [], - specified = { - "require": true, - "exports": true, - "module": true - }, - urlMap = {}, defined = {}, - loaded = {}, - waiting = {}, - waitAry = [], 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; /** * Trims the . and .. from an array of path segments. @@ -209,11 +219,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,50 +247,146 @@ 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 pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment, + foundMap, foundI, foundStarMap, starI, + baseParts = baseName && baseName.split('/'), + normalizedBaseParts = baseParts, + map = config.map, + starMap = map && map['*']; //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. if (baseName) { - if (config.pkgs[baseName]) { + if (getOwn(config.pkgs, baseName)) { //If the baseName is a package name, then just treat it as one //name to concat the name with. - baseName = [baseName]; + normalizedBaseParts = 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); + normalizedBaseParts = baseParts.slice(0, baseParts.length - 1); } - name = baseName.concat(name.split("/")); + name = normalizedBaseParts.concat(name.split('/')); trimDots(name); //Some use of packages may use a . path to reference the - //"main" module name, so normalize for that. - pkgConfig = config.pkgs[(pkgName = name[0])]; - name = name.join("/"); + //'main' module name, so normalize for that. + pkgConfig = getOwn(config.pkgs, (pkgName = name[0])); + 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 = getOwn(map, baseParts.slice(0, j).join('/')); + + //baseName segment has config, find if it has one for + //this name. + if (mapValue) { + mapValue = getOwn(mapValue, nameSegment); + if (mapValue) { + //Match, update name to the new value. + foundMap = mapValue; + foundI = i; + break; + } + } + } + } + + if (foundMap) { + break; + } + + //Check for a star map match, but just hold on to it, + //if there is a shorter segment match later in a matching + //config, then favor over this star map. + if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) { + foundStarMap = getOwn(starMap, nameSegment); + starI = i; + } + } + + if (!foundMap && foundStarMap) { + foundMap = foundStarMap; + foundI = starI; + } + + if (foundMap) { + nameParts.splice(0, foundI, foundMap); + name = nameParts.join('/'); + } + } + 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 = getOwn(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.require.undef(id); + context.require([id]); + return true; + } + } + + //Turns a plugin!resource to [plugin, resource] + //with the plugin being undefined if the name + //did not have a plugin prefix. + function splitPrefix(name) { + var prefix, + index = name ? name.indexOf('!') : -1; + if (index > -1) { + prefix = name.substring(0, index); + name = name.substring(index + 1, name.length); + } + return [prefix, name]; + } + /** * Creates a module mapping that includes plugin prefix, module * name, and path. If parentModuleMap is provided it will @@ -288,1031 +395,909 @@ 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 url, pluginModule, suffix, nameParts, prefix = null, parentName = parentModuleMap ? parentModuleMap.name : null, originalName = name, - normalizedName, url, pluginModule; - - if (index !== -1) { - prefix = name.substring(0, index); - name = name.substring(index + 1, name.length); + isDefine = true, + normalizedName = ''; + + //If no name, then it means it is a require call, generate an + //internal name. + if (!name) { + isDefine = false; + name = '_@r' + (requireCounter += 1); } + nameParts = splitPrefix(name); + prefix = nameParts[0]; + name = nameParts[1]; + if (prefix) { - prefix = normalize(prefix, parentName); + prefix = normalize(prefix, parentName, applyMap); + pluginModule = getOwn(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); - - url = urlMap[normalizedName]; - if (!url) { - //Calculate url for the module, if it has a name. - //Use name here since nameToUrl also calls normalize, - //and for relative names that are outside the baseUrl - //this causes havoc. Was thinking of just removing - //parentModuleMap to avoid extra normalization, but - //normalize() still does a dot removal because of - //issue #142, so just pass in name here and redo - //the normalization. Paths outside baseUrl are just - //messy to support. - url = context.nameToUrl(name, null, parentModuleMap); - - //Store the URL mapping for later. - urlMap[normalizedName] = url; - } + normalizedName = normalize(name, parentName, applyMap); + + //Normalized name may be a plugin ID due to map config + //application in normalize. The map config values must + //already be normalized, so do not need to redo that part. + nameParts = splitPrefix(normalizedName); + prefix = nameParts[0]; + normalizedName = nameParts[1]; + isNormalized = true; + + url = context.nameToUrl(normalizedName); } } + //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 }; } - /** - * Determine if priority loading is done. If so clear the priorityWait - */ - 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 getModule(depMap) { + var id = depMap.id, + mod = getOwn(registry, id); + + if (!mod) { + mod = registry[id] = new context.Module(depMap); } - return priorityDone; + + return mod; } - 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; + function on(depMap, name, fn) { + var id = depMap.id, + mod = getOwn(registry, id); + + if (hasProp(defined, id) && + (!mod || mod.defineEmitComplete)) { + if (name === 'defined') { + fn(defined[id]); } - args.push(relModuleMap); - return func.apply(null, args); - }; + } else { + getModule(depMap).on(name, fn); + } } - /** - * Helper function that creates a require function object to give to - * modules that ask for it as a dependency. It needs to be specific - * 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); - - 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; + function onError(err, errback) { + var ids = err.requireModules, + notified = false; + + if (errback) { + errback(err); + } else { + each(ids, function (id) { + var mod = getOwn(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); + } + } } - /* - * 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. + /** + * Internal method to transfer globalQueue items to this context's + * defQueue. */ - function queueDependency(manager) { - context.paused.push(manager); + 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 = []; + } } - 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; - } + handlers = { + 'require': function (mod) { + if (mod.require) { + return mod.require; } else { - ret = execCb(fullName, manager.callback, args, defined[fullName]); + return (mod.require = context.makeRequire(mod.map)); } - - 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]; + }, + 'exports': function (mod) { + mod.usingExports = true; + if (mod.map.isDefine) { + if (mod.exports) { + return mod.exports; } 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; - } + return (mod.exports = defined[mod.map.id] = {}); } } - } 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 = []; + }, + 'module': function (mod) { + if (mod.module) { + return mod.module; + } else { + return (mod.module = { + id: mod.map.id, + uri: mod.map.url, + config: function () { + return (config.config && getOwn(config.config, mod.map.id)) || {}; + }, + exports: defined[mod.map.id] + }); } } + }; - //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); - } + function cleanRegistry(id) { + //Clean up machinery used for waiting modules. + delete registry[id]; + } - 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); - } + function breakCycle(mod, traced, processed) { + var id = mod.map.id; - //Let listeners know of this manager's value. - for (i = 0; (cb = listeners[i]); i++) { - cb(ret); + if (mod.error) { + mod.emit('error', mod.error); + } else { + traced[id] = true; + each(mod.depMaps, function (depMap, i) { + var depId = depMap.id, + dep = getOwn(registry, depId); + + //Only force things that have not completed + //being defined, so still in the registry, + //and only if it has not been matched up + //in the module already. + if (dep && !mod.depMatched[i] && !processed[depId]) { + if (getOwn(traced, depId)) { + mod.defineDep(i, defined[depId]); + mod.check(); //pass false? + } else { + breakCycle(dep, traced, processed); + } + } + }); + processed[id] = true; } - - 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 checkLoaded() { + var map, modId, err, usingPathFallback, + 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 = [], + reqCalls = [], + stillLoading = false, + needCycleCheck = true; - 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) { + //Do not bother if this call was a result of a cycle break. + if (inCheckLoaded) { 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; + inCheckLoaded = true; - //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; + //Figure out the state of all the modules. + eachProp(registry, function (mod) { + map = mod.map; + modId = map.id; - //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; + //Skip things that are not enabled or in error state. + if (!mod.enabled) { + return; } - req.exec(text); - - if (hasInteractive) { - useInteractive = true; + if (!map.isDefine) { + reqCalls.push(mod); } - //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]); + 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; + } 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); } } - depManager.moduleDeps = (depManager.moduleDeps || []).concat(moduleDeps); - return context.require(deps, cb); - }), load, config); + } + }); + + if (expired && noLoads.length) { + //If wait time expired, throw error of unloaded modules. + err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads); + err.contextName = context.contextName; + return onError(err); } - } - /** - * 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; + //Not expired, check for a cycle. + if (needCycleCheck) { + each(reqCalls, function (mod) { + breakCycle(mod, {}, {}); + }); } - } - /** - * 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); + //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 || 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) { + checkLoadedTimeoutId = setTimeout(function () { + checkLoadedTimeoutId = 0; + checkLoaded(); + }, 50); + } + } + + inCheckLoaded = false; } - function getManager(map, shouldQueue) { - var fullName = map.fullName, - prefix = map.prefix, - plugin = prefix ? plugins[prefix] || - (plugins[prefix] = defined[prefix]) : null, - manager, created, pluginManager, prefixMap; + Module = function (map) { + this.events = getOwn(undefEvents, map.id) || {}; + this.map = map; + this.shim = getOwn(config.shim, map.id); + this.depExports = []; + this.depMaps = []; + this.depMatched = []; + this.pluginMaps = {}; + this.depCount = 0; + + /* this.exports this.factory + this.depMaps = [], + this.enabled, this.fetched + */ + }; - if (fullName) { - manager = managerCallbacks[fullName]; - } + Module.prototype = { + init: function (depMaps, factory, errback, options) { + options = options || {}; - 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; + //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; } - } - //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]; - } + this.factory = factory; - 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); + 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); }); - }); - } 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; - } + //Do a copy of the dependency array, so that + //source inputs are not modified. For example + //"shim" deps are passed in here directly, and + //doing a direct modification of the depMaps array + //would affect that config. + this.depMaps = depMaps && depMaps.slice(0); + + this.errback = errback; + + //Indicate this module has be initialized + this.inited = true; - 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)) { + 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(); + } + }, + + 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(); - //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; + var map = this.map; - //If module is jQuery set up delaying its dom ready listeners. - if (fullName === "jquery" && callback) { - jQueryCheck(callback()); + //If the manager is for a plugin managed resource, + //ask the plugin to load it now. + if (this.shim) { + context.makeRequire(this.map, { + enableBuildCallback: true + })(this.shim.deps || [], bind(this, function () { + return map.prefix ? this.callPlugin() : this.load(); + })); + } else { + //Regular dependency. + return map.prefix ? this.callPlugin() : this.load(); } - } + }, - //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; - } + load: function () { + var url = this.map.url; - //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]); - } + //Regular dependency. + if (!urlFetched[url]) { + urlFetched[url] = true; + context.load(this.map.id, url); } - } + }, - //Do not bother tracking the manager if it is all done. - if (!manager.depCount) { - //All done, execute! - execManager(manager); - } else { - addWait(manager); - } - } + /** + * Checks is the module is ready to define itself, and if so, + * define it. + */ + check: function () { + if (!this.enabled || this.enabling) { + return; + } - /** - * Convenience method to call main for a define call that was put on - * hold in the defQueue. - */ - function callDefMain(args) { - main.apply(null, args); - } + var err, cjsModule, + id = this.map.id, + depExports = this.depExports, + exports = this.exports, + factory = this.factory; + + 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); + } - /** - * 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 (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)); + } - 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; + } else { + //Just a literal value + exports = factory; } - } - } - } - }; - function findCycle(manager, traced) { - var fullName = manager.map.fullName, - depArray = manager.depArray, - fullyLoaded = true, - i, depName, depManager, result; + this.exports = exports; - if (manager.isDone || !fullName || !loaded[fullName]) { - return result; - } + if (this.map.isDefine && !this.ignore) { + defined[id] = exports; - //Found the cycle. - if (traced[fullName]) { - return manager; - } + if (req.onResourceLoad) { + req.onResourceLoad(context, this.map, this.depMaps); + } + } - traced[fullName] = true; + //Clean up + delete registry[id]; - //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; + this.defined = true; } - depManager = waiting[depName]; - if (depManager && !depManager.isDone && loaded[depName]) { - result = findCycle(depManager, traced); - if (result) { - break; - } + + //Finished the define stage. Allow calling check again + //to allow define notifications below in the case of a + //cycle. + this.defining = false; + + if (this.defined && !this.defineEmitted) { + this.defineEmitted = true; + this.emit('defined', this.exports); + this.defineEmitComplete = true; } + } - 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]; - } - } + }, - return result; - } + callPlugin: function () { + var map = this.map, + id = map.id, + //Map already normalized the prefix. + pluginMap = makeModuleMap(map.prefix); + + //Mark this as a dependency for this plugin, so it + //can be traced for cycles. + this.depMaps.push(pluginMap); + + on(pluginMap, 'defined', bind(this, function (plugin) { + var load, normalizedMap, normalizedMod, + name = this.map.name, + parentName = this.map.parentMap ? this.map.parentMap.name : null, + localRequire = context.makeRequire(map.parentMap, { + enableBuildCallback: true, + skipMap: true + }); - function forceExec(manager, traced) { - var fullName = manager.map.fullName, - depArray = manager.depArray, - i, depName, depManager, prefix, prefixManager, value; + //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); + }) || ''; + } + //prefix and name should already be normalized, no need + //for applying map config again either. + normalizedMap = makeModuleMap(map.prefix + '!' + name, + this.map.parentMap); + on(normalizedMap, + 'defined', bind(this, function (value) { + this.init([], function () { return value; }, null, { + enabled: true, + ignore: true + }); + })); + + normalizedMod = getOwn(registry, normalizedMap.id); + if (normalizedMod) { + //Mark this as a dependency for this plugin, so it + //can be traced for cycles. + this.depMaps.push(normalizedMap); + + if (this.events.error) { + normalizedMod.on('error', bind(this, function (err) { + this.emit('error', err); + })); + } + normalizedMod.enable(); + } - if (manager.isDone || !fullName || !loaded[fullName]) { - return undefined; - } + return; + } - if (fullName) { - if (traced[fullName]) { - return defined[fullName]; - } + load = bind(this, function (value) { + this.init([], function () { return value; }, null, { + enabled: true + }); + }); - traced[fullName] = true; - } + load.error = bind(this, function (err) { + this.inited = true; + this.error = err; + err.requireModules = [id]; - //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); + //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) { + cleanRegistry(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 = bind(this, function (text, textAlt) { + /*jslint evil: true */ + var moduleName = map.name, + moduleMap = makeModuleMap(moduleName), + hasInteractive = useInteractive; + + //As of 2.1.0, support just passing the text, to reinforce + //fromText only being called once per resource. Still + //support old style of passing moduleName but discard + //that moduleName in favor of the internal ref. + if (textAlt) { + text = textAlt; } - depManager = waiting[depName]; - if (depManager && !depManager.isDone && loaded[depName]) { - value = forceExec(depManager, traced); - manager.depCallbacks[i](value); + + //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; } - } - } - } - return defined[fullName]; - } + //Prime the system by creating a module instance for + //it. + getModule(moduleMap); - /** - * 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; - - //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; - } + //Transfer any config to this other module. + if (hasProp(config.config, id)) { + config.config[moduleName] = config.config[id]; + } - //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; - } - } + try { + req.exec(text); + } catch (e) { + throw new Error('fromText eval for ' + moduleName + + ' failed: ' + e); + } - //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 { - 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); - } - } + if (hasInteractive) { + useInteractive = true; } - } - } - } - //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 wait time expired, throw error of unloaded modules. - err = makeError("timeout", "Load timeout for modules: " + noLoads); - err.requireType = "timeout"; - err.requireModules = noLoads; - err.contextName = context.contextName; - return req.onError(err); - } + //Mark this as a dependency for the plugin + //resource + this.depMaps.push(moduleMap); - //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; + //Support anonymous modules. + context.completeLoad(moduleName); + + //Bind the value of that module to the value for this + //resource ID. + localRequire([moduleName], load); + }); + + //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, localRequire, load, config); + })); + + context.enable(pluginMap, this); + this.pluginMaps[pluginMap.id] = pluginMap; + }, + + enable: function () { + this.enabled = true; + + //Set flag mentioning that the module is enabling, + //so that immediate calls to the defined callbacks + //for dependencies do not trigger inadvertent load + //with the depCount still being zero. + this.enabling = true; + + //Enable each dependency + each(this.depMaps, bind(this, function (depMap, i) { + var id, mod, handler; + + if (typeof depMap === 'string') { + //Dependency needs to be converted to a depMap + //and wired up to this module. + depMap = makeModuleMap(depMap, + (this.map.isDefine ? this.map : this.map.parentMap), + false, + !this.skipMap); + this.depMaps[i] = depMap; + + handler = getOwn(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 (this.errback) { + on(depMap, 'error', this.errback); + } } - } - } + id = depMap.id; + mod = registry[id]; - //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)) { - //Something is still waiting to load. Wait for it, but only - //if a timeout is not already in effect. - if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) { - checkLoadedTimeoutId = setTimeout(function () { - checkLoadedTimeoutId = 0; - checkLoaded(); - }, 50); - } - return undefined; - } + //Skip special modules like 'require', 'exports', 'module' + //Also, don't call enable if it is already enabled, + //important in circular dependency cases. + if (!hasProp(handlers, id) && mod && !mod.enabled) { + context.enable(depMap, this); + } + })); + + //Enable each plugin that is used in + //a dependency + eachProp(this.pluginMaps, bind(this, function (pluginMap) { + var mod = getOwn(registry, pluginMap.id); + if (mod && !mod.enabled) { + context.enable(pluginMap, this); + } + })); - //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, {}); - } + this.enabling = false; - //If anything got placed in the paused queue, run it down. - if (context.paused.length) { - resume(); + this.check(); + }, + + on: function (name, cb) { + var cbs = this.events[name]; + if (!cbs) { + cbs = this.events[name] = []; } + cbs.push(cb); + }, - //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(); + 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. + delete this.events[name]; } } + }; - checkLoadedDepth = 0; - - //Check for DOM ready, and nothing is waiting across contexts. - req.checkReadyState(); + function callGetModule(args) { + //Skip modules already defined. + if (!hasProp(defined, args[0])) { + getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]); + } + } - return undefined; + 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); + } } /** - * Resumes tracing of dependencies and then checks if everything is loaded. + * 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} */ - resume = function () { - var manager, map, url, i, p, args, fullName; + 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; - //Any defined modules in the global queue, intake them now. - context.takeGlobalQueue(); + //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') + }; + } - resumeDepth += 1; + function intakeDefines() { + var args; - 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; - } + //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 req.onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); + return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); } else { - callDefMain(args); + //args are id, deps, factory. Should be normalized by the + //define() function. + callGetModule(args); } } + } - //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 = []; - - for (i = 0; (manager = p[i]); i++) { - map = manager.map; - url = map.url; - fullName = map.fullName; - - //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); - - //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; - } - } - } - } - - //Move the start time for timeout forward. - context.startTime = (new Date()).getTime(); - context.pausedCount -= p.length; - } - } - - //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, config: config, - defQueue: defQueue, - waiting: waiting, - waitCount: 0, - specified: specified, - loaded: loaded, - urlMap: urlMap, - urlFetched: urlFetched, - scriptCount: 0, + contextName: contextName, + registry: registry, defined: defined, - paused: [], - pausedCount: 0, - plugins: plugins, - needFullExec: needFullExec, - fake: {}, - fullExec: fullExec, - managerCallbacks: managerCallbacks, + urlFetched: urlFetched, + defQueue: defQueue, + Module: Module, makeModuleMap: makeModuleMap, - normalize: normalize, + nextTick: req.nextTick, + /** * 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; - - //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]; + var pkgs = config.pkgs, + shim = config.shim, + objs = { + paths: true, + config: true, + map: true + }; + + eachProp(cfg, function (value, prop) { + if (objs[prop]) { + if (prop === 'map') { + mixin(config[prop], value, true, true); + } else { + mixin(config[prop], value, true); } + } else { + config[prop] = value; } - config.paths = paths; - } + }); - 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.init) && !value.exportsFn) { + value.exportsFn = context.makeShimExports(value); + } + 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 there are any "waiting to execute" modules in the registry, + //update the maps for them, since their info, like URLs to load, + //may have changed. + eachProp(registry, function (mod, id) { + //If module already has init called, since it is too + //late to modify them, and ignore unnormalized ones + //since they are transient. + if (!mod.inited && !mod.map.unnormalized) { + mod.map = makeModuleMap(id); + } + }); //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 @@ -1322,77 +1307,155 @@ var requirejs, require, define; } }, - requireDefined: function (moduleName, relModuleMap) { - return makeModuleMap(moduleName, relModuleMap).fullName in defined; - }, + makeShimExports: function (value) { + function fn() { + var ret; + if (value.init) { + ret = value.init.apply(global, arguments); + } + return ret || (value.exports && getGlobal(value.exports)); + } + return fn; + }, + + makeRequire: function (relMap, options) { + options = options || {}; + + function localRequire(deps, callback, errback) { + var id, map, requireMod; + + if (options.enableBuildCallback && callback && isFunction(callback)) { + callback.__requireJsBuild = true; + } + + if (typeof deps === 'string') { + if (isFunction(callback)) { + //Invalid call + return onError(makeError('requireargs', 'Invalid require call'), errback); + } + + //If require|exports|module are requested, get the + //value for them from the special handlers. Caveat: + //this only works while module is being defined. + if (relMap && hasProp(handlers, deps)) { + return handlers[deps](registry[relMap.id]); + } + + //Synchronous access to one module. If require.get is + //available (as in the Node adapter), prefer that. + if (req.get) { + return req.get(context, deps, relMap); + } + + //Normalize module name, if it contains . or .. + map = makeModuleMap(deps, relMap, false, true); + id = map.id; + + if (!hasProp(defined, id)) { + return onError(makeError('notloaded', 'Module name "' + + id + + '" has not been loaded yet for context: ' + + contextName + + (relMap ? '' : '. Use require([])'))); + } + return defined[id]; + } + + //Grab defines waiting in the global queue. + intakeDefines(); + + //Mark all the dependencies as needing to be loaded. + context.nextTick(function () { + //Some defines could have been added since the + //require call, collect them. + intakeDefines(); + + requireMod = getModule(makeModuleMap(null, relMap)); + + //Store if map config should be applied to this require + //call for dependencies. + requireMod.skipMap = options.skipMap; + + requireMod.init(deps, callback, errback, { + enabled: true + }); - requireSpecified: function (moduleName, relModuleMap) { - return makeModuleMap(moduleName, relModuleMap).fullName in specified; - }, + checkLoaded(); + }); - require: function (deps, callback, relModuleMap) { - var moduleName, fullName, moduleMap; - if (typeof deps === "string") { - if (isFunction(callback)) { - //Invalid call - return req.onError(makeError("requireargs", "Invalid require call")); - } + return localRequire; + } - //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 - if (req.get) { - return req.get(context, deps, callback); - } + mixin(localRequire, { + isBrowser: isBrowser, + + /** + * Converts a module name + .extension into an URL path. + * *Requires* the use of a module name. It does not support using + * plain URLs like nameToUrl. + */ + toUrl: function (moduleNamePlusExt) { + var index = moduleNamePlusExt.lastIndexOf('.'), + ext = null; + + if (index !== -1) { + ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length); + moduleNamePlusExt = moduleNamePlusExt.substring(0, index); + } - //Just return the module wanted. In this scenario, the - //second arg (if passed) is just the relModuleMap. - moduleName = deps; - relModuleMap = callback; + return context.nameToUrl(normalize(moduleNamePlusExt, + relMap && relMap.id, true), ext); + }, - //Normalize module name, if it contains . or .. - moduleMap = makeModuleMap(moduleName, relModuleMap); - fullName = moduleMap.fullName; + defined: function (id) { + return hasProp(defined, makeModuleMap(id, relMap, false, true).id); + }, - if (!(fullName in defined)) { - return req.onError(makeError("notloaded", "Module name '" + - moduleMap.fullName + - "' has not been loaded yet for context: " + - contextName)); + specified: function (id) { + id = makeModuleMap(id, relMap, false, true).id; + return hasProp(defined, id) || hasProp(registry, id); } - return defined[fullName]; - } + }); - //Call main but only if there are dependencies or - //a callback to call. - if (deps && deps.length || callback) { - main(null, deps, callback, relModuleMap); - } + //Only allow undef on top level require calls + if (!relMap) { + localRequire.undef = function (id) { + //Bind any waiting define() calls to this context, + //fix for #408 + takeGlobalQueue(); + + var map = makeModuleMap(id, relMap, true), + mod = getOwn(registry, id); + + delete defined[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; + } - //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(); - } + cleanRegistry(id); + } + }; } - return context.require; + + return localRequire; }, /** - * 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 = getOwn(registry, depMap.id); + if (mod) { + getModule(depMap).enable(); } }, @@ -1403,80 +1466,65 @@ var requirejs, require, define; * @param {String} moduleName the name of the module to potentially complete. */ completeLoad: function (moduleName) { - var args; + var found, args, mod, + shim = getOwn(config.shim, moduleName) || {}, + shExports = shim.exports; - 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]); - } - //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; + callGetModule(args); } - resume(); - if (!req.isAsync) { - context.scriptCount -= 1; - } - }, - /** - * Converts a module name + .extension into an URL path. - * *Requires* the use of a module name. It does not support using - * plain URLs like nameToUrl. - */ - toUrl: function (moduleNamePlusExt, relModuleMap) { - var index = moduleNamePlusExt.lastIndexOf("."), - ext = null; + //Do this after the cycle of callGetModule in case the result + //of those calls/init calls changes the registry. + mod = getOwn(registry, moduleName); - if (index !== -1) { - ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length); - moduleNamePlusExt = moduleNamePlusExt.substring(0, index); + if (!found && !hasProp(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.exportsFn]); + } } - return context.nameToUrl(moduleNamePlusExt, ext, relModuleMap); + checkLoaded(); }, /** * Converts a module name to a file path. Supports cases where * moduleName may actually be just an URL. + * Note that it **does not** call normalize on the moduleName, + * it is assumed to have already been normalized. This is an + * internal API, not a public one. Use toUrl for the public API. */ - nameToUrl: function (moduleName, ext, relModuleMap) { + nameToUrl: function (moduleName, ext) { var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url, - config = context.config; - - //Normalize module name if have a base relative module name to work from. - moduleName = normalize(moduleName, relModuleMap && relModuleMap.fullName); + parentPath; //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 +1534,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 = getOwn(pkgs, parentModule); + parentPath = getOwn(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,21 +1570,67 @@ 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('/'); + url += (ext || (/\?/.test(url) ? '' : '.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; - + context.require = context.makeRequire(); return context; } @@ -1547,20 +1648,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; + var context, config, + contextName = defContextName; // 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 +1672,16 @@ var requirejs, require, define; contextName = config.context; } - context = contexts[contextName] || - (contexts[contextName] = newContext(contextName)); + context = getOwn(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); }; /** @@ -1588,6 +1692,16 @@ var requirejs, require, define; return req(config); }; + /** + * Execute something after the current tick + * of the event loop. Override for other envs + * that have a better solution than setTimeout. + * @param {Function} fn function to execute later. + */ + req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) { + setTimeout(fn, 4); + } : function (fn) { fn(); }; + /** * Export require as a global, but only if it does not already exist. */ @@ -1595,31 +1709,41 @@ 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. + each([ + 'toUrl', + 'undef', + 'defined', + 'specified' + ], function (prop) { + //Reference from contexts instead of early binding to default context, + //so that during builds, the latest instance of the default context + //with its config gets used. + req[prop] = function () { + var ctx = contexts[defContextName]; + return ctx.require[prop].apply(ctx, arguments); + }; + }); + 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 +1768,140 @@ 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'; + node.async = true; + + 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() + //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; - context.scriptCount += 1; - req.attach(url, context, moduleName); + 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); - //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; + //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; + } + + //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) { + //Set final baseUrl if there is not already an explicit one. + 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('/') + '/' : './'; - return null; + cfg.baseUrl = subPath; + dataMain = mainScript; + } + + //Strip off any trailing .js since dataMain is now + //like a module name. + dataMain = dataMain.replace(jsSuffixRegExp, ''); + + //Put the data-main script in the files to load. + cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain]; + + return true; + } + }); } /** @@ -1684,7 +1914,7 @@ var requirejs, require, define; define = function (name, deps, callback) { var node, context; - //Allow for anonymous functions + //Allow for anonymous modules if (typeof name !== 'string') { //Adjust args appropriately callback = deps; @@ -1707,7 +1937,7 @@ var requirejs, require, define; if (callback.length) { callback .toString() - .replace(commentRegExp, "") + .replace(commentRegExp, '') .replace(cjsRequireRegExp, function (match, dep) { deps.push(dep); }); @@ -1717,7 +1947,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 +1957,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 +1970,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)); From b8bda04acd9b6313b12498c4496e5efeb39cbcc1 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 18 Jan 2013 00:13:50 -0700 Subject: [PATCH 10/94] Grunt migration: First draft of Gruntfile.js It can lint, build JS and execute some test through file:// --- Gruntfile.js | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 Gruntfile.js diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 00000000000..2ad6d900f42 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,133 @@ +module.exports = function( grunt ) { + "use strict"; + + var distpaths = [ + "dist/jquery.mobile.js", + "dist/jquery.mobile.min.map", + "dist/jquery.mobile.min.js" + ]; + + // grunt plugins + grunt.loadNpmTasks( "grunt-contrib-jshint" ); + grunt.loadNpmTasks( "grunt-contrib-uglify" ); + grunt.loadNpmTasks( "grunt-contrib-concat" ); + grunt.loadNpmTasks( "grunt-contrib-qunit" ); + grunt.loadNpmTasks( "grunt-contrib-requirejs" ); + grunt.loadNpmTasks( "grunt-css" ); + grunt.loadNpmTasks( "grunt-git-authors" ); + grunt.loadNpmTasks( "grunt-junit" ); + + + // Project configuration. + grunt.config.init({ + pkg: grunt.file.readJSON( "package.json" ), + + jshint: { + js: { + options: { + jshintrc: "js/.jshintrc" + }, + files: { + src: "js/**/*.js" + } + }, + grunt: { + options: { + jshintrc: ".jshintrc" + }, + files: { + src: [ "Gruntfile.js" ] + } + } + }, + + requirejs: { + compile: { + options: { + baseUrl: "js", + dir: "dist", + optimize: "none", + + //Finds require() dependencies inside a require() or define call. + findNestedDependencies: true, + + //If skipModuleInsertion is false, then files that do not use define() + //to define modules will get a define() placeholder inserted for them. + //Also, require.pause/resume calls will be inserted. + //Set it to true to avoid this. This is useful if you are building code that + //does not use require() in the built project or in the JS files, but you + //still want to use the optimization tool from RequireJS to concatenate modules + //together. + skipModuleInsertion: true, + + mainConfigFile: "js/requirejs.config.js", + + name: "jquery.mobile", + exclude: [ + "jquery", + "depend", + "text", + "text!../version.txt" + ], + + pragmasOnSave: { + jqmBuildExclude: true + }, + + //File paths are relative to the build file, or if running a commmand + //line build, the current directory. + wrap: { + startFile: "build/wrap.start", + endFile: "build/wrap.end" + }, + + dirExclusionRegExp: /^\.|^build|^compiled|^tmp/ + } + } + }, + + uglify: { + all: { + files: { + "dist/jquery.mobile.min.js": [ "dist/jquery.mobile.js" ] + }, + options: { + banner: "/*! jQuery Mobile v<%= pkg.version %> | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */", + sourceMap: "dist/jquery.mobile.min.map", + beautify: { + ascii_only: true + } + } + } + }, + + qunit: { + options: { + timeout: 10000 + }, + all: [ + "tests/unit/**/*.html", + "!tests/unit/checkboxradio/form-result.html", + "!tests/unit/core/index.html", + "!tests/unit/dialog/dialog-no-hash.html", + "!tests/unit/dialog/index.html", + "!tests/unit/event/index.html", + "!tests/unit/kitchensink/index.html", + "!tests/unit/init/**", + "!tests/unit/listview/cache-tests/*", + "!tests/unit/listview/push-state-disabled-tests.html", + "!tests/unit/loader/**", + "!tests/unit/navigation/**", + "!tests/unit/popup/back-two.html", + "!tests/unit/popup/other.html", + "!tests/unit/popup/popup-sequence-test-dialog.html", + "!tests/unit/select/cached*" + ] + } + + }); + + // Default grunt + grunt.registerTask( "default", [ "requirejs", "uglify" ] ); + +}; \ No newline at end of file From 8390361e496ef811252f7ad22fa2a794372aaa6f Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 17:58:38 -0800 Subject: [PATCH 11/94] Added CSS build Replaces version on build write DRYed banners --- Gruntfile.js | 145 ++++++++++++++++++++++++++++++++++++++++++--------- package.json | 4 +- 2 files changed, 124 insertions(+), 25 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 2ad6d900f42..1e6cc3b5657 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,16 +1,36 @@ module.exports = function( grunt ) { "use strict"; - var distpaths = [ - "dist/jquery.mobile.js", - "dist/jquery.mobile.min.map", - "dist/jquery.mobile.min.js" - ]; + var path = require( "path" ), + httpPort = Math.floor( 9000 + Math.random()*1000 ), + name = "jquery.mobile", + dist = "dist/", + distpaths = [ + dist + name + ".js", + dist + name + ".min.map", + dist + name + ".min.js" + ], + banner = { + normal: [ + "/*", + "* jQuery Mobile v<%= pkg.version %>", + "* http://jquerymobile.com", + "*", + "* Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors", + "* Released under the MIT license.", + "* http://jquery.org/license", + "*", + "*/", + "", + "" ].join( grunt.util.linefeed ), + minified: "/*! jQuery Mobile v<%= pkg.version %> | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */" + }; // grunt plugins grunt.loadNpmTasks( "grunt-contrib-jshint" ); grunt.loadNpmTasks( "grunt-contrib-uglify" ); grunt.loadNpmTasks( "grunt-contrib-concat" ); + grunt.loadNpmTasks( "grunt-contrib-connect" ); grunt.loadNpmTasks( "grunt-contrib-qunit" ); grunt.loadNpmTasks( "grunt-contrib-requirejs" ); grunt.loadNpmTasks( "grunt-css" ); @@ -18,6 +38,19 @@ module.exports = function( grunt ) { grunt.loadNpmTasks( "grunt-junit" ); + function resolveCSSImports( filePath ) { + var dir = path.dirname( filePath ), + content = grunt.file.read( filePath ).toString(), + files = []; + + content.replace(/@import\s+.*?['"]([^'"]+)/gim, function(match, location, a) { + grunt.log.debug( "importing: " + path.join( dir, location )); + files.push( path.resolve( path.join( dir, location )) ); + }); + + return files; + } + // Project configuration. grunt.config.init({ pkg: grunt.file.readJSON( "package.json" ), @@ -42,10 +75,10 @@ module.exports = function( grunt ) { }, requirejs: { - compile: { + js: { options: { baseUrl: "js", - dir: "dist", + optimize: "none", //Finds require() dependencies inside a require() or define call. @@ -62,7 +95,8 @@ module.exports = function( grunt ) { mainConfigFile: "js/requirejs.config.js", - name: "jquery.mobile", + name: name, + exclude: [ "jquery", "depend", @@ -70,6 +104,8 @@ module.exports = function( grunt ) { "text!../version.txt" ], + out: dist + name + ".js", + pragmasOnSave: { jqmBuildExclude: true }, @@ -81,22 +117,65 @@ module.exports = function( grunt ) { endFile: "build/wrap.end" }, - dirExclusionRegExp: /^\.|^build|^compiled|^tmp/ + onBuildWrite: function (moduleName, path, contents) { + //Always return a value. + //This is just a contrived example. + return contents.replace(/__version__/g, grunt.config.process( "\"<%= pkg.version %>\"" ) ); + } } } }, uglify: { all: { - files: { - "dist/jquery.mobile.min.js": [ "dist/jquery.mobile.js" ] - }, options: { - banner: "/*! jQuery Mobile v<%= pkg.version %> | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */", - sourceMap: "dist/jquery.mobile.min.map", + banner: banner.minified, + sourceMapRoot: "dist", + sourceMapPrefix: 1, + sourceMap: dist + name + ".min.map", beautify: { ascii_only: true } + }, + files: { + "dist/jquery.mobile.min.js": [ dist + name + ".js" ] + } + } + }, + + concat: { + options: { + banner: banner.normal + }, + css: { + files: { + "dist/jquery.mobile.structure.css": resolveCSSImports( "css/structure/jquery.mobile.structure.css" ), + "dist/jquery.mobile.theme.css": [ "css/themes/default/jquery.mobile.theme.css" ] + } + } + }, + + cssmin: { + options: { + banner: banner.minified + }, + structure: { + files: { + "dist/jquery.mobile.structure.min.css": [ "dist/jquery.mobile.structure.css" ] + } + }, + theme: { + files: { + "dist/jquery.mobile.theme.min.css": [ "dist/jquery.mobile.theme.css" ] + } + } + }, + + connect: { + server: { + options: { + port: httpPort, + base: '.' } } }, @@ -105,29 +184,47 @@ module.exports = function( grunt ) { options: { timeout: 10000 }, - all: [ - "tests/unit/**/*.html", - "!tests/unit/checkboxradio/form-result.html", + files: [ + "tests/unit/**/index.html", "!tests/unit/core/index.html", - "!tests/unit/dialog/dialog-no-hash.html", "!tests/unit/dialog/index.html", "!tests/unit/event/index.html", "!tests/unit/kitchensink/index.html", "!tests/unit/init/**", "!tests/unit/listview/cache-tests/*", - "!tests/unit/listview/push-state-disabled-tests.html", "!tests/unit/loader/**", "!tests/unit/navigation/**", - "!tests/unit/popup/back-two.html", - "!tests/unit/popup/other.html", - "!tests/unit/popup/popup-sequence-test-dialog.html", "!tests/unit/select/cached*" - ] + ], + http: { + options: { + urls: [ + "http://localhost:9001/tests/unit/core/index.html", + "http://localhost:9001/tests/unit/dialog/index.html", + "http://localhost:9001/tests/unit/event/index.html" +// "!tests/unit/kitchensink/index.html", +// "!tests/unit/init/**", +// "!tests/unit/listview/cache-tests/*", +// "!tests/unit/listview/push-state-disabled-tests.html", +// "!tests/unit/loader/**", +// "!tests/unit/navigation/**", +// "!tests/unit/popup/back-two.html", +// "!tests/unit/popup/other.html", +// "!tests/unit/popup/popup-sequence-test-dialog.html", +// "!tests/unit/select/cached*" + + ] + } + + } } }); + grunt.registerTask( "js", [ "requirejs", "uglify" ] ); + grunt.registerTask( "css", [ "concat", "cssmin" ] ); + // Default grunt - grunt.registerTask( "default", [ "requirejs", "uglify" ] ); + grunt.registerTask( "default", [ "js", "css" ] ); }; \ No newline at end of file diff --git a/package.json b/package.json index 21582d02959..3c5b4593f36 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,9 @@ "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", "grunt-contrib-requirejs": "0.3.4", "grunt-git-authors": "1.1.0-beta.1", - "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git" + "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git", + "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", + "grunt-css": "git://github.com/jzaefferer/grunt-css.git" }, "keywords": [] } From 23f0cc8d7688cefc80b5afb35f6b34177238f709 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 17:59:23 -0800 Subject: [PATCH 12/94] Get version from package.json instead of version.txt --- build/filter.js | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/build/filter.js b/build/filter.js index 0a3aef37c71..3b7a3914c95 100644 --- a/build/filter.js +++ b/build/filter.js @@ -4,6 +4,7 @@ var fs = require( 'fs' ), path = require( 'path' ), + pkg = require('./package.json' ), buildDir = __dirname, copyrightVersionRegExp = /@VERSION/g, apiVersionRegExp = /__version__/g, @@ -12,31 +13,22 @@ var fs = require( 'fs' ), copyrightMinFile = copyrightBaseName + ".min.txt"; module.exports = function ( contents, ext, callback ) { - fs.readFile( path.join( buildDir, "../version.txt" ), "utf8", - function( err, version ) { - var copyrightFile; + var version = pkg.version.trim(); + + if ( /^\.min/.test( ext ) ) { + copyrightFile = copyrightMinFile; + } else { + copyrightFile = copyrightRegFile; + } + fs.readFile( path.join( buildDir, copyrightFile ), "utf8", + function( err, copyright ) { if ( err ) { callback( err ); } else { - version = version.trim(); - - if ( /^\.min/.test( ext ) ) { - copyrightFile = copyrightMinFile; - } else { - copyrightFile = copyrightRegFile; - } - fs.readFile( path.join( buildDir, copyrightFile ), "utf8", - function( err, copyright ) { - if ( err ) { - callback( err ); - } else { - contents = copyright.replace( copyrightVersionRegExp, version ) + "\n" + contents; - contents = contents.replace( apiVersionRegExp, '"' + version + '"' ); + contents = copyright.replace( copyrightVersionRegExp, version ) + "\n" + contents; + contents = contents.replace( apiVersionRegExp, '"' + version + '"' ); - callback( null, contents ); - } - } - ) + callback( null, contents ); } } ) From 97bc0d43bd14f15c16fe73dabfdcff28cb48e389 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 18:44:29 -0800 Subject: [PATCH 13/94] Got rid of version.txt, versioning now happens in package.json --- Gruntfile.js | 6 ++---- js/jquery.mobile.core.js | 6 ++++-- version.txt | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 version.txt diff --git a/Gruntfile.js b/Gruntfile.js index 1e6cc3b5657..e71fc019e55 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -100,8 +100,8 @@ module.exports = function( grunt ) { exclude: [ "jquery", "depend", - "text", - "text!../version.txt" + "json", + "json!../package.json" ], out: dist + name + ".js", @@ -118,8 +118,6 @@ module.exports = function( grunt ) { }, onBuildWrite: function (moduleName, path, contents) { - //Always return a value. - //This is just a contrived example. return contents.replace(/__version__/g, grunt.config.process( "\"<%= pkg.version %>\"" ) ); } } diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index 3571594489b..d6632bd4b5b 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -5,10 +5,12 @@ //>>css.structure: ../css/structure/jquery.mobile.core.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "./jquery.mobile.ns", "text!../version.txt" ], function( $, __version__ ) { +define( [ "jquery", "./jquery.mobile.ns", "json!../package.json" ], function( $, ns, pkg ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { - +//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); + var __version__ = pkg.version; +//>>excludeEnd("jqmBuildExclude"); var nsNormalizeDict = {}; // jQuery.mobile configurable options diff --git a/version.txt b/version.txt deleted file mode 100644 index 4050a2c59a1..00000000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.3.0-beta.1 From 26dd721c991d03c3b72496ec82c3997acbc2ccd7 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 22:26:21 -0800 Subject: [PATCH 14/94] Moved old tasks to tasks.old --- build/{tasks => tasks.old}/clean.js | 0 build/{tasks => tasks.old}/config.js | 0 build/{tasks => tasks.old}/css.js | 0 build/{tasks => tasks.old}/custom_init.js | 0 build/{tasks => tasks.old}/js.js | 0 build/{tasks => tasks.old}/legacy.js | 0 build/{tasks => tasks.old}/testswarm.js | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename build/{tasks => tasks.old}/clean.js (100%) rename build/{tasks => tasks.old}/config.js (100%) rename build/{tasks => tasks.old}/css.js (100%) rename build/{tasks => tasks.old}/custom_init.js (100%) rename build/{tasks => tasks.old}/js.js (100%) rename build/{tasks => tasks.old}/legacy.js (100%) rename build/{tasks => tasks.old}/testswarm.js (100%) diff --git a/build/tasks/clean.js b/build/tasks.old/clean.js similarity index 100% rename from build/tasks/clean.js rename to build/tasks.old/clean.js diff --git a/build/tasks/config.js b/build/tasks.old/config.js similarity index 100% rename from build/tasks/config.js rename to build/tasks.old/config.js diff --git a/build/tasks/css.js b/build/tasks.old/css.js similarity index 100% rename from build/tasks/css.js rename to build/tasks.old/css.js diff --git a/build/tasks/custom_init.js b/build/tasks.old/custom_init.js similarity index 100% rename from build/tasks/custom_init.js rename to build/tasks.old/custom_init.js diff --git a/build/tasks/js.js b/build/tasks.old/js.js similarity index 100% rename from build/tasks/js.js rename to build/tasks.old/js.js diff --git a/build/tasks/legacy.js b/build/tasks.old/legacy.js similarity index 100% rename from build/tasks/legacy.js rename to build/tasks.old/legacy.js diff --git a/build/tasks/testswarm.js b/build/tasks.old/testswarm.js similarity index 100% rename from build/tasks/testswarm.js rename to build/tasks.old/testswarm.js From 79e608976540092cb5f9adc397aeaa20a8b726c5 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 22:26:43 -0800 Subject: [PATCH 15/94] Created grunt task cssbuild --- build/tasks/cssbuild.js | 61 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 build/tasks/cssbuild.js diff --git a/build/tasks/cssbuild.js b/build/tasks/cssbuild.js new file mode 100644 index 00000000000..9432c129180 --- /dev/null +++ b/build/tasks/cssbuild.js @@ -0,0 +1,61 @@ +module.exports = function( grunt ) { + var requirejs = require( 'requirejs' ), + async = require( 'async' ); + + requirejs.define('node/print', [], function() { + return function print(msg) { + if (msg.substring(0, 5) === 'Error') { + grunt.log.errorlns(msg); + grunt.fail.warn('RequireJS failed.'); + } else { + grunt.log.oklns(msg); + } + }; + }); + + function expandFiles( files ) { + return grunt.util._.pluck( grunt.file.expandMapping( files ), "src" ); + } + + grunt.registerMultiTask( 'cssbuild', 'Resolve CSS @imports and concat files', function() { + var done = this.async(), + options = this.options({ + banner: '' + }); + + async.forEach( this.files, + function( file, callback ) { + var src = file.src[0], + dest = file.dest; + + grunt.log.debug( "Building '" + src + "' -> '" + dest + "'" ); + + async.series([ + function( next ) { + // pull the includes together using require js + requirejs.optimize({ + baseUrl: '.', + + optimizeCss: 'standard.keepComments.keepLines', + + cssIn: src, + + out: dest + }, function( response ) { + next(); + }); + }, + function( next ) { + var contents = grunt.file.read( dest ); + if ( options.banner ) { + contents = options.banner + contents; + } + grunt.file.write( dest, contents ); + grunt.log.writeln( "File '" + dest + "' written." ); + next(); + } + ], callback ); + }, done + ); + }); +}; \ No newline at end of file From eff01efe8bee6d274f3b59efb1058c6580a4a0a3 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 22:27:06 -0800 Subject: [PATCH 16/94] Added devDependency on async --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c5b4593f36..6eb3f18d7e5 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,9 @@ "grunt-git-authors": "1.1.0-beta.1", "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git", "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", - "grunt-css": "git://github.com/jzaefferer/grunt-css.git" + "grunt-css": "git://github.com/jzaefferer/grunt-css.git", + "requirejs": "2.1.x", + "async": "0.1.x" }, "keywords": [] } From 1166c430d7013262c63a64800cc96456f03ca65d Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 22:27:55 -0800 Subject: [PATCH 17/94] Use newly added cssbuild task to consolidate CSS files --- Gruntfile.js | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index e71fc019e55..4eef5363c21 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -22,6 +22,7 @@ module.exports = function( grunt ) { "*", "*/", "", + "", "" ].join( grunt.util.linefeed ), minified: "/*! jQuery Mobile v<%= pkg.version %> | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */" }; @@ -37,19 +38,8 @@ module.exports = function( grunt ) { grunt.loadNpmTasks( "grunt-git-authors" ); grunt.loadNpmTasks( "grunt-junit" ); - - function resolveCSSImports( filePath ) { - var dir = path.dirname( filePath ), - content = grunt.file.read( filePath ).toString(), - files = []; - - content.replace(/@import\s+.*?['"]([^'"]+)/gim, function(match, location, a) { - grunt.log.debug( "importing: " + path.join( dir, location )); - files.push( path.resolve( path.join( dir, location )) ); - }); - - return files; - } + // load the project's default tasks + grunt.loadTasks( 'build/tasks'); // Project configuration. grunt.config.init({ @@ -141,14 +131,15 @@ module.exports = function( grunt ) { } }, - concat: { + cssbuild: { options: { banner: banner.normal }, - css: { + all: { files: { - "dist/jquery.mobile.structure.css": resolveCSSImports( "css/structure/jquery.mobile.structure.css" ), - "dist/jquery.mobile.theme.css": [ "css/themes/default/jquery.mobile.theme.css" ] + "dist/jquery.mobile.structure.css": "css/structure/jquery.mobile.structure.css", + "dist/jquery.mobile.theme.css": "css/themes/default/jquery.mobile.theme.css", + "dist/jquery.mobile.css": "css/themes/default/jquery.mobile.css" } } }, @@ -166,6 +157,11 @@ module.exports = function( grunt ) { files: { "dist/jquery.mobile.theme.min.css": [ "dist/jquery.mobile.theme.css" ] } + }, + bundle: { + files: { + "dist/jquery.mobile.min.css": [ "dist/jquery.mobile.css" ] + } } }, @@ -220,7 +216,7 @@ module.exports = function( grunt ) { }); grunt.registerTask( "js", [ "requirejs", "uglify" ] ); - grunt.registerTask( "css", [ "concat", "cssmin" ] ); + grunt.registerTask( "css", [ "cssbuild", "cssmin" ] ); // Default grunt grunt.registerTask( "default", [ "js", "css" ] ); From 8ffd36599d437eedd9a208eb2ff67751cd289937 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 23:04:49 -0800 Subject: [PATCH 18/94] Added option passing to RequireJS --- build/tasks/cssbuild.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/build/tasks/cssbuild.js b/build/tasks/cssbuild.js index 9432c129180..8013566f520 100644 --- a/build/tasks/cssbuild.js +++ b/build/tasks/cssbuild.js @@ -19,9 +19,13 @@ module.exports = function( grunt ) { grunt.registerMultiTask( 'cssbuild', 'Resolve CSS @imports and concat files', function() { var done = this.async(), - options = this.options({ + _ = grunt.util._, + options = _.clone( this.options({ banner: '' - }); + })), + banner = options.banner; + + delete options.banner; async.forEach( this.files, function( file, callback ) { @@ -33,22 +37,19 @@ module.exports = function( grunt ) { async.series([ function( next ) { // pull the includes together using require js - requirejs.optimize({ - baseUrl: '.', - - optimizeCss: 'standard.keepComments.keepLines', - - cssIn: src, - - out: dest - }, function( response ) { + requirejs.optimize( + _.extend({ + cssIn: src, + out: dest + }, options + ), function( response ) { next(); }); }, function( next ) { var contents = grunt.file.read( dest ); - if ( options.banner ) { - contents = options.banner + contents; + if ( banner ) { + contents = banner + contents; } grunt.file.write( dest, contents ); grunt.log.writeln( "File '" + dest + "' written." ); From 6f0fa59df76951104ac5382200af9939de1b246f Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 23:05:19 -0800 Subject: [PATCH 19/94] Pass the right options to cssbuild --- Gruntfile.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 4eef5363c21..9596941394a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -133,7 +133,25 @@ module.exports = function( grunt ) { cssbuild: { options: { - banner: banner.normal + banner: banner.normal, + + //Allow CSS optimizations. Allowed values: + //- "standard": @import inlining, comment removal and line returns. + //Removing line returns may have problems in IE, depending on the type + //of CSS. + //- "standard.keepLines": like "standard" but keeps line returns. + //- "none": skip CSS optimizations. + //- "standard.keepComments": keeps the file comments, but removes line + //returns. (r.js 1.0.8+) + //- "standard.keepComments.keepLines": keeps the file comments and line + //returns. (r.js 1.0.8+) + optimizeCss: "standard.keepComments.keepLines", + + //If optimizeCss is in use, a list of of files to ignore for the @import + //inlining. The value of this option should be a string of comma separated + //CSS file names to ignore (like 'a.css,b.css'. The file names should match + //whatever strings are used in the @import calls. + cssImportIgnore: null, }, all: { files: { From 6a1d8a45b545e407b5d29d8edf4955c3c3906436 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 23:14:52 -0800 Subject: [PATCH 20/94] Use grunt.util.async instead of our own async --- build/tasks/cssbuild.js | 2 +- package.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/tasks/cssbuild.js b/build/tasks/cssbuild.js index 8013566f520..d41bda4a6d7 100644 --- a/build/tasks/cssbuild.js +++ b/build/tasks/cssbuild.js @@ -1,6 +1,6 @@ module.exports = function( grunt ) { var requirejs = require( 'requirejs' ), - async = require( 'async' ); + async = grunt.util.async; requirejs.define('node/print', [], function() { return function print(msg) { diff --git a/package.json b/package.json index 6eb3f18d7e5..c4cf52f25b3 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,7 @@ "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git", "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", "grunt-css": "git://github.com/jzaefferer/grunt-css.git", - "requirejs": "2.1.x", - "async": "0.1.x" + "requirejs": "2.1.x" }, "keywords": [] } From f5a592037fd847380a863c233f80d2ee12d9e1ff Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 23:52:58 -0800 Subject: [PATCH 21/94] Added task config:dev which generates the version string from the current git SHA1 hash --- build/tasks/config.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 build/tasks/config.js diff --git a/build/tasks/config.js b/build/tasks/config.js new file mode 100644 index 00000000000..e7db7676dd6 --- /dev/null +++ b/build/tasks/config.js @@ -0,0 +1,22 @@ +var fs = require( 'fs' ), + path = require( 'path' ), + child_process = require( 'child_process' ), + glob = require( 'glob-whatev' ); + +module.exports = function( grunt ) { + grunt.registerTask( 'config:dev', 'Retrieve git hashes for output headers', function() { + var done = this.async(); + + grunt.util.spawn( + { + cmd: "git", + args: [ "log", "-1", "--format=format:Git Build: SHA1: %H <> Date: %cd" ], + fallback: grunt.config.process( "\"<%= pkg.version %>\"" ) + }, + function(error, result, code) { + grunt.config.set( "version", result ); + done(); + } + ); + }); +}; \ No newline at end of file From fc3e280af36ca61f3c4ffc94c6ebe2891ab3dade Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 25 Jan 2013 23:54:15 -0800 Subject: [PATCH 22/94] Default version string to package version Added prepending of long copyright to unminified javascript bundle --- Gruntfile.js | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9596941394a..e0f3670a165 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -13,7 +13,7 @@ module.exports = function( grunt ) { banner = { normal: [ "/*", - "* jQuery Mobile v<%= pkg.version %>", + "* jQuery Mobile <%= version %>", "* http://jquerymobile.com", "*", "* Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors", @@ -24,7 +24,7 @@ module.exports = function( grunt ) { "", "", "" ].join( grunt.util.linefeed ), - minified: "/*! jQuery Mobile v<%= pkg.version %> | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */" + minified: "/*! jQuery Mobile <%= version %> | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */" }; // grunt plugins @@ -45,6 +45,8 @@ module.exports = function( grunt ) { grunt.config.init({ pkg: grunt.file.readJSON( "package.json" ), + version: "v<%= pkg.version %>", + jshint: { js: { options: { @@ -104,16 +106,26 @@ module.exports = function( grunt ) { //line build, the current directory. wrap: { startFile: "build/wrap.start", - endFile: "build/wrap.end" + endFile: "build/wrap.end" }, onBuildWrite: function (moduleName, path, contents) { - return contents.replace(/__version__/g, grunt.config.process( "\"<%= pkg.version %>\"" ) ); + return contents.replace(/__version__/g, grunt.config.process( "\"<%= version %>\"" ) ); } } } }, + concat: { + options: { + banner: banner.normal + }, + js: { + src: [ dist + name + ".js" ], + dest: dist + name + ".js" + } + }, + uglify: { all: { options: { @@ -233,10 +245,13 @@ module.exports = function( grunt ) { }); - grunt.registerTask( "js", [ "requirejs", "uglify" ] ); + grunt.registerTask( "js", [ "requirejs", "concat:js", "uglify" ] ); grunt.registerTask( "css", [ "cssbuild", "cssmin" ] ); + grunt.registerTask( "dist", [ "config:dev", "js", "css" ] ); + grunt.registerTask( "dist:release", [ "js", "css" ] ); + // Default grunt - grunt.registerTask( "default", [ "js", "css" ] ); + grunt.registerTask( "default", [ "dist" ] ); }; \ No newline at end of file From 043c049d943111e44065ddd5c9e4bad06dac5951 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sat, 26 Jan 2013 00:00:29 -0800 Subject: [PATCH 23/94] Reformatted --- package.json | 74 ++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index c4cf52f25b3..d5263de3f12 100644 --- a/package.json +++ b/package.json @@ -1,39 +1,39 @@ { - "name": "jquery-mobile", - "title": "jQuery Mobile", - "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0pre", - "homepage": "http://jquerymobile.com", - "author": { - "name": "jQuery Foundation Inc. and other contributors", - "url": "https://github.com/jquery/jquery-mobile/blob/master/AUTHORS.txt" - }, - "repository": { - "type": "git", - "url": "https://github.com/jquery/jquery-mobile.git" - }, - "bugs": "https://github.com/jquery/jquery-mobile/issues", - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/jquery/jquery-mobile/blob/master/MIT-LICENSE.txt" - } - ], - "scripts": { - "test": "./node_modules/.bin/grunt" - }, - "dependencies": {}, - "devDependencies": { - "grunt": "0.4.x", - "grunt-contrib-jshint": "0.1.x", - "grunt-contrib-uglify": "0.1.1rc5", - "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", - "grunt-contrib-requirejs": "0.3.4", - "grunt-git-authors": "1.1.0-beta.1", - "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git", - "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", - "grunt-css": "git://github.com/jzaefferer/grunt-css.git", - "requirejs": "2.1.x" - }, - "keywords": [] + "name": "jquery-mobile", + "title": "jQuery Mobile", + "description": "Touch-Optimized Web Framework for Smartphones & Tablets", + "version": "1.4.0pre", + "homepage": "http://jquerymobile.com", + "author": { + "name": "jQuery Foundation Inc. and other contributors", + "url": "https://github.com/jquery/jquery-mobile/blob/master/AUTHORS.txt" + }, + "repository": { + "type": "git", + "url": "https://github.com/jquery/jquery-mobile.git" + }, + "bugs": "https://github.com/jquery/jquery-mobile/issues", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/jquery/jquery-mobile/blob/master/MIT-LICENSE.txt" + } + ], + "scripts": { + "test": "./node_modules/.bin/grunt" + }, + "dependencies": {}, + "devDependencies": { + "grunt": "0.4.x", + "grunt-contrib-jshint": "0.1.x", + "grunt-contrib-uglify": "0.1.1rc5", + "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", + "grunt-contrib-requirejs": "0.3.4", + "grunt-git-authors": "1.1.0-beta.1", + "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git", + "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", + "grunt-css": "git://github.com/jzaefferer/grunt-css.git", + "requirejs": "2.1.x" + }, + "keywords": [] } From 51b7bd3903c310f73c201d82aacf6d15cc953429 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sat, 26 Jan 2013 00:01:10 -0800 Subject: [PATCH 24/94] Added main, engines and scripts --- package.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package.json b/package.json index d5263de3f12..b3b7a8d7ca5 100644 --- a/package.json +++ b/package.json @@ -35,5 +35,12 @@ "grunt-css": "git://github.com/jzaefferer/grunt-css.git", "requirejs": "2.1.x" }, + "main": "Gruntfile.js", + "engines": { + "node": ">= 0.8.0" + }, + "scripts": { + "test": "grunt test" + }, "keywords": [] } From bd5247eaab041d53307eea55b580cd7c6577310c Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sat, 26 Jan 2013 00:10:21 -0800 Subject: [PATCH 25/94] Added Travis CI config --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..5e16f13eb89 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: node_js +node_js: + - 0.8 +before_script: + - npm install -g grunt-cli +branches: + only: + - grunt-0.4 From b50d4873d0dbdb25c52e386610fc5556a9f64d38 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sat, 26 Jan 2013 00:10:21 -0800 Subject: [PATCH 26/94] Added Travis CI config (cherry picked from commit bd5247eaab041d53307eea55b580cd7c6577310c) --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..5e16f13eb89 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: node_js +node_js: + - 0.8 +before_script: + - npm install -g grunt-cli +branches: + only: + - grunt-0.4 From e2d7bb31a13a556b43b8030a83c7838aaa7dd483 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sat, 26 Jan 2013 21:06:38 -0800 Subject: [PATCH 27/94] Set up test target --- Gruntfile.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index e0f3670a165..3eb16dcabd3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -218,14 +218,16 @@ module.exports = function( grunt ) { "!tests/unit/listview/cache-tests/*", "!tests/unit/loader/**", "!tests/unit/navigation/**", - "!tests/unit/select/cached*" + "!tests/unit/select/cached*", + "!tests/unit/support/index.html" ], http: { options: { urls: [ - "http://localhost:9001/tests/unit/core/index.html", - "http://localhost:9001/tests/unit/dialog/index.html", - "http://localhost:9001/tests/unit/event/index.html" +// "http://localhost:<%= connect.server.options.port %>/tests/unit/core/index.html", + "http://localhost:<%= connect.server.options.port %>/tests/unit/dialog/index.html", + "http://localhost:<%= connect.server.options.port %>/tests/unit/event/index.html", + "http://localhost:<%= connect.server.options.port %>/tests/unit/support/index.html" // "!tests/unit/kitchensink/index.html", // "!tests/unit/init/**", // "!tests/unit/listview/cache-tests/*", @@ -251,6 +253,8 @@ module.exports = function( grunt ) { grunt.registerTask( "dist", [ "config:dev", "js", "css" ] ); grunt.registerTask( "dist:release", [ "js", "css" ] ); + grunt.registerTask( "test", [ "qunit:files", "connect", "qunit:http" ] ); + // Default grunt grunt.registerTask( "default", [ "dist" ] ); From 6edfb636a7606e40c772b6763a02be7fb22580ef Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sun, 27 Jan 2013 11:31:27 -0800 Subject: [PATCH 28/94] Use path.join for path concatenation Added :release tasks --- Gruntfile.js | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 3eb16dcabd3..b783e5b33a2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,11 +4,11 @@ module.exports = function( grunt ) { var path = require( "path" ), httpPort = Math.floor( 9000 + Math.random()*1000 ), name = "jquery.mobile", - dist = "dist/", + dist = "dist", distpaths = [ - dist + name + ".js", - dist + name + ".min.map", - dist + name + ".min.js" + path.join( dist, name ) + ".js", + path.join( dist, name ) + ".min.map", + path.join( dist, name ) + ".min.js" ], banner = { normal: [ @@ -96,7 +96,7 @@ module.exports = function( grunt ) { "json!../package.json" ], - out: dist + name + ".js", + out: path.join( dist, name ) + ".js", pragmasOnSave: { jqmBuildExclude: true @@ -121,8 +121,8 @@ module.exports = function( grunt ) { banner: banner.normal }, js: { - src: [ dist + name + ".js" ], - dest: dist + name + ".js" + src: [ path.join( dist, name ) + ".js" ], + dest: path.join( dist, name ) + ".js" } }, @@ -130,15 +130,15 @@ module.exports = function( grunt ) { all: { options: { banner: banner.minified, - sourceMapRoot: "dist", + sourceMapRoot: dist, sourceMapPrefix: 1, - sourceMap: dist + name + ".min.map", + sourceMap: path.join( dist, name ) + ".min.map", beautify: { ascii_only: true } }, files: { - "dist/jquery.mobile.min.js": [ dist + name + ".js" ] + "dist/jquery.mobile.min.js": [ path.join( dist, name ) + ".js" ] } } }, @@ -180,17 +180,17 @@ module.exports = function( grunt ) { }, structure: { files: { - "dist/jquery.mobile.structure.min.css": [ "dist/jquery.mobile.structure.css" ] + "dist/jquery.mobile.structure.min.css": "dist/jquery.mobile.structure.css" } }, theme: { files: { - "dist/jquery.mobile.theme.min.css": [ "dist/jquery.mobile.theme.css" ] + "dist/jquery.mobile.theme.min.css": "dist/jquery.mobile.theme.css" } }, bundle: { files: { - "dist/jquery.mobile.min.css": [ "dist/jquery.mobile.css" ] + "dist/jquery.mobile.min.css": "dist/jquery.mobile.css" } } }, @@ -247,11 +247,13 @@ module.exports = function( grunt ) { }); - grunt.registerTask( "js", [ "requirejs", "concat:js", "uglify" ] ); - grunt.registerTask( "css", [ "cssbuild", "cssmin" ] ); + grunt.registerTask( "js", [ "config:dev", "requirejs", "concat:js", "uglify" ] ); + grunt.registerTask( "js:release", [ "config:dev", "requirejs", "concat:js", "uglify" ] ); + grunt.registerTask( "css", [ "config:dev", "cssbuild", "cssmin" ] ); + grunt.registerTask( "css:release", [ "cssbuild", "cssmin" ] ); - grunt.registerTask( "dist", [ "config:dev", "js", "css" ] ); - grunt.registerTask( "dist:release", [ "js", "css" ] ); + grunt.registerTask( "dist", [ "js", "css" ] ); + grunt.registerTask( "dist:release", [ "js:release", "css:release" ] ); grunt.registerTask( "test", [ "qunit:files", "connect", "qunit:http" ] ); From 79a7446c8b2918154009d2932ed1f97517272051 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sun, 27 Jan 2013 15:40:22 -0800 Subject: [PATCH 29/94] Added zip target --- Gruntfile.js | 15 +++++++++++++++ package.json | 1 + 2 files changed, 16 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index b783e5b33a2..3af03b3aa43 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -37,6 +37,7 @@ module.exports = function( grunt ) { grunt.loadNpmTasks( "grunt-css" ); grunt.loadNpmTasks( "grunt-git-authors" ); grunt.loadNpmTasks( "grunt-junit" ); + grunt.loadNpmTasks( "grunt-zip" ); // load the project's default tasks grunt.loadTasks( 'build/tasks'); @@ -195,6 +196,20 @@ module.exports = function( grunt ) { } }, + zip: { + dist: { + options: { + baseDir: dist + }, + + // Files to zip together + src: [ dist + "/*.js", dist + "/*.css" ], + + // Destination of zip file + dest: path.join( dist, name ) + ".zip" + } + }, + connect: { server: { options: { diff --git a/package.json b/package.json index b3b7a8d7ca5..d7189eff611 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git", "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", "grunt-css": "git://github.com/jzaefferer/grunt-css.git", + "grunt-zip": "git://github.com/gseguin/grunt-zip.git", "requirejs": "2.1.x" }, "main": "Gruntfile.js", From 959462ab1195d0d76c6b1a81e7f709ba6abb16d9 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sun, 27 Jan 2013 15:43:10 -0800 Subject: [PATCH 30/94] Specified branch for grunt-zip dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d7189eff611..ddafd44af7f 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git", "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", "grunt-css": "git://github.com/jzaefferer/grunt-css.git", - "grunt-zip": "git://github.com/gseguin/grunt-zip.git", + "grunt-zip": "git://github.com/gseguin/grunt-zip.git#grunt-0.4", "requirejs": "2.1.x" }, "main": "Gruntfile.js", From 280181311499226f699d32ab57be1a0cf0e89154 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Mon, 28 Jan 2013 07:58:19 -0700 Subject: [PATCH 31/94] Sorted devDependencies --- package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ddafd44af7f..ff5d8057410 100644 --- a/package.json +++ b/package.json @@ -25,14 +25,15 @@ "dependencies": {}, "devDependencies": { "grunt": "0.4.x", - "grunt-contrib-jshint": "0.1.x", - "grunt-contrib-uglify": "0.1.1rc5", "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", - "grunt-contrib-requirejs": "0.3.4", - "grunt-git-authors": "1.1.0-beta.1", - "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git", "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", + "grunt-contrib-copy": "git://github.com/gruntjs/grunt-contrib-copy.git", + "grunt-contrib-jshint": "0.1.x", + "grunt-contrib-qunit": "git://github.com/gruntjs/grunt-contrib-qunit.git", + "grunt-contrib-requirejs": "0.3.4", + "grunt-contrib-uglify": "0.1.1rc5", "grunt-css": "git://github.com/jzaefferer/grunt-css.git", + "grunt-git-authors": "1.1.0-beta.1", "grunt-zip": "git://github.com/gseguin/grunt-zip.git#grunt-0.4", "requirejs": "2.1.x" }, From d26ab7f0258f54f0c6cb27fd52391ae7ce9cc22b Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Mon, 28 Jan 2013 07:58:57 -0700 Subject: [PATCH 32/94] Added dist:common and copy:images Some house cleaning --- Gruntfile.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 3af03b3aa43..bc980a38581 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -29,11 +29,12 @@ module.exports = function( grunt ) { // grunt plugins grunt.loadNpmTasks( "grunt-contrib-jshint" ); - grunt.loadNpmTasks( "grunt-contrib-uglify" ); + grunt.loadNpmTasks( "grunt-contrib-copy" ); grunt.loadNpmTasks( "grunt-contrib-concat" ); grunt.loadNpmTasks( "grunt-contrib-connect" ); grunt.loadNpmTasks( "grunt-contrib-qunit" ); grunt.loadNpmTasks( "grunt-contrib-requirejs" ); + grunt.loadNpmTasks( "grunt-contrib-uglify" ); grunt.loadNpmTasks( "grunt-css" ); grunt.loadNpmTasks( "grunt-git-authors" ); grunt.loadNpmTasks( "grunt-junit" ); @@ -196,14 +197,23 @@ module.exports = function( grunt ) { } }, + copy: { + images: { + src: "css/themes/default/images", + dest: path.join( dist, "images" ), + } + }, + zip: { dist: { options: { baseDir: dist }, - // Files to zip together - src: [ dist + "/*.js", dist + "/*.css" ], + src: [ + path.join( dist, "**" ), + "!<%= zip.dist.dest %>" + ], // Destination of zip file dest: path.join( dist, name ) + ".zip" @@ -267,8 +277,10 @@ module.exports = function( grunt ) { grunt.registerTask( "css", [ "config:dev", "cssbuild", "cssmin" ] ); grunt.registerTask( "css:release", [ "cssbuild", "cssmin" ] ); - grunt.registerTask( "dist", [ "js", "css" ] ); - grunt.registerTask( "dist:release", [ "js:release", "css:release" ] ); + grunt.registerTask( "dist:common", [ "copy:images", "zip:dist" ] ); + + grunt.registerTask( "dist", [ "js", "css", "dist:common" ] ); + grunt.registerTask( "dist:release", [ "js:release", "css:release", "dist:common" ] ); grunt.registerTask( "test", [ "qunit:files", "connect", "qunit:http" ] ); From 30a02159b06dd9c3fba5e0d5cdef04bdecd2cd33 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Mon, 28 Jan 2013 07:59:33 -0700 Subject: [PATCH 33/94] Fixed sourceMap's path to unminified --- Gruntfile.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index bc980a38581..e111353c2b5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -131,8 +131,8 @@ module.exports = function( grunt ) { uglify: { all: { options: { + cwd: dist, banner: banner.minified, - sourceMapRoot: dist, sourceMapPrefix: 1, sourceMap: path.join( dist, name ) + ".min.map", beautify: { @@ -140,7 +140,8 @@ module.exports = function( grunt ) { } }, files: { - "dist/jquery.mobile.min.js": [ path.join( dist, name ) + ".js" ] + src: path.join( dist, name ) + ".js", + dest: path.join( dist, name ) + "min.js" } } }, From 531569e85f45e7afe18c8e6ec0c29a8debdd3cdd Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Mon, 28 Jan 2013 16:23:01 -0700 Subject: [PATCH 34/94] Fixed uglify config --- Gruntfile.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index e111353c2b5..4ad06137de5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -140,8 +140,7 @@ module.exports = function( grunt ) { } }, files: { - src: path.join( dist, name ) + ".js", - dest: path.join( dist, name ) + "min.js" + "dist/jquery.mobile.min.js": path.join( dist, name ) + ".js", } } }, From 9851584212cc43a9e0ee68ec92248f50f6770653 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 30 Jan 2013 13:52:49 -0700 Subject: [PATCH 35/94] Cleaned up --- build/tasks/config.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build/tasks/config.js b/build/tasks/config.js index e7db7676dd6..42e8aac17b3 100644 --- a/build/tasks/config.js +++ b/build/tasks/config.js @@ -1,9 +1,5 @@ -var fs = require( 'fs' ), - path = require( 'path' ), - child_process = require( 'child_process' ), - glob = require( 'glob-whatev' ); - module.exports = function( grunt ) { + "use strict"; grunt.registerTask( 'config:dev', 'Retrieve git hashes for output headers', function() { var done = this.async(); From f5b9cf687114c94cb2a1582eb51af386f825c1d3 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 30 Jan 2013 13:53:57 -0700 Subject: [PATCH 36/94] Added dependency on grunt-qunit-junit Added target test:ci --- Gruntfile.js | 37 +++++++++++++++++++++++-------------- package.json | 5 ++++- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 4ad06137de5..ad7d17c89a6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -37,7 +37,7 @@ module.exports = function( grunt ) { grunt.loadNpmTasks( "grunt-contrib-uglify" ); grunt.loadNpmTasks( "grunt-css" ); grunt.loadNpmTasks( "grunt-git-authors" ); - grunt.loadNpmTasks( "grunt-junit" ); + grunt.loadNpmTasks( "grunt-qunit-junit" ); grunt.loadNpmTasks( "grunt-zip" ); // load the project's default tasks @@ -229,23 +229,31 @@ module.exports = function( grunt ) { } }, + qunit_junit: { + options: { + dest: "build/test-results" + } + }, + qunit: { options: { timeout: 10000 }, - files: [ - "tests/unit/**/index.html", - "!tests/unit/core/index.html", - "!tests/unit/dialog/index.html", - "!tests/unit/event/index.html", - "!tests/unit/kitchensink/index.html", - "!tests/unit/init/**", - "!tests/unit/listview/cache-tests/*", - "!tests/unit/loader/**", - "!tests/unit/navigation/**", - "!tests/unit/select/cached*", - "!tests/unit/support/index.html" - ], + files: { + src: [ + "tests/unit/**/index.html", + "!tests/unit/core/index.html", + "!tests/unit/dialog/index.html", + "!tests/unit/event/index.html", + "!tests/unit/kitchensink/index.html", + "!tests/unit/init/**", + "!tests/unit/listview/cache-tests/*", + "!tests/unit/loader/**", + "!tests/unit/navigation/**", + "!tests/unit/select/cached*", + "!tests/unit/support/index.html" + ] + }, http: { options: { urls: [ @@ -283,6 +291,7 @@ module.exports = function( grunt ) { grunt.registerTask( "dist:release", [ "js:release", "css:release", "dist:common" ] ); grunt.registerTask( "test", [ "qunit:files", "connect", "qunit:http" ] ); + grunt.registerTask( "test:ci", [ "qunit_junit", "qunit:files", "connect", "qunit:http" ] ); // Default grunt grunt.registerTask( "default", [ "dist" ] ); diff --git a/package.json b/package.json index ff5d8057410..ce1a4faea3b 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,9 @@ "scripts": { "test": "./node_modules/.bin/grunt" }, - "dependencies": {}, + "dependencies": { + "jquery": ">=1.7.3" + }, "devDependencies": { "grunt": "0.4.x", "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", @@ -34,6 +36,7 @@ "grunt-contrib-uglify": "0.1.1rc5", "grunt-css": "git://github.com/jzaefferer/grunt-css.git", "grunt-git-authors": "1.1.0-beta.1", + "grunt-qunit-junit": "latest", "grunt-zip": "git://github.com/gseguin/grunt-zip.git#grunt-0.4", "requirejs": "2.1.x" }, From 2ed2dd6f46ac9512458dfd357bf1cefd9243b4fd Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 30 Jan 2013 15:34:07 -0700 Subject: [PATCH 37/94] Added injection of requirejs config --- tests/unit/navigation/event/index.html | 1 + tests/unit/navigation/method/index.html | 1 + tests/unit/navigation/multipage/index.html | 1 + tests/unit/navigation/sequence/index.html | 1 + 4 files changed, 4 insertions(+) diff --git a/tests/unit/navigation/event/index.html b/tests/unit/navigation/event/index.html index ce3e1ecb58a..dabfb7b4ce7 100644 --- a/tests/unit/navigation/event/index.html +++ b/tests/unit/navigation/event/index.html @@ -5,6 +5,7 @@ jQuery Mobile Navigate Events Test Suite + diff --git a/tests/unit/navigation/method/index.html b/tests/unit/navigation/method/index.html index e13d38cda68..7a25e25e2d4 100644 --- a/tests/unit/navigation/method/index.html +++ b/tests/unit/navigation/method/index.html @@ -5,6 +5,7 @@ jQuery Mobile Navigate Method Test Suite + diff --git a/tests/unit/navigation/multipage/index.html b/tests/unit/navigation/multipage/index.html index f60c573203e..c0883328af8 100644 --- a/tests/unit/navigation/multipage/index.html +++ b/tests/unit/navigation/multipage/index.html @@ -5,6 +5,7 @@ jQuery Mobile Multipage Test Suite + + - - - - + + From 398b863d73e48ea0df22ec2f32b35bb9b0f1e8c0 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 30 Jan 2013 17:09:35 -0700 Subject: [PATCH 40/94] Added injection of requirejs.config.js --- tests/unit/navigation/sequence/sequence-redirect.html | 1 + tests/unit/select/cached-tests.html | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/unit/navigation/sequence/sequence-redirect.html b/tests/unit/navigation/sequence/sequence-redirect.html index ba15b2a9632..7f8e4e8ff85 100644 --- a/tests/unit/navigation/sequence/sequence-redirect.html +++ b/tests/unit/navigation/sequence/sequence-redirect.html @@ -5,6 +5,7 @@ jQuery Mobile Sequence Test Suite + + From b4ebce1577785e4f496dbe3b1b5a4fc6b79bf9e4 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 30 Jan 2013 17:43:34 -0700 Subject: [PATCH 41/94] Default version to "dev" if no pkg is available --- js/jquery.mobile.core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index d6632bd4b5b..a36405f3c6e 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -9,7 +9,7 @@ define( [ "jquery", "./jquery.mobile.ns", "json!../package.json" ], function( $, //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); - var __version__ = pkg.version; + var __version__ = ( pkg && pkg.version ) || "dev"; //>>excludeEnd("jqmBuildExclude"); var nsNormalizeDict = {}; From df8f76f9aef803f06d75f53cac41f86c2deb9ac6 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 30 Jan 2013 17:46:39 -0700 Subject: [PATCH 42/94] Added middleware to connect to get rid of the PHP dependency. The test target has now a dependency on requirejs:js. The middleware will intercept requests for /js/ and redirect to the built bundle dist/jquery.mobile.js. Also we get the validation of the build for free. Added file lookup to qunit target as well as jquery version selector through --jquery argument at the command line --- Gruntfile.js | 85 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index ad7d17c89a6..0030cce8096 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -224,7 +224,25 @@ module.exports = function( grunt ) { server: { options: { port: httpPort, - base: '.' + base: '.', + middleware: function(connect, options) { + return [ + function(req, res, next){ + var bundle = grunt.config.process( "<%= requirejs.js.options.out %>" ); + if (req.url === "/js/") { + grunt.log.debug( req.url + " requested, serving: " + bundle ); + res.end( grunt.file.read( bundle ) ); + } else { + next(); + } + }, + + // Serve static files. + connect.static(options.base), + // Make empty directories browsable. + connect.directory(options.base) + ]; + } } } }, @@ -239,42 +257,37 @@ module.exports = function( grunt ) { options: { timeout: 10000 }, - files: { - src: [ - "tests/unit/**/index.html", - "!tests/unit/core/index.html", - "!tests/unit/dialog/index.html", - "!tests/unit/event/index.html", - "!tests/unit/kitchensink/index.html", - "!tests/unit/init/**", - "!tests/unit/listview/cache-tests/*", - "!tests/unit/loader/**", - "!tests/unit/navigation/**", - "!tests/unit/select/cached*", - "!tests/unit/support/index.html" - ] - }, + + files: {}, + http: { options: { - urls: [ -// "http://localhost:<%= connect.server.options.port %>/tests/unit/core/index.html", - "http://localhost:<%= connect.server.options.port %>/tests/unit/dialog/index.html", - "http://localhost:<%= connect.server.options.port %>/tests/unit/event/index.html", - "http://localhost:<%= connect.server.options.port %>/tests/unit/support/index.html" -// "!tests/unit/kitchensink/index.html", -// "!tests/unit/init/**", -// "!tests/unit/listview/cache-tests/*", -// "!tests/unit/listview/push-state-disabled-tests.html", -// "!tests/unit/loader/**", -// "!tests/unit/navigation/**", -// "!tests/unit/popup/back-two.html", -// "!tests/unit/popup/other.html", -// "!tests/unit/popup/popup-sequence-test-dialog.html", -// "!tests/unit/select/cached*" - - ] + urls: (function() { + // Find the test files + var paths = grunt.file.expand( "tests/unit/*/*/index.html" ) + .concat( grunt.file.expand( "tests/unit/**/*-tests.html" ) ) + .sort(), + versionedPaths = [], + jQueries = ( grunt.option( "jquery" ) || "" ).split( "," ); + + grunt.log.writeln( "jQueries: " + JSON.stringify( jQueries ) ); + if ( jQueries.length ) { + paths.forEach( function( path ) { + versionedPaths = versionedPaths.concat( jQueries.map( function( jQVersion ) { + return path + "?jquery=" + jQVersion; + }) ); + }) + } + + if ( versionedPaths.length ) { + paths = versionedPaths; + } + + return paths.map( function( path ) { + return "http://localhost:<%= connect.server.options.port %>/" + path + }); + }()) } - } } @@ -290,8 +303,8 @@ module.exports = function( grunt ) { grunt.registerTask( "dist", [ "js", "css", "dist:common" ] ); grunt.registerTask( "dist:release", [ "js:release", "css:release", "dist:common" ] ); - grunt.registerTask( "test", [ "qunit:files", "connect", "qunit:http" ] ); - grunt.registerTask( "test:ci", [ "qunit_junit", "qunit:files", "connect", "qunit:http" ] ); + grunt.registerTask( "test", [ "config:dev", "requirejs", "connect", "qunit:http" ] ); + grunt.registerTask( "test:ci", [ "qunit_junit", "connect", "qunit:http" ] ); // Default grunt grunt.registerTask( "default", [ "dist" ] ); From 5c845fe8e17bcdfb781333037e81b6a84abaa40a Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 30 Jan 2013 20:09:45 -0700 Subject: [PATCH 43/94] Added --units argument to specify a list of units to run tests on. Fixed up jQuery's default version when no --jquery is passed. --- Gruntfile.js | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 0030cce8096..1058610410a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -255,7 +255,7 @@ module.exports = function( grunt ) { qunit: { options: { - timeout: 10000 + timeout: 30000 }, files: {}, @@ -264,13 +264,24 @@ module.exports = function( grunt ) { options: { urls: (function() { // Find the test files - var paths = grunt.file.expand( "tests/unit/*/*/index.html" ) - .concat( grunt.file.expand( "tests/unit/**/*-tests.html" ) ) - .sort(), + var units = grunt.util._.without( ( grunt.option( "units" ) || "" ).split( "," ), "" ), + patterns, paths, versionedPaths = [], - jQueries = ( grunt.option( "jquery" ) || "" ).split( "," ); + jQueries = grunt.util._.without( ( grunt.option( "jquery" ) || "" ).split( "," ), "" ); + + if ( units.length ) { + patterns = []; + units.forEach( function( unit ) { + patterns = patterns.concat( [ "tests/unit/" + unit + "/**/index.html", "tests/unit/" + unit + "/**/*-tests.html" ] ); + }); + } else { + patterns = [ "tests/unit/*/*/index.html", "tests/unit/**/*-tests.html" ]; + } + grunt.log.writeln( JSON.stringify(patterns)); + + paths = grunt.file.expand( patterns ).sort(); + grunt.log.writeln( JSON.stringify(paths)); - grunt.log.writeln( "jQueries: " + JSON.stringify( jQueries ) ); if ( jQueries.length ) { paths.forEach( function( path ) { versionedPaths = versionedPaths.concat( jQueries.map( function( jQVersion ) { From e3266fa99e48deda36c1a96e2e29042fb3ccf30f Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 30 Jan 2013 22:15:43 -0700 Subject: [PATCH 44/94] Changed the qunit_junit namer Took out some debug logging --- Gruntfile.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1058610410a..30bda8ce885 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -249,7 +249,11 @@ module.exports = function( grunt ) { qunit_junit: { options: { - dest: "build/test-results" + dest: "build/test-results", + namer: function (url) { + var match = url.match(/tests\/([^\/]*)\/(.*)$/); + return match[2].replace(/\//g, '.').replace(/\.html/, '' ).replace(/\?/, "-"); + } } }, @@ -277,10 +281,8 @@ module.exports = function( grunt ) { } else { patterns = [ "tests/unit/*/*/index.html", "tests/unit/**/*-tests.html" ]; } - grunt.log.writeln( JSON.stringify(patterns)); paths = grunt.file.expand( patterns ).sort(); - grunt.log.writeln( JSON.stringify(paths)); if ( jQueries.length ) { paths.forEach( function( path ) { From d56f5903e9ef4f03cebd4f7f57e57c5c7d208668 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 14:13:36 -0700 Subject: [PATCH 45/94] Adjusted globbing patterns when specifying --units flag --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 30bda8ce885..3aec58b3b61 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -276,7 +276,7 @@ module.exports = function( grunt ) { if ( units.length ) { patterns = []; units.forEach( function( unit ) { - patterns = patterns.concat( [ "tests/unit/" + unit + "/**/index.html", "tests/unit/" + unit + "/**/*-tests.html" ] ); + patterns = patterns.concat( [ "tests/unit/" + unit + "/index.html", "tests/unit/" + unit + "/*/index.html", "tests/unit/" + unit + "/**/*-tests.html" ] ); }); } else { patterns = [ "tests/unit/*/*/index.html", "tests/unit/**/*-tests.html" ]; From fc1a75139b3e8af11d4ccf46a82fd2a8ddcba812 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 14:15:03 -0700 Subject: [PATCH 46/94] Renamed --units to --suites --- Gruntfile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 3aec58b3b61..b6e28c8bff7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -268,14 +268,14 @@ module.exports = function( grunt ) { options: { urls: (function() { // Find the test files - var units = grunt.util._.without( ( grunt.option( "units" ) || "" ).split( "," ), "" ), + var suites = grunt.util._.without( ( grunt.option( "suites" ) || "" ).split( "," ), "" ), patterns, paths, versionedPaths = [], jQueries = grunt.util._.without( ( grunt.option( "jquery" ) || "" ).split( "," ), "" ); - if ( units.length ) { + if ( suites.length ) { patterns = []; - units.forEach( function( unit ) { + suites.forEach( function( unit ) { patterns = patterns.concat( [ "tests/unit/" + unit + "/index.html", "tests/unit/" + unit + "/*/index.html", "tests/unit/" + unit + "/**/*-tests.html" ] ); }); } else { From 8ae84352415f3a9509e4ddf45f6e57898a676fec Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 14:18:30 -0700 Subject: [PATCH 47/94] Renamed --jquery to --jqueries --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index b6e28c8bff7..9a9df35f32c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -271,7 +271,7 @@ module.exports = function( grunt ) { var suites = grunt.util._.without( ( grunt.option( "suites" ) || "" ).split( "," ), "" ), patterns, paths, versionedPaths = [], - jQueries = grunt.util._.without( ( grunt.option( "jquery" ) || "" ).split( "," ), "" ); + jQueries = grunt.util._.without( ( grunt.option( "jqueries" ) || "" ).split( "," ), "" ); if ( suites.length ) { patterns = []; From db8f0286da60e894af53dc5495950ffa925a5d79 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 21:23:35 -0700 Subject: [PATCH 48/94] Improved versioning logic --- docs/demos/_assets/js/jqm-demos.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/docs/demos/_assets/js/jqm-demos.js b/docs/demos/_assets/js/jqm-demos.js index 85c9067dc41..5f3953dd677 100644 --- a/docs/demos/_assets/js/jqm-demos.js +++ b/docs/demos/_assets/js/jqm-demos.js @@ -28,16 +28,22 @@ $(function(){ }); // display the version of jQM $(document).on( "pageinit", function() { - var version = $.mobile.version || "dev", - words = version.split( "-" ), - ver = words[0], - str = (words[1] || "Final"), + var rversion = /^(\d)\.(\d+)\.(\d)(-(?:alpha|beta|rc)\.\d|pre)?$/, + version = ( $.mobile.version || "dev" ).toLowerCase().match( rversion ) || {}, + major = version[1], + minor = version[2], + patch = version[3], + xbeta = version[4], + str = "", + ver = $.mobile.version, html = "Version " + ver; - if( str.indexOf( "rc" ) == -1 ){ - str = str.charAt( 0 ).toUpperCase() + str.slice( 1 ); - } else { - str = str.toUpperCase().replace(".", ""); + if ( ver != "dev" ) { + if ( !xbeta ) { + str = "Final"; + } else if ( xbeta == "rc"){ + str = str.charAt( 0 ).toUpperCase() + str.slice( 1 ); + } } if ( $.mobile.version && str ) { From aac46f11d917f7e243acbff549b6396fb1d4fb23 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 21:23:50 -0700 Subject: [PATCH 49/94] Fixed path to nav.html --- docs/demos/_assets/_source-view-example/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/demos/_assets/_source-view-example/index.html b/docs/demos/_assets/_source-view-example/index.html index be38d137cf9..b46135a1495 100644 --- a/docs/demos/_assets/_source-view-example/index.html +++ b/docs/demos/_assets/_source-view-example/index.html @@ -65,7 +65,7 @@

Specify which markup, script or style to show

Copyright 2013 The jQuery Foundation

- + From 1f514b838f76228e38c825c43ea65191717e15be Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 21:25:38 -0700 Subject: [PATCH 50/94] Added demos target --- Gruntfile.js | 77 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 68 insertions(+), 9 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9a9df35f32c..34b86724c9e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -47,7 +47,7 @@ module.exports = function( grunt ) { grunt.config.init({ pkg: grunt.file.readJSON( "package.json" ), - version: "v<%= pkg.version %>", + version: "<%= pkg.version %>", jshint: { js: { @@ -119,12 +119,17 @@ module.exports = function( grunt ) { }, concat: { - options: { - banner: banner.normal - }, js: { + options: { + banner: banner.normal + }, + src: [ path.join( dist, name ) + ".js" ], dest: path.join( dist, name ) + ".js" + }, + demos: { + src: [ "docs/demos/_assets/js/*.js" ], + dest: path.join( dist, "demos/_assets/js/demos.js" ) } }, @@ -199,8 +204,60 @@ module.exports = function( grunt ) { copy: { images: { - src: "css/themes/default/images", - dest: path.join( dist, "images" ), + expand: true, + cwd: "css/themes/default/images", + src: "*", + dest: path.join( dist, "images/" ), + }, + "demos.processed": { + options: { + processContentExclude: [ "**/*.png", "**/*.gif" ], + processContent: function( content, srcPath ) { + if ( srcPath === "docs/demos/nav.html" ) { + return false; + } + content = content.replace( /_assets\/js\/">/gi, "_assets/js/demos.js\">" ); + content = content.replace( /\.\.\/\.\.\/js\/">/gi, "js/" + name + ".min.js\">" ); + content = content.replace( /\.\.\/\.\.\/css\//gi, "css/" ); + content = content.replace( /^\s*<\?php include\(\s*['"]([^'"]+)['"].*$/gmi, + function( match, includePath, offset, string ) { + var fileToInclude = path.resolve( path.join( path.dirname( srcPath ), includePath ) ); + return grunt.file.read( fileToInclude ); + } + ); + return content; + } + }, + files: [ + { + expand: true, + cwd: "docs/demos", + src: [ "**" ], + dest: path.join( dist, "demos/" ) + } + ] + }, + "demos.unprocessed": { + files: [ + { + expand: true, + cwd: dist, + src: [ "*.js", "*.map" ], + dest: path.join( dist, "demos/js/" ) + }, + { + expand: true, + cwd: dist, + src: [ name + ".css", "images/*" ], + dest: path.join( dist, "demos/css/themes/default/" ) + }, + { + expand: true, + cwd: dist, + src: "images/*", + dest: path.join( dist, "demos/" ) + }, + ] } }, @@ -306,12 +363,14 @@ module.exports = function( grunt ) { }); - grunt.registerTask( "js", [ "config:dev", "requirejs", "concat:js", "uglify" ] ); - grunt.registerTask( "js:release", [ "config:dev", "requirejs", "concat:js", "uglify" ] ); + grunt.registerTask( "js", "Builds jquery.mobile.js", [ "config:dev", "requirejs", "concat:js", "uglify" ] ); + grunt.registerTask( "js:release", [ "requirejs", "concat:js", "uglify" ] ); grunt.registerTask( "css", [ "config:dev", "cssbuild", "cssmin" ] ); grunt.registerTask( "css:release", [ "cssbuild", "cssmin" ] ); - grunt.registerTask( "dist:common", [ "copy:images", "zip:dist" ] ); + grunt.registerTask( "demos", [ "concat:demos", "copy:demos.processed", "copy:demos.unprocessed" ] ); + + grunt.registerTask( "dist:common", [ "copy:images", "demos", "zip:dist" ] ); grunt.registerTask( "dist", [ "js", "css", "dist:common" ] ); grunt.registerTask( "dist:release", [ "js:release", "css:release", "dist:common" ] ); From c464d0a91853ca078fdaa4af76eeba0f0fd639b1 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 21:45:21 -0700 Subject: [PATCH 51/94] Fixed version string generation to handle non-semver string --- docs/demos/_assets/js/jqm-demos.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/demos/_assets/js/jqm-demos.js b/docs/demos/_assets/js/jqm-demos.js index 5f3953dd677..44c74f9c07b 100644 --- a/docs/demos/_assets/js/jqm-demos.js +++ b/docs/demos/_assets/js/jqm-demos.js @@ -38,7 +38,7 @@ $(document).on( "pageinit", function() { ver = $.mobile.version, html = "Version " + ver; - if ( ver != "dev" ) { + if ( !$.isEmptyObject( version ) && ver != "dev" ) { if ( !xbeta ) { str = "Final"; } else if ( xbeta == "rc"){ From a574cda46e9e9a23f5f37f04ccb043f8f4e1d305 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 22:55:28 -0700 Subject: [PATCH 52/94] jQuery and $ should not be globals since we're using AMD internally --- js/.jshintrc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/js/.jshintrc b/js/.jshintrc index 121e25e1f99..8828c290c83 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -12,10 +12,8 @@ "eqnull": true, "browser": true, "globals": { - "jQuery": true, - "$": true, - - "define": true, - "require": true + "define": false, + "require": false, + "requirejs": false } } \ No newline at end of file From 74a3d843f1f05c042a544c5ef5245f937ea4e5b6 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 22:56:42 -0700 Subject: [PATCH 53/94] Renamed $ to jQuery in the factory functions. jQuery is the variable passed to the inner IIFEs --- js/events/navigate.js | 2 +- js/events/touch.js | 2 +- js/jquery.mobile.buttonMarkup.js | 2 +- js/jquery.mobile.core.js | 2 +- js/jquery.mobile.degradeInputs.js | 2 +- js/jquery.mobile.events.js | 2 +- js/jquery.mobile.fieldContain.js | 2 +- js/jquery.mobile.grid.js | 2 +- js/jquery.mobile.init.js | 2 +- js/jquery.mobile.links.js | 2 +- js/jquery.mobile.media.js | 2 +- js/jquery.mobile.navigation.js | 2 +- js/jquery.mobile.nojs.js | 2 +- js/jquery.mobile.support.js | 2 +- js/jquery.mobile.transition.js | 2 +- js/jquery.mobile.transitions.js | 2 +- js/jquery.mobile.vmouse.js | 2 +- js/jquery.mobile.widget.js | 2 +- js/jquery.mobile.zoom.iosorientationfix.js | 2 +- js/jquery.mobile.zoom.js | 2 +- js/transitions/flip.js | 2 +- js/transitions/flow.js | 2 +- js/transitions/pop.js | 2 +- js/transitions/slide.js | 2 +- js/transitions/slidedown.js | 2 +- js/transitions/slidefade.js | 2 +- js/transitions/slideup.js | 2 +- js/transitions/turn.js | 2 +- js/widgets/addFirstLastClasses.js | 2 +- js/widgets/collapsible.js | 2 +- js/widgets/collapsibleSet.js | 2 +- js/widgets/controlgroup.js | 2 +- js/widgets/dialog.js | 2 +- js/widgets/fixedToolbar.js | 2 +- js/widgets/fixedToolbar.workarounds.js | 2 +- js/widgets/forms/button.js | 2 +- js/widgets/forms/checkboxradio.js | 2 +- js/widgets/forms/rangeslider.js | 2 +- js/widgets/forms/reset.js | 2 +- js/widgets/forms/select.custom.js | 2 +- js/widgets/forms/select.js | 2 +- js/widgets/forms/slider.js | 2 +- js/widgets/forms/textinput.js | 2 +- js/widgets/listview.autodividers.js | 2 +- js/widgets/listview.filter.js | 2 +- js/widgets/listview.js | 2 +- js/widgets/loader.js | 2 +- js/widgets/navbar.js | 2 +- js/widgets/page.js | 2 +- js/widgets/page.sections.js | 2 +- js/widgets/panel.js | 2 +- js/widgets/popup.js | 2 +- js/widgets/table.columntoggle.js | 2 +- js/widgets/table.js | 2 +- js/widgets/table.reflow.js | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/js/events/navigate.js b/js/events/navigate.js index 8c1331cf647..c531db140ea 100644 --- a/js/events/navigate.js +++ b/js/events/navigate.js @@ -4,7 +4,7 @@ //>>group: Events // TODO break out pushstate support test so we don't depend on the whole thing -define([ "jquery", "./../jquery.mobile.ns", "./../jquery.mobile.support" ], function( $ ) { +define([ "jquery", "./../jquery.mobile.ns", "./../jquery.mobile.support" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/events/touch.js b/js/events/touch.js index e76ddfc0ec9..512a492f186 100644 --- a/js/events/touch.js +++ b/js/events/touch.js @@ -3,7 +3,7 @@ //>>label: Touch //>>group: Events -define( [ "jquery", "../jquery.mobile.vmouse", "../jquery.mobile.support.touch" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.vmouse", "../jquery.mobile.support.touch" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.buttonMarkup.js index b8fe5511098..36e4fa2a662 100644 --- a/js/jquery.mobile.buttonMarkup.js +++ b/js/jquery.mobile.buttonMarkup.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.button.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.vmouse" ], function( $ ) { +define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.vmouse" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index a36405f3c6e..7b2c7792bc1 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.core.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "./jquery.mobile.ns", "json!../package.json" ], function( $, ns, pkg ) { +define( [ "jquery", "./jquery.mobile.ns", "json!../package.json" ], function( jQuery, ns, pkg ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); diff --git a/js/jquery.mobile.degradeInputs.js b/js/jquery.mobile.degradeInputs.js index 966d2421e47..8898633ced9 100644 --- a/js/jquery.mobile.degradeInputs.js +++ b/js/jquery.mobile.degradeInputs.js @@ -4,7 +4,7 @@ //>>group: Utilities -define( [ "jquery", "./widgets/page" ], function( $ ) { +define( [ "jquery", "./widgets/page" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.events.js b/js/jquery.mobile.events.js index c8bdd9ffda3..02cfc9ed3b6 100644 --- a/js/jquery.mobile.events.js +++ b/js/jquery.mobile.events.js @@ -3,7 +3,7 @@ //>>label: Events //>>group: Events -define( [ "jquery", "./events/navigate", "./events/touch", "./events/orientationchange" ], function( $ ) { +define( [ "jquery", "./events/navigate", "./events/touch", "./events/orientationchange" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); }); diff --git a/js/jquery.mobile.fieldContain.js b/js/jquery.mobile.fieldContain.js index daf66e70bad..6b0e70daf61 100644 --- a/js/jquery.mobile.fieldContain.js +++ b/js/jquery.mobile.fieldContain.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.forms.fieldcontain.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery" ], function( $ ) { +define( [ "jquery" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.grid.js b/js/jquery.mobile.grid.js index 16f3d028e51..3a25f167af4 100644 --- a/js/jquery.mobile.grid.js +++ b/js/jquery.mobile.grid.js @@ -5,7 +5,7 @@ //>>css.structure:../css/structure/jquery.mobile.grid.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery" ], function( $ ) { +define( [ "jquery" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js index 227b49912a3..8045339c4c8 100644 --- a/js/jquery.mobile.init.js +++ b/js/jquery.mobile.init.js @@ -14,7 +14,7 @@ define([ "./jquery.mobile.navigation", "./widgets/loader", "./jquery.mobile.vmouse", - "depend!./jquery.hashchange[jquery]" ], function( $ ) { + "depend!./jquery.hashchange[jquery]" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { var $html = $( "html" ), diff --git a/js/jquery.mobile.links.js b/js/jquery.mobile.links.js index a3bfdbae177..c5b8236f2bf 100644 --- a/js/jquery.mobile.links.js +++ b/js/jquery.mobile.links.js @@ -4,7 +4,7 @@ //>>group: Utilities -define( [ "jquery" ], function( $ ) { +define( [ "jquery" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.media.js b/js/jquery.mobile.media.js index b21de247deb..240e3448801 100644 --- a/js/jquery.mobile.media.js +++ b/js/jquery.mobile.media.js @@ -4,7 +4,7 @@ //>>group: Utilities -define( [ "jquery", "./jquery.mobile.core" ], function( $ ) { +define( [ "jquery", "./jquery.mobile.core" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js index 428895f6777..f60d566f404 100644 --- a/js/jquery.mobile.navigation.js +++ b/js/jquery.mobile.navigation.js @@ -14,7 +14,7 @@ define( [ "./jquery.mobile.support", "depend!./jquery.hashchange[jquery]", "./widgets/page", - "./jquery.mobile.transition" ], function( $ ) { + "./jquery.mobile.transition" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.nojs.js b/js/jquery.mobile.nojs.js index 159d1fcbcfb..c9b2479304d 100644 --- a/js/jquery.mobile.nojs.js +++ b/js/jquery.mobile.nojs.js @@ -3,7 +3,7 @@ //>>label: “nojs” Classes //>>group: Utilities -define( [ "jquery" ], function( $ ) { +define( [ "jquery" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.support.js b/js/jquery.mobile.support.js index 15a2fcdacba..83795a53bca 100644 --- a/js/jquery.mobile.support.js +++ b/js/jquery.mobile.support.js @@ -2,7 +2,7 @@ //>>description: Assorted tests to qualify browsers by detecting features //>>label: Support Tests //>>group: Core -define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.media", "./jquery.mobile.support.touch", "./jquery.mobile.support.orientation" ], function( $ ) { +define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.media", "./jquery.mobile.support.touch", "./jquery.mobile.support.orientation" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.transition.js b/js/jquery.mobile.transition.js index f7a07557f87..b015e23e5f0 100644 --- a/js/jquery.mobile.transition.js +++ b/js/jquery.mobile.transition.js @@ -6,7 +6,7 @@ //>>css.structure: ../css/structure/jquery.mobile.transition.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "./jquery.mobile.core" ], function( $ ) { +define( [ "jquery", "./jquery.mobile.core" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/jquery.mobile.transitions.js b/js/jquery.mobile.transitions.js index 453a8b9bd5a..7dfbb08570e 100644 --- a/js/jquery.mobile.transitions.js +++ b/js/jquery.mobile.transitions.js @@ -12,7 +12,7 @@ define( [ "./transitions/slidefade", "./transitions/slideup", "./transitions/turn" -], function( $ ) { +], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); }); diff --git a/js/jquery.mobile.vmouse.js b/js/jquery.mobile.vmouse.js index 0ba6fe6ee99..0f7b15b166d 100644 --- a/js/jquery.mobile.vmouse.js +++ b/js/jquery.mobile.vmouse.js @@ -19,7 +19,7 @@ //>>label: Virtual Mouse (vmouse) Bindings //>>group: Core -define( [ "jquery" ], function( $ ) { +define( [ "jquery" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, document, undefined ) { diff --git a/js/jquery.mobile.widget.js b/js/jquery.mobile.widget.js index c9ed71f3231..a6202d8e2d8 100644 --- a/js/jquery.mobile.widget.js +++ b/js/jquery.mobile.widget.js @@ -4,7 +4,7 @@ //>>group: Core //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "./jquery.mobile.ns", "depend!./jquery.ui.widget[jquery]" ], function( $ ) { +define( [ "jquery", "./jquery.mobile.ns", "depend!./jquery.ui.widget[jquery]" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/jquery.mobile.zoom.iosorientationfix.js b/js/jquery.mobile.zoom.iosorientationfix.js index 5e274cf79c8..618365630b0 100644 --- a/js/jquery.mobile.zoom.iosorientationfix.js +++ b/js/jquery.mobile.zoom.iosorientationfix.js @@ -3,7 +3,7 @@ //>>label: iOS Orientation Change Fix //>>group: Utilities -define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.zoom" ], function( $ ) { +define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.zoom" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window ) { diff --git a/js/jquery.mobile.zoom.js b/js/jquery.mobile.zoom.js index ed87b5125c8..56906b83382 100644 --- a/js/jquery.mobile.zoom.js +++ b/js/jquery.mobile.zoom.js @@ -3,7 +3,7 @@ //>>label: Zoom Handling //>>group: Utilities -define( [ "jquery", "./jquery.mobile.core" ], function( $ ) { +define( [ "jquery", "./jquery.mobile.core" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $ ) { var meta = $( "meta[name=viewport]" ), diff --git a/js/transitions/flip.js b/js/transitions/flip.js index 551fc9f2fbc..eb261313298 100644 --- a/js/transitions/flip.js +++ b/js/transitions/flip.js @@ -8,7 +8,7 @@ //>>group: Transitions //>>css.structure: ../css/structure/jquery.mobile.transition.flip.css -define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.transition" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/transitions/flow.js b/js/transitions/flow.js index be1ce79d17a..30f1bb90301 100644 --- a/js/transitions/flow.js +++ b/js/transitions/flow.js @@ -8,7 +8,7 @@ //>>group: Transitions //>>css.structure: ../css/structure/jquery.mobile.transition.flow.css -define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.transition" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/transitions/pop.js b/js/transitions/pop.js index 2ade1870411..7be8729fc3b 100644 --- a/js/transitions/pop.js +++ b/js/transitions/pop.js @@ -8,7 +8,7 @@ //>>group: Transitions //>>css.structure: ../css/structure/jquery.mobile.transition.pop.css -define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.transition" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/transitions/slide.js b/js/transitions/slide.js index d45d55c178c..733ea6de06e 100644 --- a/js/transitions/slide.js +++ b/js/transitions/slide.js @@ -8,7 +8,7 @@ //>>group: Transitions //>>css.structure: ../css/structure/jquery.mobile.transition.slide.css -define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.transition" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/transitions/slidedown.js b/js/transitions/slidedown.js index 94d191e8838..efde6f22c81 100644 --- a/js/transitions/slidedown.js +++ b/js/transitions/slidedown.js @@ -8,7 +8,7 @@ //>>group: Transitions //>>css.structure: ../css/structure/jquery.mobile.transition.slidedown.css -define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.transition" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/transitions/slidefade.js b/js/transitions/slidefade.js index d2b33dbddf5..1dfda31fa31 100644 --- a/js/transitions/slidefade.js +++ b/js/transitions/slidefade.js @@ -8,7 +8,7 @@ //>>group: Transitions //>>css.structure: ../css/structure/jquery.mobile.transition.slidefade.css -define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.transition" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/transitions/slideup.js b/js/transitions/slideup.js index 881ca3d4380..b0b579f1eba 100644 --- a/js/transitions/slideup.js +++ b/js/transitions/slideup.js @@ -8,7 +8,7 @@ //>>group: Transitions //>>css.structure: ../css/structure/jquery.mobile.transition.slideup.css -define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.transition" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/transitions/turn.js b/js/transitions/turn.js index 40ada9412be..359fd872c27 100644 --- a/js/transitions/turn.js +++ b/js/transitions/turn.js @@ -8,7 +8,7 @@ //>>group: Transitions //>>css.structure: ../css/structure/jquery.mobile.transition.turn.css -define( [ "jquery", "../jquery.mobile.transition" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.transition" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/widgets/addFirstLastClasses.js b/js/widgets/addFirstLastClasses.js index e59d682ff72..4ba11127015 100644 --- a/js/widgets/addFirstLastClasses.js +++ b/js/widgets/addFirstLastClasses.js @@ -3,7 +3,7 @@ //>>label: First & Last Classes //>>group: Widgets -define( [ "jquery", "../jquery.mobile.core" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.core" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/collapsible.js b/js/widgets/collapsible.js index dfe2219e44d..e728dc6b2eb 100644 --- a/js/widgets/collapsible.js +++ b/js/widgets/collapsible.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.collapsible.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.buttonMarkup" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.buttonMarkup" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/collapsibleSet.js b/js/widgets/collapsibleSet.js index ae07d88d6c6..be467b878a1 100644 --- a/js/widgets/collapsibleSet.js +++ b/js/widgets/collapsibleSet.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.collapsible.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../jquery.mobile.widget", "./collapsible", "./addFirstLastClasses" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "./collapsible", "./addFirstLastClasses" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/controlgroup.js b/js/widgets/controlgroup.js index 7aab9d99807..276f5cc3bb4 100644 --- a/js/widgets/controlgroup.js +++ b/js/widgets/controlgroup.js @@ -8,7 +8,7 @@ define( [ "jquery", "../jquery.mobile.buttonMarkup", "./addFirstLastClasses", - "../jquery.mobile.widget" ], function( $ ) { + "../jquery.mobile.widget" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/dialog.js b/js/widgets/dialog.js index e35e0fb581d..cddfba76dd5 100644 --- a/js/widgets/dialog.js +++ b/js/widgets/dialog.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.dialog.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.navigation" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.navigation" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/widgets/fixedToolbar.js b/js/widgets/fixedToolbar.js index 69fe1798067..fd060d0a35f 100644 --- a/js/widgets/fixedToolbar.js +++ b/js/widgets/fixedToolbar.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.fixedToolbar.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core", "../jquery.mobile.navigation", "./page", "./page.sections", "../jquery.mobile.zoom" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core", "../jquery.mobile.navigation", "./page", "./page.sections", "../jquery.mobile.zoom" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/fixedToolbar.workarounds.js b/js/widgets/fixedToolbar.workarounds.js index 6ecdd92e482..9d3be14141f 100644 --- a/js/widgets/fixedToolbar.workarounds.js +++ b/js/widgets/fixedToolbar.workarounds.js @@ -3,7 +3,7 @@ //>>label: Toolbars: Fixed: Workarounds //>>group: Widgets //>>css.structure: ../css/structure/jquery.mobile.fixedToolbar.css -define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core", "../jquery.mobile.navigation", "./page", "./page.sections", "../jquery.mobile.zoom", "./fixedToolbar" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core", "../jquery.mobile.navigation", "./page", "./page.sections", "../jquery.mobile.zoom", "./fixedToolbar" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { $.widget( "mobile.fixedtoolbar", $.mobile.fixedtoolbar, { diff --git a/js/widgets/forms/button.js b/js/widgets/forms/button.js index 7c9e55e59d8..00d9647fabf 100644 --- a/js/widgets/forms/button.js +++ b/js/widgets/forms/button.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.button.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../../jquery.mobile.widget", "../../jquery.mobile.buttonMarkup" ], function( $ ) { +define( [ "jquery", "../../jquery.mobile.widget", "../../jquery.mobile.buttonMarkup" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/forms/checkboxradio.js b/js/widgets/forms/checkboxradio.js index 7b868501ac6..8bcaab4ab8b 100644 --- a/js/widgets/forms/checkboxradio.js +++ b/js/widgets/forms/checkboxradio.js @@ -9,7 +9,7 @@ //>>css.structure: ../css/structure/jquery.mobile.forms.checkboxradio.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "../../jquery.mobile.buttonMarkup", "./reset" ], function( $ ) { +define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "../../jquery.mobile.buttonMarkup", "./reset" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/forms/rangeslider.js b/js/widgets/forms/rangeslider.js index 46a1296cde1..71040641ba8 100644 --- a/js/widgets/forms/rangeslider.js +++ b/js/widgets/forms/rangeslider.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.forms.rangeslider.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "./textinput", "../../jquery.mobile.buttonMarkup", "./reset", "./slider" ], function( $ ) { +define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "./textinput", "../../jquery.mobile.buttonMarkup", "./reset", "./slider" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { $.widget( "mobile.rangeslider", $.mobile.widget, { diff --git a/js/widgets/forms/reset.js b/js/widgets/forms/reset.js index 60d05c407fa..ce73119ed73 100644 --- a/js/widgets/forms/reset.js +++ b/js/widgets/forms/reset.js @@ -3,7 +3,7 @@ //>>label: Form Reset //>>group: Forms -define( [ "jquery", "../../jquery.mobile.core" ], function( $ ) { +define( [ "jquery", "../../jquery.mobile.core" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/forms/select.custom.js b/js/widgets/forms/select.custom.js index 2b6a011b2bb..c605ee9b8e6 100644 --- a/js/widgets/forms/select.custom.js +++ b/js/widgets/forms/select.custom.js @@ -20,7 +20,7 @@ define( [ "../page", "../popup", // NOTE expects ui content in the defined page, see selector for menuPageContent definition - "../page.sections" ], function( $ ) { + "../page.sections" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { var extendSelect = function( widget ) { diff --git a/js/widgets/forms/select.js b/js/widgets/forms/select.js index a4c6b7b4066..a5b9ac0a430 100644 --- a/js/widgets/forms/select.js +++ b/js/widgets/forms/select.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.forms.select.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "../../jquery.mobile.buttonMarkup", "../../jquery.mobile.zoom", "./reset" ], function( $ ) { +define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "../../jquery.mobile.buttonMarkup", "../../jquery.mobile.zoom", "./reset" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/forms/slider.js b/js/widgets/forms/slider.js index 161c875ad4f..bbccdc17c52 100644 --- a/js/widgets/forms/slider.js +++ b/js/widgets/forms/slider.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.forms.slider.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "./textinput", "../../jquery.mobile.buttonMarkup", "./reset" ], function( $ ) { +define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "./textinput", "../../jquery.mobile.buttonMarkup", "./reset" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/forms/textinput.js b/js/widgets/forms/textinput.js index 3d8dc88df4a..40d100218a1 100644 --- a/js/widgets/forms/textinput.js +++ b/js/widgets/forms/textinput.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.forms.textinput.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "../../jquery.mobile.degradeInputs", "../../jquery.mobile.buttonMarkup", "../../jquery.mobile.zoom" ], function( $ ) { +define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", "../../jquery.mobile.degradeInputs", "../../jquery.mobile.buttonMarkup", "../../jquery.mobile.zoom" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/listview.autodividers.js b/js/widgets/listview.autodividers.js index 24617b3d134..d18ceef3f52 100644 --- a/js/widgets/listview.autodividers.js +++ b/js/widgets/listview.autodividers.js @@ -2,7 +2,7 @@ //>>description: Generates dividers for listview items //>>label: Listview Autodividers //>>group: Widgets -define( [ "jquery", "./listview" ], function( $ ) { +define( [ "jquery", "./listview" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/listview.filter.js b/js/widgets/listview.filter.js index 47a642a94e7..1f652c186e4 100644 --- a/js/widgets/listview.filter.js +++ b/js/widgets/listview.filter.js @@ -4,7 +4,7 @@ //>>group: Widgets -define( [ "jquery", "./listview", "./forms/textinput" ], function( $ ) { +define( [ "jquery", "./listview", "./forms/textinput" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/listview.js b/js/widgets/listview.js index c612eab9922..7f7b576c31a 100644 --- a/js/widgets/listview.js +++ b/js/widgets/listview.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.listview.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.buttonMarkup", "./page", "./page.sections", "./addFirstLastClasses" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.buttonMarkup", "./page", "./page.sections", "./addFirstLastClasses" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/loader.js b/js/widgets/loader.js index 5016b6149a8..e3e25f28ede 100644 --- a/js/widgets/loader.js +++ b/js/widgets/loader.js @@ -3,7 +3,7 @@ //>>label: Loading Message //>>group: Widgets -define( [ "jquery", "../jquery.mobile.core", "../jquery.mobile.widget" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.core", "../jquery.mobile.widget" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window ) { diff --git a/js/widgets/navbar.js b/js/widgets/navbar.js index 1f0f042e2c6..2b85dd863c1 100644 --- a/js/widgets/navbar.js +++ b/js/widgets/navbar.js @@ -6,7 +6,7 @@ //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.buttonMarkup", "../jquery.mobile.grid" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.buttonMarkup", "../jquery.mobile.grid" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/page.js b/js/widgets/page.js index da83e33d0c9..e4722c71ab3 100644 --- a/js/widgets/page.js +++ b/js/widgets/page.js @@ -3,7 +3,7 @@ //>>label: Page Creation //>>group: Core -define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/page.sections.js b/js/widgets/page.sections.js index 141a38870fe..eb7cc98c50f 100644 --- a/js/widgets/page.sections.js +++ b/js/widgets/page.sections.js @@ -3,7 +3,7 @@ //>>label: Page Sections //>>group: Core -define( [ "jquery", "./page", "../jquery.mobile.core" ], function( $ ) { +define( [ "jquery", "./page", "../jquery.mobile.core" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/panel.js b/js/widgets/panel.js index f5514ba40fe..3b66c7c01f3 100644 --- a/js/widgets/panel.js +++ b/js/widgets/panel.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.panel.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../jquery.mobile.widget", "./page", "./page.sections" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "./page", "./page.sections" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/popup.js b/js/widgets/popup.js index 2e48350eb8b..36a9de7d2dc 100644 --- a/js/widgets/popup.js +++ b/js/widgets/popup.js @@ -21,7 +21,7 @@ define( [ "../navigation/navigator", "../navigation/method", "../jquery.mobile.navigation", - "depend!../jquery.hashchange[jquery]" ], function( $ ) { + "depend!../jquery.hashchange[jquery]" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/table.columntoggle.js b/js/widgets/table.columntoggle.js index d313614772a..420cdc2ede2 100644 --- a/js/widgets/table.columntoggle.js +++ b/js/widgets/table.columntoggle.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.table.columntoggle.css -define( [ "jquery", "./table", "../jquery.mobile.buttonMarkup", "./popup", "../jquery.mobile.fieldContain", "widgets/controlgroup", "widgets/forms/checkboxradio" ], function( $ ) { +define( [ "jquery", "./table", "../jquery.mobile.buttonMarkup", "./popup", "../jquery.mobile.fieldContain", "widgets/controlgroup", "widgets/forms/checkboxradio" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/table.js b/js/widgets/table.js index a4d2cb349f6..9b58ce1d56d 100644 --- a/js/widgets/table.js +++ b/js/widgets/table.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.table.css //>>css.theme: ../css/themes/default/jquery.mobile.theme.css -define( [ "jquery", "../jquery.mobile.widget", "./page", "./page.sections" ], function( $ ) { +define( [ "jquery", "../jquery.mobile.widget", "./page", "./page.sections" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/table.reflow.js b/js/widgets/table.reflow.js index 566d840d997..9d770e38f6c 100644 --- a/js/widgets/table.reflow.js +++ b/js/widgets/table.reflow.js @@ -5,7 +5,7 @@ //>>css.structure: ../css/structure/jquery.mobile.table.reflow.css -define( [ "jquery", "./table" ], function( $ ) { +define( [ "jquery", "./table" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { From ec469d75521af3543ce84684518f3c9b2e2c8630 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 31 Jan 2013 22:57:23 -0700 Subject: [PATCH 54/94] Excluded external sources from linting --- Gruntfile.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 34b86724c9e..570e0201fb4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -55,7 +55,12 @@ module.exports = function( grunt ) { jshintrc: "js/.jshintrc" }, files: { - src: "js/**/*.js" + src: [ + "js/**/*.js", + "!js/jquery.hashchange.js", + "!js/jquery.js", + "!js/jquery.ui.widget.js" + ] } }, grunt: { @@ -363,17 +368,18 @@ module.exports = function( grunt ) { }); - grunt.registerTask( "js", "Builds jquery.mobile.js", [ "config:dev", "requirejs", "concat:js", "uglify" ] ); grunt.registerTask( "js:release", [ "requirejs", "concat:js", "uglify" ] ); - grunt.registerTask( "css", [ "config:dev", "cssbuild", "cssmin" ] ); + grunt.registerTask( "js", [ "config:dev", "js:release" ] ); + + grunt.registerTask( "css:release", [ "cssbuild", "cssmin" ] ); + grunt.registerTask( "css", [ "config:dev", "css:release" ] ); grunt.registerTask( "demos", [ "concat:demos", "copy:demos.processed", "copy:demos.unprocessed" ] ); - grunt.registerTask( "dist:common", [ "copy:images", "demos", "zip:dist" ] ); + grunt.registerTask( "dist:release", [ "js:release", "css:release", "copy:images", "demos", "zip:dist" ] ); + grunt.registerTask( "dist", [ "config:dev", "dist:release" ] ); - grunt.registerTask( "dist", [ "js", "css", "dist:common" ] ); - grunt.registerTask( "dist:release", [ "js:release", "css:release", "dist:common" ] ); grunt.registerTask( "test", [ "config:dev", "requirejs", "connect", "qunit:http" ] ); grunt.registerTask( "test:ci", [ "qunit_junit", "connect", "qunit:http" ] ); From ac04ad71d7ed42b1b4dbb8767f85ae2e2afe874c Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 16:43:05 -0700 Subject: [PATCH 55/94] Tagging the 1.4.0-beta.1 release. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 493ddc1021a..03a007d4c6d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0pre", + "version": "1.4.0-beta.1", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From 346c524dc405f7956e038ba491fd3c44e39db6b0 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 16:43:20 -0700 Subject: [PATCH 56/94] Updating the source version to 1.4.0pre --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03a007d4c6d..493ddc1021a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0-beta.1", + "version": "1.4.0pre", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From 28cff58afabc3d1e5eb47e0598f4858c3f3093d5 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 16:44:14 -0700 Subject: [PATCH 57/94] Tagging the 1.4.0-beta.1 release. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 493ddc1021a..03a007d4c6d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0pre", + "version": "1.4.0-beta.1", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From ad606fa3afbac6857d56d907c4f99c922b9c1c23 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 16:44:29 -0700 Subject: [PATCH 58/94] Updating the source version to 1.4.0pre --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03a007d4c6d..493ddc1021a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0-beta.1", + "version": "1.4.0pre", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From 42449d278eb34f0675d7b587584aa4445bd684fe Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 18:43:56 -0700 Subject: [PATCH 59/94] Added devDependency on async --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 493ddc1021a..93c975e8d6e 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "jquery": ">=1.7.3" }, "devDependencies": { + "async": "latest", "grunt": "0.4.x", "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", From 726eb5387f6885c208a0fcdd7a3babde5cda1cce Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 18:44:20 -0700 Subject: [PATCH 60/94] Tagging the 1.4.0-alpha.1 release. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93c975e8d6e..ac4cbd82363 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0pre", + "version": "1.4.0-alpha.1", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From 3de05a0624340d820e8e29e194d5ec93beac782e Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 18:44:40 -0700 Subject: [PATCH 61/94] Tagging the 1.4.0-beta.1 release. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ac4cbd82363..4f63c6e7fb6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0-alpha.1", + "version": "1.4.0-beta.1", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From cdbaf2a48b5bc0fb327bc1b752f97e491d7d7b8e Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 18:46:08 -0700 Subject: [PATCH 62/94] Fixed version back to 1.4.0pre --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f63c6e7fb6..93c975e8d6e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0-beta.1", + "version": "1.4.0pre", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From 7feeaf2a0935b5659aff60705f6eb5c27cd80c87 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 18:49:16 -0700 Subject: [PATCH 63/94] Tagging the 1.4.0-alpha.1 release. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93c975e8d6e..ac4cbd82363 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0pre", + "version": "1.4.0-alpha.1", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From c1f5b8ed7f22879afaac2420e962d48f9c321127 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 18:49:50 -0700 Subject: [PATCH 64/94] Tagging the 1.4.0-beta.1 release. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ac4cbd82363..4f63c6e7fb6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0-alpha.1", + "version": "1.4.0-beta.1", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From bf6f7c2e0a60d8007853e19192d881d934cfc801 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 18:50:06 -0700 Subject: [PATCH 65/94] Updating the source version to 1.4.0pre --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f63c6e7fb6..93c975e8d6e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0-beta.1", + "version": "1.4.0pre", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From 125ddb5c119ca8b6e4d048f23a61b54c3d8d79f7 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 7 Feb 2013 18:53:27 -0700 Subject: [PATCH 66/94] Tagging the 1.4.0-alpha.1 release. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93c975e8d6e..ac4cbd82363 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0pre", + "version": "1.4.0-alpha.1", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From 8be2ce708d9eb40de5ce3c03cfd4c742e828bd4f Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 28 Feb 2013 22:17:59 -0700 Subject: [PATCH 67/94] Build: Added new grunt tasks: curl, rsync, release and recurse --- build/tasks/curl.js | 76 ++++++++++++++++++++++++ build/tasks/recurse.js | 30 ++++++++++ build/tasks/release.js | 130 +++++++++++++++++++++++++++++++++++++++++ build/tasks/rsync.js | 123 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 359 insertions(+) create mode 100644 build/tasks/curl.js create mode 100644 build/tasks/recurse.js create mode 100644 build/tasks/release.js create mode 100644 build/tasks/rsync.js diff --git a/build/tasks/curl.js b/build/tasks/curl.js new file mode 100644 index 00000000000..a753d3a3fc7 --- /dev/null +++ b/build/tasks/curl.js @@ -0,0 +1,76 @@ +module.exports = function ( grunt ) { + 'use strict'; + + var _ = grunt.util._, + async = grunt.util.async, + path = require( "path" ); + + var detectDestType = function(dest) { + if (grunt.util._.endsWith(dest, '/')) { + return 'directory'; + } else { + return 'file'; + } + }; + + var unixifyPath = function(filepath) { + if (process.platform === 'win32') { + return filepath.replace(/\\/g, '/'); + } else { + return filepath; + } + }; + + grunt.registerMultiTask( "curl", "Curls URLs built with files", function () { + var done = this.async(), + options = _.clone( this.options({ + baseUrl: "http://localhost/", + querystring: "?reload", + cwd: "." + })), + dry = grunt.option( "no-write" ) || grunt.option( "dry-run" ); + + async.forEach( + this.files, + function( filePair, nextFilePair ) { + var isExpandedPair = filePair.orig.expand || false; + + async.forEach( + filePair.src, + function( src, next ) { + var dest, + url = options.baseUrl + "/"; + if ( detectDestType( filePair.dest ) === 'directory') { + dest = ( isExpandedPair ) ? filePair.dest : unixifyPath( path.join( filePair.dest, path.relative( options.cwd, src ) )); + } else { + dest = path.relative( options.cwd, filePair.dest ); + } + + url += dest + options.querystring; + grunt.log.writeln( "Curling '" + url + "'" ); + if ( !dry ) { + grunt.util.spawn( + { + cmd: "curl", + args: [ url ] + }, + next + ); + } else { + next; + } + + }, nextFilePair + ); + + }, + function( err ) { + if ( err ) { + grunt.log.error( err ); + done( false ); + } + done( true ); + } + ); + }); +}; \ No newline at end of file diff --git a/build/tasks/recurse.js b/build/tasks/recurse.js new file mode 100644 index 00000000000..f4474ac390c --- /dev/null +++ b/build/tasks/recurse.js @@ -0,0 +1,30 @@ +module.exports = function( grunt ) { + "use strict"; + + grunt.registerTask( "recurse", function() { + var done = this.async(), + args = [].slice.call( arguments ), + gruntArgs = process.argv.slice( 1 ).filter( function( arg ) { return /^--/.test( arg ); }); + + + var child = grunt.util.spawn({ + cmd: process.argv[1] + ( process.platform === "win32" ? ".cmd" : "" ), + args: gruntArgs.concat( args ), + }, function( err, result ) { + if ( err ) { + grunt.log.error( result.stderr ); + done( err ); + return; + } + + grunt.log.writeln( result.stdout.replace("Done, without errors.", "") ); + + done(); + }); + + child.stdout.setEncoding( "utf8" ); + child.stdout.on( "data", function( data ) { + grunt.log.write( data ); + }); + }); +}; \ No newline at end of file diff --git a/build/tasks/release.js b/build/tasks/release.js new file mode 100644 index 00000000000..d9ef07267d0 --- /dev/null +++ b/build/tasks/release.js @@ -0,0 +1,130 @@ +module.exports = function( grunt ) { + "use strict"; + + var releaseBranch, + releaseVersion, + isDryRun = !!grunt.option( "no-write" ), + major, minor, patch, xbeta, isBeta, + version, + nextVersion; + + grunt.registerTask( "release:init", function() { + releaseBranch = grunt.option( "releaseBranch" ) || "master"; + releaseVersion = grunt.option( "releaseVersion" ) || grunt.config.get( "version" ); + + grunt.log.debug( "dry run: " + isDryRun ); + grunt.log.debug( "releaseBranch: " + releaseBranch ); + grunt.log.debug( "releaseVersion: " + releaseVersion ); + + // First arg should be the version number being released + var _ = grunt.util._, + newver, oldver, + options = grunt.config.get( "release.options", { + versionRegExp: /^(\d)\.(\d+)\.(\d)(-(?:a|b|rc)\.\d|pre)$/ + }), + rversion = options.versionRegExp, + version = ( releaseVersion || "" ).toLowerCase().match( rversion ) || {}; + + major = version[1], + minor = version[2], + patch = version[3], + xbeta = version[4], + isBeta = !!xbeta; + + grunt.log.debug( "options: " + JSON.stringify( options ) ); + + grunt.log.debug( "major: " + major ); + grunt.log.debug( "minor: " + minor ); + grunt.log.debug( "patch: " + patch ); + + if ( !releaseBranch || !major || !minor || !patch ) { + grunt.fatal( "Usage: --releaseBranch=releaseBranch --releaseVersion=releaseVersion" ); + } + + grunt.config.set( "version", releaseVersion ); + }); + + grunt.registerTask( "release:fail-if-pre", function() { + if ( xbeta === "pre" ) { + grunt.fatal( "Cannot release a '"+xbeta+"' version!" ); + } + }); + + grunt.registerTask( "release:set-version", function( newVersion ) { + var done = this.async(), + pkg = grunt.file.read( "package.json" ), + newVersion = newVersion || releaseVersion; + + console.log( "Setting version to: " + newVersion ); + + if ( !isDryRun ) { + var file = pkg.replace(/['|"]version['|"][ ]*:[ ]*['|"].*['|"]/i, function(match, attr) { + return '"version": "' + newVersion + '"'; + }); + } + + grunt.file.write( "package.json", pkg ); + + if ( !isDryRun ) { + grunt.util.spawn( + { + cmd: "git", + args: [ "commit", "package.json", "-m Bumped version to: "+ newVersion ] + }, + function ( err, result ) { + if ( err ) { + grunt.log.error( err ); + return done( false ); + } + + done(); + } + ); + } + + grunt.log.ok( "Version bumped to " + newVersion ); + }); + + grunt.registerTask( "release:set-next-version", function() { + var pkg = grunt.config.get( "pkg" ); + + console.log( "Current version is " + pkg.version ); + nextVersion = major + "." + minor + "." + ( isBeta ? patch : +patch + 1 ) + "pre"; + console.log( "Next version is " + nextVersion ); + + grunt.task.run( "release:set-version:" + nextVersion ); + }); + + grunt.registerTask( 'release:git:status', 'Retrieve git status and ensures the workspace is clean', function() { + var done = this.async(); + + grunt.util.spawn( + { + cmd: "git", + args: [ "status" ] + }, + function ( err, result ) { + if ( err ) { + grunt.log.error( err ); + return done( false ); + } + + var stdout = result.stdout, + onBranch = ((stdout || "").match( /On branch (\S+)/ ) || [])[1]; + + if ( onBranch !== releaseBranch ) { + grunt.fatal( "Branches don't match: Wanted " + releaseBranch + ", got " + onBranch ); + } + if ( /Changes to be committed/i.test( stdout ) ) { + grunt.warn( "Please commit changed files before attemping to push a release." ); + } + if ( /Changes not staged for commit/i.test( stdout ) ) { + grunt.warn( "Please stash files before attempting to push a release." ); + } + done(); + } + ); + }); + + grunt.registerTask( 'release', [ "release:init", "release:git:status" ]); +}; \ No newline at end of file diff --git a/build/tasks/rsync.js b/build/tasks/rsync.js new file mode 100644 index 00000000000..accb0ff9d1f --- /dev/null +++ b/build/tasks/rsync.js @@ -0,0 +1,123 @@ +/* + * Adapted from https://github.com/maxdaten/grunt-rsync + * + * Copyright (c) 2012 Jan-Philip Loos + * Licensed under the MIT license. + */ + +module.exports = function ( grunt ) { + 'use strict'; + + var _ = grunt.util._, + async = grunt.util.async, + path = require( "path" ); + + grunt.registerMultiTask( "rsync", "Copy files to a (remote) machine with rsync.", function () { + var done = this.async(), + options = _.clone( this.options({ + user: "", + host: "localhost", + cwd: ".", + remoteBase: "~", + verbose: false, + preserveTimes: false, + preservePermissions: true, + compression: true, + createDirs: true, + recursive: true, + additionalOptions: [] + }) ), + dry = grunt.option( "no-write" ), + args = [], + url = ( options.user ? options.user + "@" : "" ) + options.host + ":" + options.remoteBase; + + // these flags must be set before the src/dest args + if ( options.recursive ) { + args.push( "-r" ); + } + + if ( options.verbose ) { + args.push( "-v" ); + } + + if ( options.preserveTimes ) { + args.push( "-t" ); + } + + if ( options.preservePermissions ) { + args.push( "-p" ); + } + + if ( options.compression ) { + args.push( "-z" ); + } + + if ( options.createDirs ) { + args.push( "--dirs" ); + } + + if ( dry ) { + args.push( "--dry-run" ); + } + + if ( options.additionalOptions.length ) { + args = args.concat( options.additionalOptions ); + } + + var detectDestType = function(dest) { + if ( _.endsWith( dest, '/' ) ) { + return 'directory'; + } else { + return 'file'; + } + }; + + var unixifyPath = function( filepath ) { + if (process.platform === 'win32') { + return filepath.replace(/\\/g, '/'); + } else { + return filepath; + } + }; + + async.forEach( + this.files, + function( filePair, nextFilePair ) { + var isExpandedPair = filePair.orig.expand || false; + var src = filePair.src[0], + dest; + + async.forEach( + filePair.src, + function(src, next) { + if ( detectDestType( filePair.dest ) === 'directory') { + dest = ( isExpandedPair ) ? filePair.dest : unixifyPath( path.join( filePair.dest, path.relative( options.cwd, src ) )); + } else { + dest = path.relative( options.cwd, filePair.dest ); + } + + grunt.log.writeln( "Copying '" + src + "' to '" + path.join( url, dest ) + "'" ); + grunt.util.spawn( + { + cmd: "rsync", + args: args.concat([ + src, + path.join( url, dest ) + ]) + }, + next + ); + }, nextFilePair + ); + + }, + function( err ) { + if ( err ) { + grunt.log.error( err ); + done( false ); + } + done( true ); + } + ); + }); +}; \ No newline at end of file From 827f2a54681069356aa0d25256d6ef90e56aec70 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 28 Feb 2013 22:18:29 -0700 Subject: [PATCH 68/94] Build: Added deploy tasks ( WIP ) --- Gruntfile.js | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 570e0201fb4..1e633546e5e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -364,6 +364,52 @@ module.exports = function( grunt ) { }()) } } + }, + + rsync: { + options: { + user: "ghislain.seguin", + host: "localhost", +// user: "jqadmin", +// host: "code.origin.jquery.com", + remoteBase: "/var/www/html/code.jquery.com/mobile/", + cwd: "dist" //removes the dist directory from the destination + }, + release: { + files: { + "jquery.mobile-<%= pkg.version %>.js": path.join( dist, "jquery.mobile.js" ), + "jquery.mobile-<%= pkg.version %>.min.js": path.join( dist, "jquery.mobile.min.js" ), + "jquery.mobile-<%= pkg.version %>.min.map": path.join( dist, "jquery.mobile.min.map" ), + "jquery.mobile-<%= pkg.version %>.css": path.join( dist, "jquery.mobile.css" ), + "jquery.mobile-<%= pkg.version %>.min.css": path.join( dist, "jquery.mobile.min.css" ), + "jquery.mobile.structure-<%= pkg.version %>.css": path.join( dist, "jquery.mobile.structure.css" ), + "jquery.mobile.structure-<%= pkg.version %>.min.css": path.join( dist, "jquery.mobile.structure.min.css" ), + "jquery.mobile.structure-<%= pkg.version %>.zip": path.join( dist, "jquery.mobile.structure.min.css" ) + } + }, + latest: { + files: { + "latest/": path.join( dist, "jquery.mobile.*" ) + } + } + }, + + curl: { + options: { + baseUrl: "http://code.origin.jquery.com/mobile/", + cwd: dist + }, + latest: { + files: { + "latest/": path.join( dist, "jquery.mobile.*" ) + } + } + }, + + release: { + options: { + versionRegExp: /^(\d)\.(\d+)\.(\d)(-(?:alpha|beta|rc)\.\d|pre)?$/ + } } }); @@ -384,6 +430,10 @@ module.exports = function( grunt ) { grunt.registerTask( "test", [ "config:dev", "requirejs", "connect", "qunit:http" ] ); grunt.registerTask( "test:ci", [ "qunit_junit", "connect", "qunit:http" ] ); + grunt.registerTask( "deploy:latest", [ "release:init", "release:git:status", "dist:release", "rsync:latest", "curl:latest" ] ); + grunt.registerTask( "deploy:release", ["release:init", "release:git:status", "release:set-version", "recurse:_deploy", "release:set-next-version" ] ); + grunt.registerTask( "_deploy", [ "release:init", "release:fail-if-pre", "dist:release", "rsync:release" ] ); + // Default grunt grunt.registerTask( "default", [ "dist" ] ); From b45797f9596a8966ef8ff236a77aa0d2a34c4b7a Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 28 Feb 2013 22:25:36 -0700 Subject: [PATCH 69/94] Changed version to 1.4.0pre --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ac4cbd82363..93c975e8d6e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "jquery-mobile", "title": "jQuery Mobile", "description": "Touch-Optimized Web Framework for Smartphones & Tablets", - "version": "1.4.0-alpha.1", + "version": "1.4.0pre", "homepage": "http://jquerymobile.com", "author": { "name": "jQuery Foundation Inc. and other contributors", From d388d1af85555ec01e91429176744e20d0464c0a Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 12:07:36 -0700 Subject: [PATCH 70/94] Build: Fixed up release:set-version --- build/tasks/release.js | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/build/tasks/release.js b/build/tasks/release.js index d9ef07267d0..44c177a0b3c 100644 --- a/build/tasks/release.js +++ b/build/tasks/release.js @@ -52,37 +52,42 @@ module.exports = function( grunt ) { grunt.registerTask( "release:set-version", function( newVersion ) { var done = this.async(), - pkg = grunt.file.read( "package.json" ), - newVersion = newVersion || releaseVersion; + pkg = grunt.file.readJSON( "package.json" ), + newVersion = newVersion || releaseVersion, + gitArgs = [ "commit", "-m", "'Changed version to: "+ newVersion+"'", "package.json" ], + child; console.log( "Setting version to: " + newVersion ); - if ( !isDryRun ) { - var file = pkg.replace(/['|"]version['|"][ ]*:[ ]*['|"].*['|"]/i, function(match, attr) { - return '"version": "' + newVersion + '"'; - }); - } + pkg.version = newVersion; + + grunt.file.write( "package.json", JSON.stringify( pkg, null, "\t" ) ); - grunt.file.write( "package.json", pkg ); + grunt.log.writeln( "`git " + gitArgs.join( " " ) + "`" ); if ( !isDryRun ) { - grunt.util.spawn( + // No point even running git in dry-run because there is nothing to commit + child = grunt.util.spawn( { cmd: "git", - args: [ "commit", "package.json", "-m Bumped version to: "+ newVersion ] + args: gitArgs }, function ( err, result ) { if ( err ) { - grunt.log.error( err ); + grunt.log.error( result.stderr ); return done( false ); } + grunt.log.ok( "Version bumped to " + newVersion ); done(); } ); - } - grunt.log.ok( "Version bumped to " + newVersion ); + child.stdout.setEncoding( "utf8" ); + child.stdout.on( "data", function( data ) { + grunt.log.write( data ); + }); + } }); grunt.registerTask( "release:set-next-version", function() { From 0fc724bf69daa00c2dbd91e087f84a687d96ec18 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 12:08:57 -0700 Subject: [PATCH 71/94] Cleaned up old build system --- Makefile | 64 ---------- build/bin/build_latest.sh | 4 - build/bin/clean.sh | 4 - build/bin/config.sh | 57 --------- build/bin/contrib.sh | 13 -- build/bin/css.sh | 35 ------ build/bin/deploy.sh | 25 ---- build/bin/deploy_latest.sh | 9 -- build/bin/deploy_nightlies.sh | 3 - build/bin/docs.sh | 92 -------------- build/bin/init.sh | 3 - build/bin/js.sh | 26 ---- build/bin/zip.sh | 12 -- grunt.js | 220 ---------------------------------- 14 files changed, 567 deletions(-) delete mode 100644 Makefile delete mode 100644 build/bin/build_latest.sh delete mode 100644 build/bin/clean.sh delete mode 100644 build/bin/config.sh delete mode 100644 build/bin/contrib.sh delete mode 100644 build/bin/css.sh delete mode 100644 build/bin/deploy.sh delete mode 100644 build/bin/deploy_latest.sh delete mode 100644 build/bin/deploy_nightlies.sh delete mode 100644 build/bin/docs.sh delete mode 100644 build/bin/init.sh delete mode 100644 build/bin/js.sh delete mode 100644 build/bin/zip.sh delete mode 100644 grunt.js diff --git a/Makefile b/Makefile deleted file mode 100644 index fcc8d8e222b..00000000000 --- a/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# in build/bin/config.sh this setting will alter the variable definitions to match -# the changes for the deploy target in the makefile. temp solution -ARGS = IS_DEPLOY_TARGET=false -deploy: ARGS = IS_DEPLOY_TARGET=true - -# The output folder for the finished files -OUTPUT = compiled - -# Build Targets -# When no build target is specified, all gets ran -all: css js zip notify - -clean: init - @@node node_modules/.bin/grunt clean - -# Create the output directory. -# NOTE it doesn't appear as though you can override init from a task file -init: - @@if ! (node -v | grep "\(v0.[6-9]\|v[1-9].[0-9]\)" > /dev/null); then echo "!!! node.js > 0.6.x required" && exit 1; fi - @@npm install - @@node node_modules/.bin/grunt custom_init - -# Build and minify the CSS files -css: init - @@${ARGS} node node_modules/.bin/grunt css - -# Build and minify the JS files -js: init - @@${ARGS} node node_modules/.bin/grunt js - -# ------------------------------------------------- -# -# For jQuery Team Use Only -# -# ------------------------------------------------- -docs: init js css - @@${ARGS} node node_modules/.bin/grunt docs - -# Output a message saying the process is complete -notify: init - @@echo "The files have been built and are in: " $$(pwd)/${OUTPUT} - - -# Zip up the jQm files without docs -zip: init css js - @@${ARGS} bash build/bin/zip.sh - -build_latest: css docs js zip - @@${ARGS} bash build/bin/build_latest.sh - -# Push the latest git version to the CDN. This is done on a post commit hook -deploy_latest: - @@${ARGS} bash build/bin/deploy_latest.sh - -# TODO target name preserved to avoid issues during refactor, latest -> deploy_latest -latest: build_latest deploy_latest - -# Push the nightly backups. This is done on a server cronjob -deploy_nightlies: - @@${ARGS} bash build/bin/deploy_nightlies.sh - -# Deploy a finished release. This is manually done. -deploy: clean init css js docs zip - @@${ARGS} bash build/bin/deploy.sh diff --git a/build/bin/build_latest.sh b/build/bin/build_latest.sh deleted file mode 100644 index afe378ee7f8..00000000000 --- a/build/bin/build_latest.sh +++ /dev/null @@ -1,4 +0,0 @@ -source build/bin/config.sh - -# Copy over the lib js, avoid the compiled stuff, to get the defines for tests/unit/* -find js -name "*.js" -not -name "*.docs.js" -not -name "*.mobile.js" | xargs -L1 -I FILENAME cp FILENAME $OUTPUT/demos/js/ \ No newline at end of file diff --git a/build/bin/clean.sh b/build/bin/clean.sh deleted file mode 100644 index 6571defd616..00000000000 --- a/build/bin/clean.sh +++ /dev/null @@ -1,4 +0,0 @@ -source build/bin/config.sh - -rm -rf $OUTPUT -rm -rf tmp diff --git a/build/bin/config.sh b/build/bin/config.sh deleted file mode 100644 index 77493280c91..00000000000 --- a/build/bin/config.sh +++ /dev/null @@ -1,57 +0,0 @@ -# fail on any subcommand failure -set -e - -# Helper Variables -# The command to replace the @VERSION in the files with the actual version -HEAD_SHA=$(git log -1 --format=format:"%H") -BUILD_SHA=$(git log -1 --format=format:"Git Build: SHA1: %H <> Date: %cd") -VER_MIN="/*! jQuery Mobile v$BUILD_SHA jquerymobile.com | jquery.org/license !*/" -VER_OFFICIAL=$(cat version.txt) -SED_VER_REPLACE="s/__version__/\"$VER_OFFICIAL\"/g" -SED_INPLACE_EXT="whyunowork" - -function sed_ver_api { - sed "$SED_VER_REPLACE" -} - -function ver { - sed "s/v@VERSION/$BUILD_SHA/" -} - -function clear_zip_files { - find $1 -name "*.zip" | xargs -L1 -I FILENAME rm FILENAME -} - -# The output folder for the finished files -OUTPUT="compiled" - -# The name of the files -NAME="jquery.mobile" -DEMOSNAME="jquery.mobile.demos" -BASE_NAME="jquery.mobile" -THEME_FILENAME="jquery.mobile.theme" -STRUCTURE="jquery.mobile.structure" - -# The CSS theme being used -THEME="default" - -# If node is available then use node to run r.js -# otherwise use good old rhino/java -NODE=/usr/local/bin/node - -RUN_JS='java -XX:ReservedCodeCacheSize=64m -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main' - -if [ -x $NODE ]; then - RUN_JS=$NODE -fi - -if [ $IS_DEPLOY_TARGET == "true" ]; then - function ver { - sed "s/v@VERSION/${VER_OFFICIAL} ${HEAD_SHA}/" - } - - VER_MIN="/*! jQuery Mobile v${VER_OFFICIAL} ${HEAD_SHA} jquerymobile.com | jquery.org/license !*/" - NAME="jquery.mobile-${VER_OFFICIAL}" - THEME_FILENAME="jquery.mobile.theme-${VER_OFFICIAL}" - STRUCTURE="jquery.mobile.structure-${VER_OFFICIAL}" -fi diff --git a/build/bin/contrib.sh b/build/bin/contrib.sh deleted file mode 100644 index 703fbd17ddd..00000000000 --- a/build/bin/contrib.sh +++ /dev/null @@ -1,13 +0,0 @@ -set -e - -if [ $# -ne 2 ]; then - echo "please supply two versions, eg contribs.sh 1.1.0 1.1.0" - exit 1; -fi - -format_contributors='%aN%n%cN'; -LC_ALL='C' git whatchanged $1..$2 --pretty=format:"$format_contributors" \ -| sed '/^:/ d' \ -| sed '/^$/ d' \ -| sort \ -| uniq diff --git a/build/bin/css.sh b/build/bin/css.sh deleted file mode 100644 index 775a8bbe740..00000000000 --- a/build/bin/css.sh +++ /dev/null @@ -1,35 +0,0 @@ -source build/bin/config.sh - -# Build the CSS file with the theme included -$RUN_JS \ - external/r.js/dist/r.js \ - -o cssIn=css/themes/default/jquery.mobile.css \ - optimizeCss=standard.keepComments.keepLines \ - out=$OUTPUT/$NAME.compiled.css -cat LICENSE-INFO.txt | ver > $OUTPUT/$NAME.css -cat $OUTPUT/$NAME.compiled.css >> $OUTPUT/$NAME.css -echo $VER_MIN > $OUTPUT/$NAME.min.css -java -XX:ReservedCodeCacheSize=64m -jar build/yuicompressor-2.4.6.jar --type css $OUTPUT/$NAME.compiled.css >> $OUTPUT/$NAME.min.css -rm $OUTPUT/$NAME.compiled.css -# Build the CSS Structure-only file -$RUN_JS external/r.js/dist/r.js \ - -o cssIn=css/structure/jquery.mobile.structure.css \ - out=$OUTPUT/$STRUCTURE.compiled.css -cat LICENSE-INFO.txt | ver > $OUTPUT/$STRUCTURE.css -cat $OUTPUT/$STRUCTURE.compiled.css >> $OUTPUT/$STRUCTURE.css -# ..... and then minify it -echo $VER_MIN > $OUTPUT/$STRUCTURE.min.css -java -XX:ReservedCodeCacheSize=64m \ - -jar build/yuicompressor-2.4.6.jar \ - --type css $OUTPUT/$STRUCTURE.compiled.css >> $OUTPUT/$STRUCTURE.min.css -rm $OUTPUT/$STRUCTURE.compiled.css -# Build the theme only file -cat LICENSE-INFO.txt | ver > $OUTPUT/$THEME_FILENAME.css -cat css/themes/default/jquery.mobile.theme.css >> $OUTPUT/$THEME_FILENAME.css -# ..... and then minify it -echo $VER_MIN > $OUTPUT/$THEME_FILENAME.min.css -java -XX:ReservedCodeCacheSize=64m \ - -jar build/yuicompressor-2.4.6.jar \ - --type css $OUTPUT/$THEME_FILENAME.css >> $OUTPUT/$THEME_FILENAME.min.css -# Copy in the images -cp -R css/themes/$THEME/images $OUTPUT/ diff --git a/build/bin/deploy.sh b/build/bin/deploy.sh deleted file mode 100644 index cdd9964e14e..00000000000 --- a/build/bin/deploy.sh +++ /dev/null @@ -1,25 +0,0 @@ -source build/bin/config.sh - -if [ ! -n "$(git tag -l $VER_OFFICIAL)" ]; then - echo "!!! tag the version of the library before deploying" - exit 1; -fi - -# Deploying all the files to the CDN -mkdir -p tmp -cp -R $OUTPUT tmp/$VER_OFFICIAL -scp -qr tmp/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/ -rm -rf tmp/$VER_OFFICIAL -mv $OUTPUT/demos tmp/$VER_OFFICIAL -# Create the Demos/Docs/Tests/Tools for jQueryMobile.com -# ... By first replacing the paths -# TODO update jQuery Version replacement on deploy -find tmp/$VER_OFFICIAL -type f \ - \( -name '*.html' -o -name '*.php' \) \ - -exec perl -pi -e \ - "s|src=\"(.*)$BASE_NAME.js\"|src=\"//code.jquery.com/mobile/$VER_OFFICIAL/$NAME.min.js\"|g;s|href=\"(.*)$BASE_NAME.css\"|href=\"//code.jquery.com/mobile/$VER_OFFICIAL/$NAME.min.css\"|g;s|src=\"(.*)jquery.js\"|src=\"//code.jquery.com/jquery-1.7.1.min.js\"|g" {} \; -# ... So they can be copied to jquerymobile.com -scp -qr tmp/* jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/ -# Do some cleanup to wrap it up -rm -rf tmp -rm -rf $OUTPUT diff --git a/build/bin/deploy_latest.sh b/build/bin/deploy_latest.sh deleted file mode 100644 index 8aaf331a898..00000000000 --- a/build/bin/deploy_latest.sh +++ /dev/null @@ -1,9 +0,0 @@ -source build/bin/config.sh - -# Push the latest git version to the CDN. This is done on a post commit hook -cp -r $OUTPUT/* /var/www/html/code.jquery.com/mobile/latest/ - -for file in `ls $OUTPUT/jquery.mobile*`; do - filename=`echo $file | sed "s/$OUTPUT\///"` - curl "http://code.origin.jquery.com/mobile/latest/$filename?reload" -done \ No newline at end of file diff --git a/build/bin/deploy_nightlies.sh b/build/bin/deploy_nightlies.sh deleted file mode 100644 index 87280975621..00000000000 --- a/build/bin/deploy_nightlies.sh +++ /dev/null @@ -1,3 +0,0 @@ -source build/bin/config.sh - -scp -qr $OUTPUT jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/nightlies/$(date "+%Y%m%d") \ No newline at end of file diff --git a/build/bin/docs.sh b/build/bin/docs.sh deleted file mode 100644 index 3b3106a15a1..00000000000 --- a/build/bin/docs.sh +++ /dev/null @@ -1,92 +0,0 @@ -source build/bin/config.sh - -mkdir -p tmp/demos/js -mkdir -p tmp/demos/css/themes/$THEME -# ... Copy script files -cp compiled/*.js tmp/demos/js -cp js/jquery.js tmp/demos/js -# ... Copy html files -cp index.php tmp/demos -cp -r docs tmp/demos/ -# ... Copy css and images -cp compiled/*.css tmp/demos/css/themes/$THEME -cp -r compiled/images tmp/demos/css/themes/$THEME - -# NOTE the deletion here is required by gnu/bsd sed differences -# reset the docs specific js reference -find tmp/demos \( -name '*.html' -o -name '*.php' \) -exec sed -i${SED_INPLACE_EXT} -e "s@_assets/js/.*\"@_assets/js/$DEMOSNAME.js\"@" {} \; -find tmp/demos -name "*$SED_INPLACE_EXT" -exec rm {} \; - -# reset the javascript references -find tmp/demos \( -name '*.html' -o -name '*.php' \) -exec sed -i${SED_INPLACE_EXT} -e "s@js/\"@js/$NAME.js\"@" {} \; -find tmp/demos -name "*$SED_INPLACE_EXT" -exec rm {} \; - -# make sure the docs reference the right css file names (for deploy) -find tmp/demos \( -name '*.html' -o -name '*.php' \) -exec sed -i${SED_INPLACE_EXT} -e "s@$BASE_NAME.css\"@$NAME.css\"@" {} \; -find tmp/demos -name "*$SED_INPLACE_EXT" -exec rm {} \; - -# make sure the docs reference the right css file names (for deploy) -# ignore the redirect directory since it requires php -find tmp/demos \( -name '*.php' ! -wholename "*redirect*" \)| while read file; do - rename=`echo $file | sed 's/php/html/'` - mv $file "$rename" -done - -# NOTE SPECIAL CASE -# fix the index of the redirect sample -mv tmp/demos/docs/examples/redirect/index.php tmp/demos/docs/examples/redirect/index.html - -function inline { - for file in $1; do - file_dir=$(echo $file | sed "s/\/[^\/]*.html$/\//") - - # remove the php leaving only a list of relative html file paths - includes=$(grep -h "\?php include(" $file | sed "s///g" | sed "s/\s*//") - - # for each relative path resolve it and replac the corresponding php - # include in the file with the resolved files contents - for include_relative in $includes; do - # the html extension file include - html_include=$(echo $include_relative | sed "s/.php/.html/") - - # the fully resolved path, NOTE readlink should be standard - full_file_path=$(readlink -m $file_dir$html_include) - - # construct the include script replace, removing the path delimiters - # and the double dot refs to prevent sed from borking - include_string="" - - # replace the include string with the resolved file contents - sed -i$SED_INPLACE_EXT "/$include_string/{ - s/$include_string//g - r $full_file_path - }" $file - - find tmp/demos -name "*$SED_INPLACE_EXT" -exec rm {} \; - done - done -} - -# find all the files with php includes, do the work on includes that will -# be inlined into other files first -# NOTE SPECIAL CASE -inline "tmp/demos/docs/global-nav.html tmp/demos/docs/search.html" -for file in $(grep -lr "\?php include(" tmp/demos/); do - inline $file -done - -# replace link references from php with references to html -find tmp/demos \( -name '*.html' \) -exec sed -i${SED_INPLACE_EXT} -e "s@.php\"@.html\"@" {} \; -find tmp/demos -name "*$SED_INPLACE_EXT" -exec rm {} \; - -# clean out the compiled directory demos and cp the new output -cp -R tmp/demos $OUTPUT - -# clear out old zip files -clear_zip_files $OUTPUT - -# create the docs zip in the output directory using the demo files -cd compiled/demos && zip -rq ../../$OUTPUT/$NAME.docs.zip * && cd - - -# Finish by removing the temporary files -rm -rf tmp diff --git a/build/bin/init.sh b/build/bin/init.sh deleted file mode 100644 index 1ffe7d00006..00000000000 --- a/build/bin/init.sh +++ /dev/null @@ -1,3 +0,0 @@ -source build/bin/config.sh - -mkdir -p $OUTPUT diff --git a/build/bin/js.sh b/build/bin/js.sh deleted file mode 100644 index 8dd6ad2745c..00000000000 --- a/build/bin/js.sh +++ /dev/null @@ -1,26 +0,0 @@ -source build/bin/config.sh - -# Build the JavaScript file -$RUN_JS \ - external/r.js/dist/r.js \ - -o baseUrl="js" \ - name=jquery.mobile \ - exclude=jquery,../external/requirejs/order,../external/requirejs/depend,../external/requirejs/text,../external/requirejs/text!../version.txt \ - out=$OUTPUT/$NAME.compiled.js \ - pragmasOnSave.jqmBuildExclude=true \ - wrap.startFile=build/wrap.start \ - wrap.endFile=build/wrap.end \ - findNestedDependencies=true \ - skipModuleInsertion=true \ - optimize=none -cat LICENSE-INFO.txt | ver > $OUTPUT/$NAME.js -cat $OUTPUT/$NAME.compiled.js | sed_ver_api >> $OUTPUT/$NAME.js -rm $OUTPUT/$NAME.compiled.js -echo $VER_MIN > $OUTPUT/$NAME.min.js -java -XX:ReservedCodeCacheSize=64m \ - -jar build/google-compiler-20111003.jar \ - --js $OUTPUT/$NAME.js \ - --js_output_file $OUTPUT/$NAME.compiled.js -cat $OUTPUT/$NAME.compiled.js >> $OUTPUT/$NAME.min.js -rm $OUTPUT/$NAME.compiled.js - diff --git a/build/bin/zip.sh b/build/bin/zip.sh deleted file mode 100644 index d4fcffa9b90..00000000000 --- a/build/bin/zip.sh +++ /dev/null @@ -1,12 +0,0 @@ -source build/bin/config.sh - -# Packaging up the files into a zip archive -mkdir -p tmp -cp -R $OUTPUT tmp/$NAME - -# ... And remove the Zipped docs so they aren't included twice (for deploy scripts) -# clear out old zip files -clear_zip_files tmp/$NAME - -cd tmp && zip -rq ../$OUTPUT/$NAME.zip $NAME && cd - -rm -r tmp diff --git a/grunt.js b/grunt.js deleted file mode 100644 index cafec348cf2..00000000000 --- a/grunt.js +++ /dev/null @@ -1,220 +0,0 @@ -var path = require( 'path' ), fs = require( 'fs' ); - -module.exports = function( grunt ) { - var dirs, names, min = {}, cssmin = {}, - theme, rootFile, structureFile, themeFile, demosjsFile, - verOfficial, suffix; - - dirs = { - output: 'compiled', - temp: 'tmp' - }; - - verOfficial = grunt.file.read( 'version.txt' ).replace(/\n/, ''); - - suffix = process.env.IS_DEPLOY_TARGET === "true" ? "-" + verOfficial : ""; - - names= { - base: 'jquery.mobile' + suffix, - // this will change for the deploy target to include version information - root: 'jquery.mobile' + suffix, - demosjs: 'jquery.mobile.demos', - structure: 'jquery.mobile.structure' + suffix, - theme: 'jquery.mobile.theme' + suffix - }; - - function outputPath( name ){ - return path.join( dirs.output, name ); - } - - demosjsFile = path.join( dirs.output, "demos", "docs", "_assets", "js", names.demosjs ); - rootFile = outputPath( names.root ); - structureFile = outputPath( names.structure ); - themeFile = outputPath( names.theme ); - - // TODO again, I'd like to use grunt params but I'm not sure - // how to get that working with a custom task with deps - theme = process.env.THEME || 'default'; - - // Project configuration. - grunt.config.init({ - jshint: { - options: { - curly: true, - eqeqeq: true, - - // (function(){})() seems acceptable - immed: false, - latedef: true, - newcap: true, - noarg: true, - sub: true, - undef: true, - boss: true, - eqnull: true, - browser: true - }, - - globals: { - jQuery: true, - "$": true, - - // qunit globals - // TODO would be nice to confine these to test files - module: true, - ok: true, - test: true, - asyncTest: true, - same: true, - start: true, - stop: true, - expect: true, - - // require js global - define: true, - require: true - } - }, - - // TODO add test files here once we can specify different configs for - // different globs - lint: { - files: [ 'js/**/*.mobile.*.js', 'js/*/*.js' ] - }, - - // NOTE these configuration settings are used _after_ compilation has taken place - // using requirejs. Thus the .compiled extensions. The exception being the theme concat - concat: { - js: { - src: [ '', rootFile + '.compiled.js' ], - dest: rootFile + '.js' - }, - - demosjs: { - src: [ - path.join( 'docs', '_assets', 'js', 'jqm-demos.js' ), - path.join( 'docs', '_assets', 'js', 'view-source.js' ), - path.join( 'docs', '_assets', 'js', 'h2widget.js'), - path.join( 'docs', '_assets', 'js', 'globalnav.js') - ], - dest: demosjsFile + '.js' - }, - - structure: { - src: [ '', structureFile + '.compiled.css' ], - dest: structureFile + '.css' - }, - - regular: { - src: [ '', rootFile + '.compiled.css' ], - dest: rootFile + '.css' - }, - - theme: { - src: [ - '', - 'css/themes/' + theme + '/jquery.mobile.theme.css' - ], - dest: themeFile + '.css' - } - }, - - // NOTE the keys are filenames which, being stored as variables requires that we use - // key based assignment. See below. - min: undefined, - cssmin: undefined, - - // JS config, mostly the requirejs configuration - js: { - require: { - baseUrl: 'js', - name: 'jquery.mobile', - exclude: [ - 'jquery', - 'depend', - 'text', - 'text!../version.txt' - ], - out: rootFile + '.compiled.js', - pragmasOnSave: { jqmBuildExclude: true }, - wrap: { startFile: 'build/wrap.start', endFile: 'build/wrap.end' }, - findNestedDependencies: true, - skipModuleInsertion: true, - optimize: 'none' - } - }, - - // CSS config, mostly the requirejs configuration - css: { - theme: process.env.THEME || 'default', - - themeFile: themeFile, - - require: { - all: { - cssIn: 'css/themes/default/jquery.mobile.css', - optimizeCss: 'standard.keepComments.keepLines', - baseUrl: '.', - out: rootFile + '.compiled.css' - }, - - structure: { - cssIn: 'css/structure/jquery.mobile.structure.css', - out: structureFile + '.compiled.css' - } - } - }, - - global: { - dirs: dirs, - - names: names, - - files: { - license: 'LICENSE-INFO.txt' - }, - - // other version information is added via the asyncConfig helper that - // depends on git commands (eg ver.min, ver.header) - ver: { - official: verOfficial, - min: '/*! jQuery Mobile v<%= build_sha %> jquerymobile.com | jquery.org/license !*/', - gitLongSha: 'git log -1 --format=format:"Git Build: SHA1: %H <> Date: %cd"', - gitShortSha: 'git log -1 --format=format:"%H"' - }, - - shas: {} - } - }); - - // MIN configuration - min[ rootFile + '.min.js' ] = [ "", rootFile + '.js' ]; - grunt.config.set( 'min', min ); - - // CSSMIN configuration - cssmin[ rootFile + '.min.css' ] = [ "", rootFile + '.css' ]; - cssmin[ structureFile + '.min.css' ] = [ "", structureFile + '.css' ]; - cssmin[ themeFile + '.min.css' ] = [ "", themeFile + '.css' ]; - grunt.config.set( 'cssmin', cssmin ); - - // set the default task. - grunt.registerTask('default', 'lint'); - - // csslint and cssmin tasks - grunt.loadNpmTasks( "grunt-css" ); - - // authors task - grunt.loadNpmTasks( "grunt-git-authors" ); - - grunt.loadNpmTasks( "grunt-junit" ); - - // A convenient task alias. - grunt.registerTask('test', 'config:test:pages config:test junit'); - - // Ease of use aliases for users who want the zip and docs - grunt.registerTask('docs', 'clean js css concat:demosjs legacy_tasks:docs'); - grunt.registerTask('zip', 'js css legacy_tasks:zip'); - - // load the project's default tasks - grunt.loadTasks( 'build/tasks'); -}; From cc7d264fbc553be89fc3200b7ee9e05a3851aa18 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 13:08:39 -0700 Subject: [PATCH 72/94] Build: use grunt-contrib-compress instead of grunt-zip --- Gruntfile.js | 19 +++++++------------ package.json | 4 ++-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1e633546e5e..68b8acd7648 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -30,6 +30,7 @@ module.exports = function( grunt ) { // grunt plugins grunt.loadNpmTasks( "grunt-contrib-jshint" ); grunt.loadNpmTasks( "grunt-contrib-copy" ); + grunt.loadNpmTasks( "grunt-contrib-compress" ); grunt.loadNpmTasks( "grunt-contrib-concat" ); grunt.loadNpmTasks( "grunt-contrib-connect" ); grunt.loadNpmTasks( "grunt-contrib-qunit" ); @@ -38,7 +39,6 @@ module.exports = function( grunt ) { grunt.loadNpmTasks( "grunt-css" ); grunt.loadNpmTasks( "grunt-git-authors" ); grunt.loadNpmTasks( "grunt-qunit-junit" ); - grunt.loadNpmTasks( "grunt-zip" ); // load the project's default tasks grunt.loadTasks( 'build/tasks'); @@ -266,19 +266,14 @@ module.exports = function( grunt ) { } }, - zip: { + compress: { dist: { options: { - baseDir: dist + archive: path.join( dist, name ) + ".zip" }, - // Files to zip together - src: [ - path.join( dist, "**" ), - "!<%= zip.dist.dest %>" - ], - - // Destination of zip file - dest: path.join( dist, name ) + ".zip" + files: [ + { expand: true, cwd: dist, src: [ "**", "!" + name + ".zip" ] } + ] } }, @@ -423,7 +418,7 @@ module.exports = function( grunt ) { grunt.registerTask( "demos", [ "concat:demos", "copy:demos.processed", "copy:demos.unprocessed" ] ); - grunt.registerTask( "dist:release", [ "js:release", "css:release", "copy:images", "demos", "zip:dist" ] ); + grunt.registerTask( "dist:release", [ "js:release", "css:release", "copy:images", "demos", "compress:dist" ] ); grunt.registerTask( "dist", [ "config:dev", "dist:release" ] ); diff --git a/package.json b/package.json index 93c975e8d6e..5d0f7b94ed2 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "devDependencies": { "async": "latest", "grunt": "0.4.x", + "grunt-contrib-compress": "~0.4.1" "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", "grunt-contrib-copy": "git://github.com/gruntjs/grunt-contrib-copy.git", @@ -35,8 +36,7 @@ "grunt-css": "git://github.com/jzaefferer/grunt-css.git", "grunt-git-authors": "1.1.0-beta.1", "grunt-qunit-junit": "latest", - "grunt-zip": "git://github.com/gseguin/grunt-zip.git#grunt-0.4", - "requirejs": "2.1.x" + "requirejs": "2.1.x", }, "main": "Gruntfile.js", "engines": { From 7b7e0ec6b78705827cdded95daee1fe7db130ee3 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 13:33:07 -0700 Subject: [PATCH 73/94] Build: Fixed syntax error in package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5d0f7b94ed2..88008eb63c2 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "devDependencies": { "async": "latest", "grunt": "0.4.x", - "grunt-contrib-compress": "~0.4.1" + "grunt-contrib-compress": "~0.4.1", "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", "grunt-contrib-copy": "git://github.com/gruntjs/grunt-contrib-copy.git", @@ -36,7 +36,7 @@ "grunt-css": "git://github.com/jzaefferer/grunt-css.git", "grunt-git-authors": "1.1.0-beta.1", "grunt-qunit-junit": "latest", - "requirejs": "2.1.x", + "requirejs": "2.1.x" }, "main": "Gruntfile.js", "engines": { From 06c3a818fdf7882db0795341e782462cf0069805 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 16:16:08 -0700 Subject: [PATCH 74/94] Demos: Fixed references to jqm-docs -> jqm-demos --- docs/widgets/footers/footer-persist-a.php | 4 ++-- docs/widgets/footers/footer-persist-b.php | 4 ++-- docs/widgets/footers/footer-persist-c.php | 4 ++-- docs/widgets/footers/footer-persist-d.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/widgets/footers/footer-persist-a.php b/docs/widgets/footers/footer-persist-a.php index f4bc534105d..a8ec40c8bd7 100644 --- a/docs/widgets/footers/footer-persist-a.php +++ b/docs/widgets/footers/footer-persist-a.php @@ -5,10 +5,10 @@ jQuery Mobile Framework - Persistent footer A - + - + diff --git a/docs/widgets/footers/footer-persist-b.php b/docs/widgets/footers/footer-persist-b.php index 92f5f29fca8..a7b92455772 100644 --- a/docs/widgets/footers/footer-persist-b.php +++ b/docs/widgets/footers/footer-persist-b.php @@ -5,10 +5,10 @@ jQuery Mobile Framework - Persistent footer B - + - + diff --git a/docs/widgets/footers/footer-persist-c.php b/docs/widgets/footers/footer-persist-c.php index 5a06f970374..25a180054ce 100644 --- a/docs/widgets/footers/footer-persist-c.php +++ b/docs/widgets/footers/footer-persist-c.php @@ -5,10 +5,10 @@ jQuery Mobile Framework - Persistent footer C - + - + diff --git a/docs/widgets/footers/footer-persist-d.php b/docs/widgets/footers/footer-persist-d.php index 7c522d4d98a..16f17a3ed7e 100644 --- a/docs/widgets/footers/footer-persist-d.php +++ b/docs/widgets/footers/footer-persist-d.php @@ -5,10 +5,10 @@ jQuery Mobile Framework - Persistent footer D - + - + From fdb1838512f466b6c76d122e6b209d3e6ff0dca8 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 16:18:00 -0700 Subject: [PATCH 75/94] Demos: Renamed docs to demos --- {docs => demos}/_assets/css/jqm-demos.css | 0 .../_assets/css/jqm_demo-icons-hd.png | Bin .../_assets/css/jqm_demo-icons-sd.png | Bin {docs => demos}/_assets/img/album-af.jpg | Bin {docs => demos}/_assets/img/album-ag.jpg | Bin {docs => demos}/_assets/img/album-bb.jpg | Bin {docs => demos}/_assets/img/album-bk.jpg | Bin {docs => demos}/_assets/img/album-hc.jpg | Bin {docs => demos}/_assets/img/album-k.jpg | Bin {docs => demos}/_assets/img/album-mg.jpg | Bin {docs => demos}/_assets/img/album-ok.jpg | Bin {docs => demos}/_assets/img/album-p.jpg | Bin {docs => demos}/_assets/img/album-rh.jpg | Bin {docs => demos}/_assets/img/album-ws.jpg | Bin {docs => demos}/_assets/img/album-xx.jpg | Bin {docs => demos}/_assets/img/apple.png | Bin {docs => demos}/_assets/img/bg-pattern.png | Bin {docs => demos}/_assets/img/bike.jpg | Bin {docs => demos}/_assets/img/blackberry_10.png | Bin {docs => demos}/_assets/img/bmw-thumb.jpg | Bin {docs => demos}/_assets/img/bmw.jpg | Bin {docs => demos}/_assets/img/buenosaires.jpg | Bin {docs => demos}/_assets/img/capetown.jpg | Bin {docs => demos}/_assets/img/de.png | Bin {docs => demos}/_assets/img/fi.png | Bin {docs => demos}/_assets/img/firefox-logo.png | Bin {docs => demos}/_assets/img/firefox_os.png | Bin .../_assets/img/galaxy_express.png | Bin {docs => demos}/_assets/img/gb.png | Bin {docs => demos}/_assets/img/gf.png | Bin .../_assets/img/glyphish-icons/09-chat2.png | Bin .../_assets/img/glyphish-icons/100-coffee.png | Bin .../img/glyphish-icons/18-envelope.png | Bin .../_assets/img/glyphish-icons/19-gear.png | Bin .../_assets/img/glyphish-icons/21-skull.png | Bin .../_assets/img/glyphish-icons/30-key.png | Bin .../_assets/img/glyphish-icons/34-coffee.png | Bin .../_assets/img/glyphish-icons/88-beermug.png | Bin .../Read me first - license.txt | 0 {docs => demos}/_assets/img/jquery-logo.png | Bin .../_assets/img/landrover-thumb.jpg | Bin {docs => demos}/_assets/img/landrover.jpg | Bin {docs => demos}/_assets/img/lumia_800.png | Bin {docs => demos}/_assets/img/newyork.jpg | Bin {docs => demos}/_assets/img/nexus_7.png | Bin {docs => demos}/_assets/img/paris.jpg | Bin {docs => demos}/_assets/img/phone_galaxy3.png | Bin {docs => demos}/_assets/img/phone_iphone5.png | Bin .../_assets/img/phone_lumia920.png | Bin {docs => demos}/_assets/img/phone_onex.png | Bin .../_assets/img/photo-landscape.jpg | Bin .../_assets/img/photo-portrait.jpg | Bin {docs => demos}/_assets/img/photo-run.jpeg | Bin {docs => demos}/_assets/img/seoul.jpg | Bin {docs => demos}/_assets/img/sydney.jpg | Bin {docs => demos}/_assets/img/tesla-thumb.jpg | Bin {docs => demos}/_assets/img/tesla.jpg | Bin {docs => demos}/_assets/img/tizen.png | Bin {docs => demos}/_assets/img/us.png | Bin {docs => demos}/_assets/js/globalnav.js | 0 {docs => demos}/_assets/js/h2widget.js | 0 {docs => demos}/_assets/js/index.php | 0 {docs => demos}/_assets/js/jqm-demos.js | 0 {docs => demos}/_assets/js/view-source.js | 0 .../backbone-require/backbone-require.html | 0 .../examples/backbone-require/index.php | 0 .../js/collections/CategoriesCollection.js | 0 .../backbone-require/js/libs/backbone.js | 0 .../backbone-require/js/libs/jquery.js | 0 .../backbone-require/js/libs/jquerymobile.js | 0 .../backbone-require/js/libs/lodash.js | 0 .../backbone-require/js/libs/require.js | 0 .../examples/backbone-require/js/mobile.js | 0 .../js/models/CategoryModel.js | 0 .../js/routers/mobileRouter.js | 0 .../backbone-require/js/views/CategoryView.js | 0 .../collapsibles/dynamic-collapsible.php | 0 .../controlgroups/dynamic-controlgroup.php | 0 {docs => demos}/examples/index.php | 0 .../listviews/autodividers-linkbar-demo.html | 0 .../listviews/autodividers-linkbar.css | 0 .../listviews/autodividers-linkbar.js | 0 .../listviews/autodividers-linkbar.php | 0 .../listviews/autodividers-selector.php | 0 .../listviews/grid-listview-demo.html | 0 .../examples/listviews/grid-listview.css | 0 .../examples/listviews/grid-listview.php | 0 .../examples/panels/panel-styling.php | 0 .../examples/panels/panel-swipe-open.php | 0 {docs => demos}/examples/popups/arrow.php | 0 .../examples/popups/dynamic-popup.php | 0 {docs => demos}/examples/redirect/index.php | 0 .../examples/redirect/redirect-target.html | 0 .../examples/redirect/redirect.php | 0 {docs => demos}/examples/redirect/source.php | 0 {docs => demos}/examples/slider/tooltip.php | 0 .../examples/swipe/buenosaires.html | 0 {docs => demos}/examples/swipe/capetown.html | 0 {docs => demos}/examples/swipe/newyork.html | 0 {docs => demos}/examples/swipe/paris.html | 0 {docs => demos}/examples/swipe/seoul.html | 0 {docs => demos}/examples/swipe/swipe-list.php | 0 {docs => demos}/examples/swipe/swipe-page.css | 0 {docs => demos}/examples/swipe/swipe-page.js | 0 {docs => demos}/examples/swipe/swipe-page.php | 0 {docs => demos}/examples/swipe/sydney.html | 0 .../tables/financial-grouped-columns.php | 0 .../tables/financial-grouped-reflow.php | 0 .../tables/movie-list-toggle-options.php | 0 .../examples/tables/movie-list.php | 0 .../examples/tables/phone-compare.php | 0 .../faq/controls-in-header-footer.php | 0 .../faq/disabling-a-button-does-not-work.php | 0 {docs => demos}/faq/dom-ready-not-working.php | 0 ...uto-enhancement-of-a-block-of-elements.php | 0 ...an-i-stop-auto-enhancement-of-elements.php | 0 .../faq/how-configure-phonegap-cordova.php | 0 .../faq/how-do-i-control-page-titles.php | 0 {docs => demos}/faq/how-do-i-load-a-page.php | 0 .../faq/how-do-i-scroll-to-a-position.php | 0 .../faq/how-do-i-use-touch-mouse-events.php | 0 {docs => demos}/faq/how-does-theming-work.php | 0 {docs => demos}/faq/index.php | 0 .../faq/injected-content-is-not-enhanced.php | 0 ...ml-5-inputs-look-different-in-browsers.php | 0 ...nge-search-input-type-is-being-changed.php | 0 .../faq/pass-query-params-to-page.php | 0 .../faq/pass-via-the-hash-to-page.php | 0 {docs => demos}/faq/question-template.php | 0 .../faq/scripts-and-styles-not-loading.php | 0 ...es-custom-select-shows-as-dialog-popup.php | 0 .../the-application-cache-is-not-working.php | 0 ...eate-on-injected-content-does-not-work.php | 0 ...f-enhanced-form-elements-does-not-work.php | 0 .../faq/why-is-only-the-first-page-loaded.php | 0 {docs => demos}/favicon.ico | Bin {docs => demos}/global-nav.php | 0 {docs => demos}/index.php | 0 {docs => demos}/intro/index.php | 0 {docs => demos}/intro/rwd.php | 0 {docs => demos}/nav-examples.php | 0 {docs => demos}/nav-faq.php | 0 {docs => demos}/nav-widgets.php | 0 {docs => demos}/search-results.php | 0 {docs => demos}/search.php | 0 {docs => demos}/widgets/accordions/index.php | 0 .../autocomplete/autocomplete-remote.php | 0 .../widgets/autocomplete/index.php | 0 {docs => demos}/widgets/buttons/index.php | 0 {docs => demos}/widgets/checkbox/index.php | 0 .../widgets/collapsibles/index.php | 0 .../widgets/controlgroups/index.php | 0 .../widgets/dialog/dialog-alt.html | 0 .../widgets/dialog/dialog-buttons.html | 0 .../widgets/dialog/dialog-corners.html | 0 .../widgets/dialog/dialog-noclosebtn.html | 0 .../widgets/dialog/dialog-overlay.html | 0 .../widgets/dialog/dialog-rightclosebtn.html | 0 .../widgets/dialog/dialog-success.html | 0 .../widgets/dialog/dialog-with-select.html | 0 {docs => demos}/widgets/dialog/dialog.html | 0 {docs => demos}/widgets/dialog/index.php | 0 .../widgets/footers/footer-persist-a.php | 0 .../widgets/footers/footer-persist-b.php | 0 .../widgets/footers/footer-persist-c.php | 0 .../widgets/footers/footer-persist-d.php | 0 {docs => demos}/widgets/footers/index.php | 0 .../widgets/forms/form-disabled.php | 0 .../widgets/forms/form-fieldcontain.php | 0 .../widgets/forms/form-gallery.php | 0 .../widgets/forms/form-hide-label.php | 0 .../widgets/forms/form-label-hidden.php | 0 {docs => demos}/widgets/forms/index.php | 0 .../widgets/grids/grid-buttons.php | 0 {docs => demos}/widgets/grids/grid-custom.php | 0 {docs => demos}/widgets/grids/index.php | 0 .../widgets/headers/bars-fixed-forms.php | 0 .../widgets/headers/bars-fixed.php | 0 .../widgets/headers/bars-fullscreen.php | 0 {docs => demos}/widgets/headers/index.php | 0 {docs => demos}/widgets/icons/index.php | 0 {docs => demos}/widgets/index.php | 0 {docs => demos}/widgets/links/index.php | 0 {docs => demos}/widgets/listviews/index.php | 0 {docs => demos}/widgets/loader/index.php | 0 .../widgets/navbar/footer-persist-a.php | 0 .../widgets/navbar/footer-persist-b.php | 0 .../widgets/navbar/footer-persist-c.php | 0 .../widgets/navbar/footer-persist-d.php | 0 {docs => demos}/widgets/navbar/index.php | 0 {docs => demos}/widgets/navigation/demo.js | 0 {docs => demos}/widgets/navigation/index.php | 0 {docs => demos}/widgets/pages/index.php | 0 .../widgets/pages/multipage-template.php | 0 {docs => demos}/widgets/panels/index.php | 0 .../widgets/panels/panel-fixed.php | 0 {docs => demos}/widgets/popup/index.php | 0 {docs => demos}/widgets/popup/map.html | 0 .../widgets/popup/popup-examples.css | 0 .../widgets/popup/popup-examples.js | 0 .../widgets/popup/popup-iframes.php | 0 .../widgets/popup/popup-images.php | 0 .../widgets/radiobuttons/index.php | 0 .../widgets/selects/custom-selects.php | 0 {docs => demos}/widgets/selects/index.php | 0 {docs => demos}/widgets/sliders/index.php | 0 .../widgets/sliders/rangeslider.php | 0 {docs => demos}/widgets/sliders/switch.php | 0 .../widgets/table-column-toggle/index.php | 0 .../widgets/table-reflow/index.php | 0 {docs => demos}/widgets/textinputs/index.php | 0 {docs => demos}/widgets/transitions/index.php | 0 .../transitions/page-transitions-dialog.php | 0 .../transitions/page-transitions-page.php | 0 index.php | 20 +++++++++--------- 215 files changed, 10 insertions(+), 10 deletions(-) rename {docs => demos}/_assets/css/jqm-demos.css (100%) rename {docs => demos}/_assets/css/jqm_demo-icons-hd.png (100%) rename {docs => demos}/_assets/css/jqm_demo-icons-sd.png (100%) rename {docs => demos}/_assets/img/album-af.jpg (100%) rename {docs => demos}/_assets/img/album-ag.jpg (100%) rename {docs => demos}/_assets/img/album-bb.jpg (100%) rename {docs => demos}/_assets/img/album-bk.jpg (100%) rename {docs => demos}/_assets/img/album-hc.jpg (100%) rename {docs => demos}/_assets/img/album-k.jpg (100%) rename {docs => demos}/_assets/img/album-mg.jpg (100%) rename {docs => demos}/_assets/img/album-ok.jpg (100%) rename {docs => demos}/_assets/img/album-p.jpg (100%) rename {docs => demos}/_assets/img/album-rh.jpg (100%) rename {docs => demos}/_assets/img/album-ws.jpg (100%) rename {docs => demos}/_assets/img/album-xx.jpg (100%) rename {docs => demos}/_assets/img/apple.png (100%) rename {docs => demos}/_assets/img/bg-pattern.png (100%) rename {docs => demos}/_assets/img/bike.jpg (100%) rename {docs => demos}/_assets/img/blackberry_10.png (100%) rename {docs => demos}/_assets/img/bmw-thumb.jpg (100%) rename {docs => demos}/_assets/img/bmw.jpg (100%) rename {docs => demos}/_assets/img/buenosaires.jpg (100%) rename {docs => demos}/_assets/img/capetown.jpg (100%) rename {docs => demos}/_assets/img/de.png (100%) rename {docs => demos}/_assets/img/fi.png (100%) rename {docs => demos}/_assets/img/firefox-logo.png (100%) rename {docs => demos}/_assets/img/firefox_os.png (100%) rename {docs => demos}/_assets/img/galaxy_express.png (100%) rename {docs => demos}/_assets/img/gb.png (100%) rename {docs => demos}/_assets/img/gf.png (100%) rename {docs => demos}/_assets/img/glyphish-icons/09-chat2.png (100%) rename {docs => demos}/_assets/img/glyphish-icons/100-coffee.png (100%) rename {docs => demos}/_assets/img/glyphish-icons/18-envelope.png (100%) rename {docs => demos}/_assets/img/glyphish-icons/19-gear.png (100%) rename {docs => demos}/_assets/img/glyphish-icons/21-skull.png (100%) rename {docs => demos}/_assets/img/glyphish-icons/30-key.png (100%) rename {docs => demos}/_assets/img/glyphish-icons/34-coffee.png (100%) rename {docs => demos}/_assets/img/glyphish-icons/88-beermug.png (100%) rename {docs => demos}/_assets/img/glyphish-icons/Read me first - license.txt (100%) rename {docs => demos}/_assets/img/jquery-logo.png (100%) rename {docs => demos}/_assets/img/landrover-thumb.jpg (100%) rename {docs => demos}/_assets/img/landrover.jpg (100%) rename {docs => demos}/_assets/img/lumia_800.png (100%) rename {docs => demos}/_assets/img/newyork.jpg (100%) rename {docs => demos}/_assets/img/nexus_7.png (100%) rename {docs => demos}/_assets/img/paris.jpg (100%) rename {docs => demos}/_assets/img/phone_galaxy3.png (100%) rename {docs => demos}/_assets/img/phone_iphone5.png (100%) rename {docs => demos}/_assets/img/phone_lumia920.png (100%) rename {docs => demos}/_assets/img/phone_onex.png (100%) rename {docs => demos}/_assets/img/photo-landscape.jpg (100%) rename {docs => demos}/_assets/img/photo-portrait.jpg (100%) rename {docs => demos}/_assets/img/photo-run.jpeg (100%) rename {docs => demos}/_assets/img/seoul.jpg (100%) rename {docs => demos}/_assets/img/sydney.jpg (100%) rename {docs => demos}/_assets/img/tesla-thumb.jpg (100%) rename {docs => demos}/_assets/img/tesla.jpg (100%) rename {docs => demos}/_assets/img/tizen.png (100%) rename {docs => demos}/_assets/img/us.png (100%) rename {docs => demos}/_assets/js/globalnav.js (100%) rename {docs => demos}/_assets/js/h2widget.js (100%) rename {docs => demos}/_assets/js/index.php (100%) rename {docs => demos}/_assets/js/jqm-demos.js (100%) rename {docs => demos}/_assets/js/view-source.js (100%) rename {docs => demos}/examples/backbone-require/backbone-require.html (100%) rename {docs => demos}/examples/backbone-require/index.php (100%) rename {docs => demos}/examples/backbone-require/js/collections/CategoriesCollection.js (100%) rename {docs => demos}/examples/backbone-require/js/libs/backbone.js (100%) rename {docs => demos}/examples/backbone-require/js/libs/jquery.js (100%) rename {docs => demos}/examples/backbone-require/js/libs/jquerymobile.js (100%) rename {docs => demos}/examples/backbone-require/js/libs/lodash.js (100%) rename {docs => demos}/examples/backbone-require/js/libs/require.js (100%) rename {docs => demos}/examples/backbone-require/js/mobile.js (100%) rename {docs => demos}/examples/backbone-require/js/models/CategoryModel.js (100%) rename {docs => demos}/examples/backbone-require/js/routers/mobileRouter.js (100%) rename {docs => demos}/examples/backbone-require/js/views/CategoryView.js (100%) rename {docs => demos}/examples/collapsibles/dynamic-collapsible.php (100%) rename {docs => demos}/examples/controlgroups/dynamic-controlgroup.php (100%) rename {docs => demos}/examples/index.php (100%) rename {docs => demos}/examples/listviews/autodividers-linkbar-demo.html (100%) rename {docs => demos}/examples/listviews/autodividers-linkbar.css (100%) rename {docs => demos}/examples/listviews/autodividers-linkbar.js (100%) rename {docs => demos}/examples/listviews/autodividers-linkbar.php (100%) rename {docs => demos}/examples/listviews/autodividers-selector.php (100%) rename {docs => demos}/examples/listviews/grid-listview-demo.html (100%) rename {docs => demos}/examples/listviews/grid-listview.css (100%) rename {docs => demos}/examples/listviews/grid-listview.php (100%) rename {docs => demos}/examples/panels/panel-styling.php (100%) rename {docs => demos}/examples/panels/panel-swipe-open.php (100%) rename {docs => demos}/examples/popups/arrow.php (100%) rename {docs => demos}/examples/popups/dynamic-popup.php (100%) rename {docs => demos}/examples/redirect/index.php (100%) rename {docs => demos}/examples/redirect/redirect-target.html (100%) rename {docs => demos}/examples/redirect/redirect.php (100%) rename {docs => demos}/examples/redirect/source.php (100%) rename {docs => demos}/examples/slider/tooltip.php (100%) rename {docs => demos}/examples/swipe/buenosaires.html (100%) rename {docs => demos}/examples/swipe/capetown.html (100%) rename {docs => demos}/examples/swipe/newyork.html (100%) rename {docs => demos}/examples/swipe/paris.html (100%) rename {docs => demos}/examples/swipe/seoul.html (100%) rename {docs => demos}/examples/swipe/swipe-list.php (100%) rename {docs => demos}/examples/swipe/swipe-page.css (100%) rename {docs => demos}/examples/swipe/swipe-page.js (100%) rename {docs => demos}/examples/swipe/swipe-page.php (100%) rename {docs => demos}/examples/swipe/sydney.html (100%) rename {docs => demos}/examples/tables/financial-grouped-columns.php (100%) rename {docs => demos}/examples/tables/financial-grouped-reflow.php (100%) rename {docs => demos}/examples/tables/movie-list-toggle-options.php (100%) rename {docs => demos}/examples/tables/movie-list.php (100%) rename {docs => demos}/examples/tables/phone-compare.php (100%) rename {docs => demos}/faq/controls-in-header-footer.php (100%) rename {docs => demos}/faq/disabling-a-button-does-not-work.php (100%) rename {docs => demos}/faq/dom-ready-not-working.php (100%) rename {docs => demos}/faq/how-can-i-stop-auto-enhancement-of-a-block-of-elements.php (100%) rename {docs => demos}/faq/how-can-i-stop-auto-enhancement-of-elements.php (100%) rename {docs => demos}/faq/how-configure-phonegap-cordova.php (100%) rename {docs => demos}/faq/how-do-i-control-page-titles.php (100%) rename {docs => demos}/faq/how-do-i-load-a-page.php (100%) rename {docs => demos}/faq/how-do-i-scroll-to-a-position.php (100%) rename {docs => demos}/faq/how-do-i-use-touch-mouse-events.php (100%) rename {docs => demos}/faq/how-does-theming-work.php (100%) rename {docs => demos}/faq/index.php (100%) rename {docs => demos}/faq/injected-content-is-not-enhanced.php (100%) rename {docs => demos}/faq/my-html-5-inputs-look-different-in-browsers.php (100%) rename {docs => demos}/faq/my-range-search-input-type-is-being-changed.php (100%) rename {docs => demos}/faq/pass-query-params-to-page.php (100%) rename {docs => demos}/faq/pass-via-the-hash-to-page.php (100%) rename {docs => demos}/faq/question-template.php (100%) rename {docs => demos}/faq/scripts-and-styles-not-loading.php (100%) rename {docs => demos}/faq/sometimes-custom-select-shows-as-dialog-popup.php (100%) rename {docs => demos}/faq/the-application-cache-is-not-working.php (100%) rename {docs => demos}/faq/triggering-create-on-injected-content-does-not-work.php (100%) rename {docs => demos}/faq/updating-the-value-of-enhanced-form-elements-does-not-work.php (100%) rename {docs => demos}/faq/why-is-only-the-first-page-loaded.php (100%) rename {docs => demos}/favicon.ico (100%) rename {docs => demos}/global-nav.php (100%) rename {docs => demos}/index.php (100%) rename {docs => demos}/intro/index.php (100%) rename {docs => demos}/intro/rwd.php (100%) rename {docs => demos}/nav-examples.php (100%) rename {docs => demos}/nav-faq.php (100%) rename {docs => demos}/nav-widgets.php (100%) rename {docs => demos}/search-results.php (100%) rename {docs => demos}/search.php (100%) rename {docs => demos}/widgets/accordions/index.php (100%) rename {docs => demos}/widgets/autocomplete/autocomplete-remote.php (100%) rename {docs => demos}/widgets/autocomplete/index.php (100%) rename {docs => demos}/widgets/buttons/index.php (100%) rename {docs => demos}/widgets/checkbox/index.php (100%) rename {docs => demos}/widgets/collapsibles/index.php (100%) rename {docs => demos}/widgets/controlgroups/index.php (100%) rename {docs => demos}/widgets/dialog/dialog-alt.html (100%) rename {docs => demos}/widgets/dialog/dialog-buttons.html (100%) rename {docs => demos}/widgets/dialog/dialog-corners.html (100%) rename {docs => demos}/widgets/dialog/dialog-noclosebtn.html (100%) rename {docs => demos}/widgets/dialog/dialog-overlay.html (100%) rename {docs => demos}/widgets/dialog/dialog-rightclosebtn.html (100%) rename {docs => demos}/widgets/dialog/dialog-success.html (100%) rename {docs => demos}/widgets/dialog/dialog-with-select.html (100%) rename {docs => demos}/widgets/dialog/dialog.html (100%) rename {docs => demos}/widgets/dialog/index.php (100%) rename {docs => demos}/widgets/footers/footer-persist-a.php (100%) rename {docs => demos}/widgets/footers/footer-persist-b.php (100%) rename {docs => demos}/widgets/footers/footer-persist-c.php (100%) rename {docs => demos}/widgets/footers/footer-persist-d.php (100%) rename {docs => demos}/widgets/footers/index.php (100%) rename {docs => demos}/widgets/forms/form-disabled.php (100%) rename {docs => demos}/widgets/forms/form-fieldcontain.php (100%) rename {docs => demos}/widgets/forms/form-gallery.php (100%) rename {docs => demos}/widgets/forms/form-hide-label.php (100%) rename {docs => demos}/widgets/forms/form-label-hidden.php (100%) rename {docs => demos}/widgets/forms/index.php (100%) rename {docs => demos}/widgets/grids/grid-buttons.php (100%) rename {docs => demos}/widgets/grids/grid-custom.php (100%) rename {docs => demos}/widgets/grids/index.php (100%) rename {docs => demos}/widgets/headers/bars-fixed-forms.php (100%) rename {docs => demos}/widgets/headers/bars-fixed.php (100%) rename {docs => demos}/widgets/headers/bars-fullscreen.php (100%) rename {docs => demos}/widgets/headers/index.php (100%) rename {docs => demos}/widgets/icons/index.php (100%) rename {docs => demos}/widgets/index.php (100%) rename {docs => demos}/widgets/links/index.php (100%) rename {docs => demos}/widgets/listviews/index.php (100%) rename {docs => demos}/widgets/loader/index.php (100%) rename {docs => demos}/widgets/navbar/footer-persist-a.php (100%) rename {docs => demos}/widgets/navbar/footer-persist-b.php (100%) rename {docs => demos}/widgets/navbar/footer-persist-c.php (100%) rename {docs => demos}/widgets/navbar/footer-persist-d.php (100%) rename {docs => demos}/widgets/navbar/index.php (100%) rename {docs => demos}/widgets/navigation/demo.js (100%) rename {docs => demos}/widgets/navigation/index.php (100%) rename {docs => demos}/widgets/pages/index.php (100%) rename {docs => demos}/widgets/pages/multipage-template.php (100%) rename {docs => demos}/widgets/panels/index.php (100%) rename {docs => demos}/widgets/panels/panel-fixed.php (100%) rename {docs => demos}/widgets/popup/index.php (100%) rename {docs => demos}/widgets/popup/map.html (100%) rename {docs => demos}/widgets/popup/popup-examples.css (100%) rename {docs => demos}/widgets/popup/popup-examples.js (100%) rename {docs => demos}/widgets/popup/popup-iframes.php (100%) rename {docs => demos}/widgets/popup/popup-images.php (100%) rename {docs => demos}/widgets/radiobuttons/index.php (100%) rename {docs => demos}/widgets/selects/custom-selects.php (100%) rename {docs => demos}/widgets/selects/index.php (100%) rename {docs => demos}/widgets/sliders/index.php (100%) rename {docs => demos}/widgets/sliders/rangeslider.php (100%) rename {docs => demos}/widgets/sliders/switch.php (100%) rename {docs => demos}/widgets/table-column-toggle/index.php (100%) rename {docs => demos}/widgets/table-reflow/index.php (100%) rename {docs => demos}/widgets/textinputs/index.php (100%) rename {docs => demos}/widgets/transitions/index.php (100%) rename {docs => demos}/widgets/transitions/page-transitions-dialog.php (100%) rename {docs => demos}/widgets/transitions/page-transitions-page.php (100%) diff --git a/docs/_assets/css/jqm-demos.css b/demos/_assets/css/jqm-demos.css similarity index 100% rename from docs/_assets/css/jqm-demos.css rename to demos/_assets/css/jqm-demos.css diff --git a/docs/_assets/css/jqm_demo-icons-hd.png b/demos/_assets/css/jqm_demo-icons-hd.png similarity index 100% rename from docs/_assets/css/jqm_demo-icons-hd.png rename to demos/_assets/css/jqm_demo-icons-hd.png diff --git a/docs/_assets/css/jqm_demo-icons-sd.png b/demos/_assets/css/jqm_demo-icons-sd.png similarity index 100% rename from docs/_assets/css/jqm_demo-icons-sd.png rename to demos/_assets/css/jqm_demo-icons-sd.png diff --git a/docs/_assets/img/album-af.jpg b/demos/_assets/img/album-af.jpg similarity index 100% rename from docs/_assets/img/album-af.jpg rename to demos/_assets/img/album-af.jpg diff --git a/docs/_assets/img/album-ag.jpg b/demos/_assets/img/album-ag.jpg similarity index 100% rename from docs/_assets/img/album-ag.jpg rename to demos/_assets/img/album-ag.jpg diff --git a/docs/_assets/img/album-bb.jpg b/demos/_assets/img/album-bb.jpg similarity index 100% rename from docs/_assets/img/album-bb.jpg rename to demos/_assets/img/album-bb.jpg diff --git a/docs/_assets/img/album-bk.jpg b/demos/_assets/img/album-bk.jpg similarity index 100% rename from docs/_assets/img/album-bk.jpg rename to demos/_assets/img/album-bk.jpg diff --git a/docs/_assets/img/album-hc.jpg b/demos/_assets/img/album-hc.jpg similarity index 100% rename from docs/_assets/img/album-hc.jpg rename to demos/_assets/img/album-hc.jpg diff --git a/docs/_assets/img/album-k.jpg b/demos/_assets/img/album-k.jpg similarity index 100% rename from docs/_assets/img/album-k.jpg rename to demos/_assets/img/album-k.jpg diff --git a/docs/_assets/img/album-mg.jpg b/demos/_assets/img/album-mg.jpg similarity index 100% rename from docs/_assets/img/album-mg.jpg rename to demos/_assets/img/album-mg.jpg diff --git a/docs/_assets/img/album-ok.jpg b/demos/_assets/img/album-ok.jpg similarity index 100% rename from docs/_assets/img/album-ok.jpg rename to demos/_assets/img/album-ok.jpg diff --git a/docs/_assets/img/album-p.jpg b/demos/_assets/img/album-p.jpg similarity index 100% rename from docs/_assets/img/album-p.jpg rename to demos/_assets/img/album-p.jpg diff --git a/docs/_assets/img/album-rh.jpg b/demos/_assets/img/album-rh.jpg similarity index 100% rename from docs/_assets/img/album-rh.jpg rename to demos/_assets/img/album-rh.jpg diff --git a/docs/_assets/img/album-ws.jpg b/demos/_assets/img/album-ws.jpg similarity index 100% rename from docs/_assets/img/album-ws.jpg rename to demos/_assets/img/album-ws.jpg diff --git a/docs/_assets/img/album-xx.jpg b/demos/_assets/img/album-xx.jpg similarity index 100% rename from docs/_assets/img/album-xx.jpg rename to demos/_assets/img/album-xx.jpg diff --git a/docs/_assets/img/apple.png b/demos/_assets/img/apple.png similarity index 100% rename from docs/_assets/img/apple.png rename to demos/_assets/img/apple.png diff --git a/docs/_assets/img/bg-pattern.png b/demos/_assets/img/bg-pattern.png similarity index 100% rename from docs/_assets/img/bg-pattern.png rename to demos/_assets/img/bg-pattern.png diff --git a/docs/_assets/img/bike.jpg b/demos/_assets/img/bike.jpg similarity index 100% rename from docs/_assets/img/bike.jpg rename to demos/_assets/img/bike.jpg diff --git a/docs/_assets/img/blackberry_10.png b/demos/_assets/img/blackberry_10.png similarity index 100% rename from docs/_assets/img/blackberry_10.png rename to demos/_assets/img/blackberry_10.png diff --git a/docs/_assets/img/bmw-thumb.jpg b/demos/_assets/img/bmw-thumb.jpg similarity index 100% rename from docs/_assets/img/bmw-thumb.jpg rename to demos/_assets/img/bmw-thumb.jpg diff --git a/docs/_assets/img/bmw.jpg b/demos/_assets/img/bmw.jpg similarity index 100% rename from docs/_assets/img/bmw.jpg rename to demos/_assets/img/bmw.jpg diff --git a/docs/_assets/img/buenosaires.jpg b/demos/_assets/img/buenosaires.jpg similarity index 100% rename from docs/_assets/img/buenosaires.jpg rename to demos/_assets/img/buenosaires.jpg diff --git a/docs/_assets/img/capetown.jpg b/demos/_assets/img/capetown.jpg similarity index 100% rename from docs/_assets/img/capetown.jpg rename to demos/_assets/img/capetown.jpg diff --git a/docs/_assets/img/de.png b/demos/_assets/img/de.png similarity index 100% rename from docs/_assets/img/de.png rename to demos/_assets/img/de.png diff --git a/docs/_assets/img/fi.png b/demos/_assets/img/fi.png similarity index 100% rename from docs/_assets/img/fi.png rename to demos/_assets/img/fi.png diff --git a/docs/_assets/img/firefox-logo.png b/demos/_assets/img/firefox-logo.png similarity index 100% rename from docs/_assets/img/firefox-logo.png rename to demos/_assets/img/firefox-logo.png diff --git a/docs/_assets/img/firefox_os.png b/demos/_assets/img/firefox_os.png similarity index 100% rename from docs/_assets/img/firefox_os.png rename to demos/_assets/img/firefox_os.png diff --git a/docs/_assets/img/galaxy_express.png b/demos/_assets/img/galaxy_express.png similarity index 100% rename from docs/_assets/img/galaxy_express.png rename to demos/_assets/img/galaxy_express.png diff --git a/docs/_assets/img/gb.png b/demos/_assets/img/gb.png similarity index 100% rename from docs/_assets/img/gb.png rename to demos/_assets/img/gb.png diff --git a/docs/_assets/img/gf.png b/demos/_assets/img/gf.png similarity index 100% rename from docs/_assets/img/gf.png rename to demos/_assets/img/gf.png diff --git a/docs/_assets/img/glyphish-icons/09-chat2.png b/demos/_assets/img/glyphish-icons/09-chat2.png similarity index 100% rename from docs/_assets/img/glyphish-icons/09-chat2.png rename to demos/_assets/img/glyphish-icons/09-chat2.png diff --git a/docs/_assets/img/glyphish-icons/100-coffee.png b/demos/_assets/img/glyphish-icons/100-coffee.png similarity index 100% rename from docs/_assets/img/glyphish-icons/100-coffee.png rename to demos/_assets/img/glyphish-icons/100-coffee.png diff --git a/docs/_assets/img/glyphish-icons/18-envelope.png b/demos/_assets/img/glyphish-icons/18-envelope.png similarity index 100% rename from docs/_assets/img/glyphish-icons/18-envelope.png rename to demos/_assets/img/glyphish-icons/18-envelope.png diff --git a/docs/_assets/img/glyphish-icons/19-gear.png b/demos/_assets/img/glyphish-icons/19-gear.png similarity index 100% rename from docs/_assets/img/glyphish-icons/19-gear.png rename to demos/_assets/img/glyphish-icons/19-gear.png diff --git a/docs/_assets/img/glyphish-icons/21-skull.png b/demos/_assets/img/glyphish-icons/21-skull.png similarity index 100% rename from docs/_assets/img/glyphish-icons/21-skull.png rename to demos/_assets/img/glyphish-icons/21-skull.png diff --git a/docs/_assets/img/glyphish-icons/30-key.png b/demos/_assets/img/glyphish-icons/30-key.png similarity index 100% rename from docs/_assets/img/glyphish-icons/30-key.png rename to demos/_assets/img/glyphish-icons/30-key.png diff --git a/docs/_assets/img/glyphish-icons/34-coffee.png b/demos/_assets/img/glyphish-icons/34-coffee.png similarity index 100% rename from docs/_assets/img/glyphish-icons/34-coffee.png rename to demos/_assets/img/glyphish-icons/34-coffee.png diff --git a/docs/_assets/img/glyphish-icons/88-beermug.png b/demos/_assets/img/glyphish-icons/88-beermug.png similarity index 100% rename from docs/_assets/img/glyphish-icons/88-beermug.png rename to demos/_assets/img/glyphish-icons/88-beermug.png diff --git a/docs/_assets/img/glyphish-icons/Read me first - license.txt b/demos/_assets/img/glyphish-icons/Read me first - license.txt similarity index 100% rename from docs/_assets/img/glyphish-icons/Read me first - license.txt rename to demos/_assets/img/glyphish-icons/Read me first - license.txt diff --git a/docs/_assets/img/jquery-logo.png b/demos/_assets/img/jquery-logo.png similarity index 100% rename from docs/_assets/img/jquery-logo.png rename to demos/_assets/img/jquery-logo.png diff --git a/docs/_assets/img/landrover-thumb.jpg b/demos/_assets/img/landrover-thumb.jpg similarity index 100% rename from docs/_assets/img/landrover-thumb.jpg rename to demos/_assets/img/landrover-thumb.jpg diff --git a/docs/_assets/img/landrover.jpg b/demos/_assets/img/landrover.jpg similarity index 100% rename from docs/_assets/img/landrover.jpg rename to demos/_assets/img/landrover.jpg diff --git a/docs/_assets/img/lumia_800.png b/demos/_assets/img/lumia_800.png similarity index 100% rename from docs/_assets/img/lumia_800.png rename to demos/_assets/img/lumia_800.png diff --git a/docs/_assets/img/newyork.jpg b/demos/_assets/img/newyork.jpg similarity index 100% rename from docs/_assets/img/newyork.jpg rename to demos/_assets/img/newyork.jpg diff --git a/docs/_assets/img/nexus_7.png b/demos/_assets/img/nexus_7.png similarity index 100% rename from docs/_assets/img/nexus_7.png rename to demos/_assets/img/nexus_7.png diff --git a/docs/_assets/img/paris.jpg b/demos/_assets/img/paris.jpg similarity index 100% rename from docs/_assets/img/paris.jpg rename to demos/_assets/img/paris.jpg diff --git a/docs/_assets/img/phone_galaxy3.png b/demos/_assets/img/phone_galaxy3.png similarity index 100% rename from docs/_assets/img/phone_galaxy3.png rename to demos/_assets/img/phone_galaxy3.png diff --git a/docs/_assets/img/phone_iphone5.png b/demos/_assets/img/phone_iphone5.png similarity index 100% rename from docs/_assets/img/phone_iphone5.png rename to demos/_assets/img/phone_iphone5.png diff --git a/docs/_assets/img/phone_lumia920.png b/demos/_assets/img/phone_lumia920.png similarity index 100% rename from docs/_assets/img/phone_lumia920.png rename to demos/_assets/img/phone_lumia920.png diff --git a/docs/_assets/img/phone_onex.png b/demos/_assets/img/phone_onex.png similarity index 100% rename from docs/_assets/img/phone_onex.png rename to demos/_assets/img/phone_onex.png diff --git a/docs/_assets/img/photo-landscape.jpg b/demos/_assets/img/photo-landscape.jpg similarity index 100% rename from docs/_assets/img/photo-landscape.jpg rename to demos/_assets/img/photo-landscape.jpg diff --git a/docs/_assets/img/photo-portrait.jpg b/demos/_assets/img/photo-portrait.jpg similarity index 100% rename from docs/_assets/img/photo-portrait.jpg rename to demos/_assets/img/photo-portrait.jpg diff --git a/docs/_assets/img/photo-run.jpeg b/demos/_assets/img/photo-run.jpeg similarity index 100% rename from docs/_assets/img/photo-run.jpeg rename to demos/_assets/img/photo-run.jpeg diff --git a/docs/_assets/img/seoul.jpg b/demos/_assets/img/seoul.jpg similarity index 100% rename from docs/_assets/img/seoul.jpg rename to demos/_assets/img/seoul.jpg diff --git a/docs/_assets/img/sydney.jpg b/demos/_assets/img/sydney.jpg similarity index 100% rename from docs/_assets/img/sydney.jpg rename to demos/_assets/img/sydney.jpg diff --git a/docs/_assets/img/tesla-thumb.jpg b/demos/_assets/img/tesla-thumb.jpg similarity index 100% rename from docs/_assets/img/tesla-thumb.jpg rename to demos/_assets/img/tesla-thumb.jpg diff --git a/docs/_assets/img/tesla.jpg b/demos/_assets/img/tesla.jpg similarity index 100% rename from docs/_assets/img/tesla.jpg rename to demos/_assets/img/tesla.jpg diff --git a/docs/_assets/img/tizen.png b/demos/_assets/img/tizen.png similarity index 100% rename from docs/_assets/img/tizen.png rename to demos/_assets/img/tizen.png diff --git a/docs/_assets/img/us.png b/demos/_assets/img/us.png similarity index 100% rename from docs/_assets/img/us.png rename to demos/_assets/img/us.png diff --git a/docs/_assets/js/globalnav.js b/demos/_assets/js/globalnav.js similarity index 100% rename from docs/_assets/js/globalnav.js rename to demos/_assets/js/globalnav.js diff --git a/docs/_assets/js/h2widget.js b/demos/_assets/js/h2widget.js similarity index 100% rename from docs/_assets/js/h2widget.js rename to demos/_assets/js/h2widget.js diff --git a/docs/_assets/js/index.php b/demos/_assets/js/index.php similarity index 100% rename from docs/_assets/js/index.php rename to demos/_assets/js/index.php diff --git a/docs/_assets/js/jqm-demos.js b/demos/_assets/js/jqm-demos.js similarity index 100% rename from docs/_assets/js/jqm-demos.js rename to demos/_assets/js/jqm-demos.js diff --git a/docs/_assets/js/view-source.js b/demos/_assets/js/view-source.js similarity index 100% rename from docs/_assets/js/view-source.js rename to demos/_assets/js/view-source.js diff --git a/docs/examples/backbone-require/backbone-require.html b/demos/examples/backbone-require/backbone-require.html similarity index 100% rename from docs/examples/backbone-require/backbone-require.html rename to demos/examples/backbone-require/backbone-require.html diff --git a/docs/examples/backbone-require/index.php b/demos/examples/backbone-require/index.php similarity index 100% rename from docs/examples/backbone-require/index.php rename to demos/examples/backbone-require/index.php diff --git a/docs/examples/backbone-require/js/collections/CategoriesCollection.js b/demos/examples/backbone-require/js/collections/CategoriesCollection.js similarity index 100% rename from docs/examples/backbone-require/js/collections/CategoriesCollection.js rename to demos/examples/backbone-require/js/collections/CategoriesCollection.js diff --git a/docs/examples/backbone-require/js/libs/backbone.js b/demos/examples/backbone-require/js/libs/backbone.js similarity index 100% rename from docs/examples/backbone-require/js/libs/backbone.js rename to demos/examples/backbone-require/js/libs/backbone.js diff --git a/docs/examples/backbone-require/js/libs/jquery.js b/demos/examples/backbone-require/js/libs/jquery.js similarity index 100% rename from docs/examples/backbone-require/js/libs/jquery.js rename to demos/examples/backbone-require/js/libs/jquery.js diff --git a/docs/examples/backbone-require/js/libs/jquerymobile.js b/demos/examples/backbone-require/js/libs/jquerymobile.js similarity index 100% rename from docs/examples/backbone-require/js/libs/jquerymobile.js rename to demos/examples/backbone-require/js/libs/jquerymobile.js diff --git a/docs/examples/backbone-require/js/libs/lodash.js b/demos/examples/backbone-require/js/libs/lodash.js similarity index 100% rename from docs/examples/backbone-require/js/libs/lodash.js rename to demos/examples/backbone-require/js/libs/lodash.js diff --git a/docs/examples/backbone-require/js/libs/require.js b/demos/examples/backbone-require/js/libs/require.js similarity index 100% rename from docs/examples/backbone-require/js/libs/require.js rename to demos/examples/backbone-require/js/libs/require.js diff --git a/docs/examples/backbone-require/js/mobile.js b/demos/examples/backbone-require/js/mobile.js similarity index 100% rename from docs/examples/backbone-require/js/mobile.js rename to demos/examples/backbone-require/js/mobile.js diff --git a/docs/examples/backbone-require/js/models/CategoryModel.js b/demos/examples/backbone-require/js/models/CategoryModel.js similarity index 100% rename from docs/examples/backbone-require/js/models/CategoryModel.js rename to demos/examples/backbone-require/js/models/CategoryModel.js diff --git a/docs/examples/backbone-require/js/routers/mobileRouter.js b/demos/examples/backbone-require/js/routers/mobileRouter.js similarity index 100% rename from docs/examples/backbone-require/js/routers/mobileRouter.js rename to demos/examples/backbone-require/js/routers/mobileRouter.js diff --git a/docs/examples/backbone-require/js/views/CategoryView.js b/demos/examples/backbone-require/js/views/CategoryView.js similarity index 100% rename from docs/examples/backbone-require/js/views/CategoryView.js rename to demos/examples/backbone-require/js/views/CategoryView.js diff --git a/docs/examples/collapsibles/dynamic-collapsible.php b/demos/examples/collapsibles/dynamic-collapsible.php similarity index 100% rename from docs/examples/collapsibles/dynamic-collapsible.php rename to demos/examples/collapsibles/dynamic-collapsible.php diff --git a/docs/examples/controlgroups/dynamic-controlgroup.php b/demos/examples/controlgroups/dynamic-controlgroup.php similarity index 100% rename from docs/examples/controlgroups/dynamic-controlgroup.php rename to demos/examples/controlgroups/dynamic-controlgroup.php diff --git a/docs/examples/index.php b/demos/examples/index.php similarity index 100% rename from docs/examples/index.php rename to demos/examples/index.php diff --git a/docs/examples/listviews/autodividers-linkbar-demo.html b/demos/examples/listviews/autodividers-linkbar-demo.html similarity index 100% rename from docs/examples/listviews/autodividers-linkbar-demo.html rename to demos/examples/listviews/autodividers-linkbar-demo.html diff --git a/docs/examples/listviews/autodividers-linkbar.css b/demos/examples/listviews/autodividers-linkbar.css similarity index 100% rename from docs/examples/listviews/autodividers-linkbar.css rename to demos/examples/listviews/autodividers-linkbar.css diff --git a/docs/examples/listviews/autodividers-linkbar.js b/demos/examples/listviews/autodividers-linkbar.js similarity index 100% rename from docs/examples/listviews/autodividers-linkbar.js rename to demos/examples/listviews/autodividers-linkbar.js diff --git a/docs/examples/listviews/autodividers-linkbar.php b/demos/examples/listviews/autodividers-linkbar.php similarity index 100% rename from docs/examples/listviews/autodividers-linkbar.php rename to demos/examples/listviews/autodividers-linkbar.php diff --git a/docs/examples/listviews/autodividers-selector.php b/demos/examples/listviews/autodividers-selector.php similarity index 100% rename from docs/examples/listviews/autodividers-selector.php rename to demos/examples/listviews/autodividers-selector.php diff --git a/docs/examples/listviews/grid-listview-demo.html b/demos/examples/listviews/grid-listview-demo.html similarity index 100% rename from docs/examples/listviews/grid-listview-demo.html rename to demos/examples/listviews/grid-listview-demo.html diff --git a/docs/examples/listviews/grid-listview.css b/demos/examples/listviews/grid-listview.css similarity index 100% rename from docs/examples/listviews/grid-listview.css rename to demos/examples/listviews/grid-listview.css diff --git a/docs/examples/listviews/grid-listview.php b/demos/examples/listviews/grid-listview.php similarity index 100% rename from docs/examples/listviews/grid-listview.php rename to demos/examples/listviews/grid-listview.php diff --git a/docs/examples/panels/panel-styling.php b/demos/examples/panels/panel-styling.php similarity index 100% rename from docs/examples/panels/panel-styling.php rename to demos/examples/panels/panel-styling.php diff --git a/docs/examples/panels/panel-swipe-open.php b/demos/examples/panels/panel-swipe-open.php similarity index 100% rename from docs/examples/panels/panel-swipe-open.php rename to demos/examples/panels/panel-swipe-open.php diff --git a/docs/examples/popups/arrow.php b/demos/examples/popups/arrow.php similarity index 100% rename from docs/examples/popups/arrow.php rename to demos/examples/popups/arrow.php diff --git a/docs/examples/popups/dynamic-popup.php b/demos/examples/popups/dynamic-popup.php similarity index 100% rename from docs/examples/popups/dynamic-popup.php rename to demos/examples/popups/dynamic-popup.php diff --git a/docs/examples/redirect/index.php b/demos/examples/redirect/index.php similarity index 100% rename from docs/examples/redirect/index.php rename to demos/examples/redirect/index.php diff --git a/docs/examples/redirect/redirect-target.html b/demos/examples/redirect/redirect-target.html similarity index 100% rename from docs/examples/redirect/redirect-target.html rename to demos/examples/redirect/redirect-target.html diff --git a/docs/examples/redirect/redirect.php b/demos/examples/redirect/redirect.php similarity index 100% rename from docs/examples/redirect/redirect.php rename to demos/examples/redirect/redirect.php diff --git a/docs/examples/redirect/source.php b/demos/examples/redirect/source.php similarity index 100% rename from docs/examples/redirect/source.php rename to demos/examples/redirect/source.php diff --git a/docs/examples/slider/tooltip.php b/demos/examples/slider/tooltip.php similarity index 100% rename from docs/examples/slider/tooltip.php rename to demos/examples/slider/tooltip.php diff --git a/docs/examples/swipe/buenosaires.html b/demos/examples/swipe/buenosaires.html similarity index 100% rename from docs/examples/swipe/buenosaires.html rename to demos/examples/swipe/buenosaires.html diff --git a/docs/examples/swipe/capetown.html b/demos/examples/swipe/capetown.html similarity index 100% rename from docs/examples/swipe/capetown.html rename to demos/examples/swipe/capetown.html diff --git a/docs/examples/swipe/newyork.html b/demos/examples/swipe/newyork.html similarity index 100% rename from docs/examples/swipe/newyork.html rename to demos/examples/swipe/newyork.html diff --git a/docs/examples/swipe/paris.html b/demos/examples/swipe/paris.html similarity index 100% rename from docs/examples/swipe/paris.html rename to demos/examples/swipe/paris.html diff --git a/docs/examples/swipe/seoul.html b/demos/examples/swipe/seoul.html similarity index 100% rename from docs/examples/swipe/seoul.html rename to demos/examples/swipe/seoul.html diff --git a/docs/examples/swipe/swipe-list.php b/demos/examples/swipe/swipe-list.php similarity index 100% rename from docs/examples/swipe/swipe-list.php rename to demos/examples/swipe/swipe-list.php diff --git a/docs/examples/swipe/swipe-page.css b/demos/examples/swipe/swipe-page.css similarity index 100% rename from docs/examples/swipe/swipe-page.css rename to demos/examples/swipe/swipe-page.css diff --git a/docs/examples/swipe/swipe-page.js b/demos/examples/swipe/swipe-page.js similarity index 100% rename from docs/examples/swipe/swipe-page.js rename to demos/examples/swipe/swipe-page.js diff --git a/docs/examples/swipe/swipe-page.php b/demos/examples/swipe/swipe-page.php similarity index 100% rename from docs/examples/swipe/swipe-page.php rename to demos/examples/swipe/swipe-page.php diff --git a/docs/examples/swipe/sydney.html b/demos/examples/swipe/sydney.html similarity index 100% rename from docs/examples/swipe/sydney.html rename to demos/examples/swipe/sydney.html diff --git a/docs/examples/tables/financial-grouped-columns.php b/demos/examples/tables/financial-grouped-columns.php similarity index 100% rename from docs/examples/tables/financial-grouped-columns.php rename to demos/examples/tables/financial-grouped-columns.php diff --git a/docs/examples/tables/financial-grouped-reflow.php b/demos/examples/tables/financial-grouped-reflow.php similarity index 100% rename from docs/examples/tables/financial-grouped-reflow.php rename to demos/examples/tables/financial-grouped-reflow.php diff --git a/docs/examples/tables/movie-list-toggle-options.php b/demos/examples/tables/movie-list-toggle-options.php similarity index 100% rename from docs/examples/tables/movie-list-toggle-options.php rename to demos/examples/tables/movie-list-toggle-options.php diff --git a/docs/examples/tables/movie-list.php b/demos/examples/tables/movie-list.php similarity index 100% rename from docs/examples/tables/movie-list.php rename to demos/examples/tables/movie-list.php diff --git a/docs/examples/tables/phone-compare.php b/demos/examples/tables/phone-compare.php similarity index 100% rename from docs/examples/tables/phone-compare.php rename to demos/examples/tables/phone-compare.php diff --git a/docs/faq/controls-in-header-footer.php b/demos/faq/controls-in-header-footer.php similarity index 100% rename from docs/faq/controls-in-header-footer.php rename to demos/faq/controls-in-header-footer.php diff --git a/docs/faq/disabling-a-button-does-not-work.php b/demos/faq/disabling-a-button-does-not-work.php similarity index 100% rename from docs/faq/disabling-a-button-does-not-work.php rename to demos/faq/disabling-a-button-does-not-work.php diff --git a/docs/faq/dom-ready-not-working.php b/demos/faq/dom-ready-not-working.php similarity index 100% rename from docs/faq/dom-ready-not-working.php rename to demos/faq/dom-ready-not-working.php diff --git a/docs/faq/how-can-i-stop-auto-enhancement-of-a-block-of-elements.php b/demos/faq/how-can-i-stop-auto-enhancement-of-a-block-of-elements.php similarity index 100% rename from docs/faq/how-can-i-stop-auto-enhancement-of-a-block-of-elements.php rename to demos/faq/how-can-i-stop-auto-enhancement-of-a-block-of-elements.php diff --git a/docs/faq/how-can-i-stop-auto-enhancement-of-elements.php b/demos/faq/how-can-i-stop-auto-enhancement-of-elements.php similarity index 100% rename from docs/faq/how-can-i-stop-auto-enhancement-of-elements.php rename to demos/faq/how-can-i-stop-auto-enhancement-of-elements.php diff --git a/docs/faq/how-configure-phonegap-cordova.php b/demos/faq/how-configure-phonegap-cordova.php similarity index 100% rename from docs/faq/how-configure-phonegap-cordova.php rename to demos/faq/how-configure-phonegap-cordova.php diff --git a/docs/faq/how-do-i-control-page-titles.php b/demos/faq/how-do-i-control-page-titles.php similarity index 100% rename from docs/faq/how-do-i-control-page-titles.php rename to demos/faq/how-do-i-control-page-titles.php diff --git a/docs/faq/how-do-i-load-a-page.php b/demos/faq/how-do-i-load-a-page.php similarity index 100% rename from docs/faq/how-do-i-load-a-page.php rename to demos/faq/how-do-i-load-a-page.php diff --git a/docs/faq/how-do-i-scroll-to-a-position.php b/demos/faq/how-do-i-scroll-to-a-position.php similarity index 100% rename from docs/faq/how-do-i-scroll-to-a-position.php rename to demos/faq/how-do-i-scroll-to-a-position.php diff --git a/docs/faq/how-do-i-use-touch-mouse-events.php b/demos/faq/how-do-i-use-touch-mouse-events.php similarity index 100% rename from docs/faq/how-do-i-use-touch-mouse-events.php rename to demos/faq/how-do-i-use-touch-mouse-events.php diff --git a/docs/faq/how-does-theming-work.php b/demos/faq/how-does-theming-work.php similarity index 100% rename from docs/faq/how-does-theming-work.php rename to demos/faq/how-does-theming-work.php diff --git a/docs/faq/index.php b/demos/faq/index.php similarity index 100% rename from docs/faq/index.php rename to demos/faq/index.php diff --git a/docs/faq/injected-content-is-not-enhanced.php b/demos/faq/injected-content-is-not-enhanced.php similarity index 100% rename from docs/faq/injected-content-is-not-enhanced.php rename to demos/faq/injected-content-is-not-enhanced.php diff --git a/docs/faq/my-html-5-inputs-look-different-in-browsers.php b/demos/faq/my-html-5-inputs-look-different-in-browsers.php similarity index 100% rename from docs/faq/my-html-5-inputs-look-different-in-browsers.php rename to demos/faq/my-html-5-inputs-look-different-in-browsers.php diff --git a/docs/faq/my-range-search-input-type-is-being-changed.php b/demos/faq/my-range-search-input-type-is-being-changed.php similarity index 100% rename from docs/faq/my-range-search-input-type-is-being-changed.php rename to demos/faq/my-range-search-input-type-is-being-changed.php diff --git a/docs/faq/pass-query-params-to-page.php b/demos/faq/pass-query-params-to-page.php similarity index 100% rename from docs/faq/pass-query-params-to-page.php rename to demos/faq/pass-query-params-to-page.php diff --git a/docs/faq/pass-via-the-hash-to-page.php b/demos/faq/pass-via-the-hash-to-page.php similarity index 100% rename from docs/faq/pass-via-the-hash-to-page.php rename to demos/faq/pass-via-the-hash-to-page.php diff --git a/docs/faq/question-template.php b/demos/faq/question-template.php similarity index 100% rename from docs/faq/question-template.php rename to demos/faq/question-template.php diff --git a/docs/faq/scripts-and-styles-not-loading.php b/demos/faq/scripts-and-styles-not-loading.php similarity index 100% rename from docs/faq/scripts-and-styles-not-loading.php rename to demos/faq/scripts-and-styles-not-loading.php diff --git a/docs/faq/sometimes-custom-select-shows-as-dialog-popup.php b/demos/faq/sometimes-custom-select-shows-as-dialog-popup.php similarity index 100% rename from docs/faq/sometimes-custom-select-shows-as-dialog-popup.php rename to demos/faq/sometimes-custom-select-shows-as-dialog-popup.php diff --git a/docs/faq/the-application-cache-is-not-working.php b/demos/faq/the-application-cache-is-not-working.php similarity index 100% rename from docs/faq/the-application-cache-is-not-working.php rename to demos/faq/the-application-cache-is-not-working.php diff --git a/docs/faq/triggering-create-on-injected-content-does-not-work.php b/demos/faq/triggering-create-on-injected-content-does-not-work.php similarity index 100% rename from docs/faq/triggering-create-on-injected-content-does-not-work.php rename to demos/faq/triggering-create-on-injected-content-does-not-work.php diff --git a/docs/faq/updating-the-value-of-enhanced-form-elements-does-not-work.php b/demos/faq/updating-the-value-of-enhanced-form-elements-does-not-work.php similarity index 100% rename from docs/faq/updating-the-value-of-enhanced-form-elements-does-not-work.php rename to demos/faq/updating-the-value-of-enhanced-form-elements-does-not-work.php diff --git a/docs/faq/why-is-only-the-first-page-loaded.php b/demos/faq/why-is-only-the-first-page-loaded.php similarity index 100% rename from docs/faq/why-is-only-the-first-page-loaded.php rename to demos/faq/why-is-only-the-first-page-loaded.php diff --git a/docs/favicon.ico b/demos/favicon.ico similarity index 100% rename from docs/favicon.ico rename to demos/favicon.ico diff --git a/docs/global-nav.php b/demos/global-nav.php similarity index 100% rename from docs/global-nav.php rename to demos/global-nav.php diff --git a/docs/index.php b/demos/index.php similarity index 100% rename from docs/index.php rename to demos/index.php diff --git a/docs/intro/index.php b/demos/intro/index.php similarity index 100% rename from docs/intro/index.php rename to demos/intro/index.php diff --git a/docs/intro/rwd.php b/demos/intro/rwd.php similarity index 100% rename from docs/intro/rwd.php rename to demos/intro/rwd.php diff --git a/docs/nav-examples.php b/demos/nav-examples.php similarity index 100% rename from docs/nav-examples.php rename to demos/nav-examples.php diff --git a/docs/nav-faq.php b/demos/nav-faq.php similarity index 100% rename from docs/nav-faq.php rename to demos/nav-faq.php diff --git a/docs/nav-widgets.php b/demos/nav-widgets.php similarity index 100% rename from docs/nav-widgets.php rename to demos/nav-widgets.php diff --git a/docs/search-results.php b/demos/search-results.php similarity index 100% rename from docs/search-results.php rename to demos/search-results.php diff --git a/docs/search.php b/demos/search.php similarity index 100% rename from docs/search.php rename to demos/search.php diff --git a/docs/widgets/accordions/index.php b/demos/widgets/accordions/index.php similarity index 100% rename from docs/widgets/accordions/index.php rename to demos/widgets/accordions/index.php diff --git a/docs/widgets/autocomplete/autocomplete-remote.php b/demos/widgets/autocomplete/autocomplete-remote.php similarity index 100% rename from docs/widgets/autocomplete/autocomplete-remote.php rename to demos/widgets/autocomplete/autocomplete-remote.php diff --git a/docs/widgets/autocomplete/index.php b/demos/widgets/autocomplete/index.php similarity index 100% rename from docs/widgets/autocomplete/index.php rename to demos/widgets/autocomplete/index.php diff --git a/docs/widgets/buttons/index.php b/demos/widgets/buttons/index.php similarity index 100% rename from docs/widgets/buttons/index.php rename to demos/widgets/buttons/index.php diff --git a/docs/widgets/checkbox/index.php b/demos/widgets/checkbox/index.php similarity index 100% rename from docs/widgets/checkbox/index.php rename to demos/widgets/checkbox/index.php diff --git a/docs/widgets/collapsibles/index.php b/demos/widgets/collapsibles/index.php similarity index 100% rename from docs/widgets/collapsibles/index.php rename to demos/widgets/collapsibles/index.php diff --git a/docs/widgets/controlgroups/index.php b/demos/widgets/controlgroups/index.php similarity index 100% rename from docs/widgets/controlgroups/index.php rename to demos/widgets/controlgroups/index.php diff --git a/docs/widgets/dialog/dialog-alt.html b/demos/widgets/dialog/dialog-alt.html similarity index 100% rename from docs/widgets/dialog/dialog-alt.html rename to demos/widgets/dialog/dialog-alt.html diff --git a/docs/widgets/dialog/dialog-buttons.html b/demos/widgets/dialog/dialog-buttons.html similarity index 100% rename from docs/widgets/dialog/dialog-buttons.html rename to demos/widgets/dialog/dialog-buttons.html diff --git a/docs/widgets/dialog/dialog-corners.html b/demos/widgets/dialog/dialog-corners.html similarity index 100% rename from docs/widgets/dialog/dialog-corners.html rename to demos/widgets/dialog/dialog-corners.html diff --git a/docs/widgets/dialog/dialog-noclosebtn.html b/demos/widgets/dialog/dialog-noclosebtn.html similarity index 100% rename from docs/widgets/dialog/dialog-noclosebtn.html rename to demos/widgets/dialog/dialog-noclosebtn.html diff --git a/docs/widgets/dialog/dialog-overlay.html b/demos/widgets/dialog/dialog-overlay.html similarity index 100% rename from docs/widgets/dialog/dialog-overlay.html rename to demos/widgets/dialog/dialog-overlay.html diff --git a/docs/widgets/dialog/dialog-rightclosebtn.html b/demos/widgets/dialog/dialog-rightclosebtn.html similarity index 100% rename from docs/widgets/dialog/dialog-rightclosebtn.html rename to demos/widgets/dialog/dialog-rightclosebtn.html diff --git a/docs/widgets/dialog/dialog-success.html b/demos/widgets/dialog/dialog-success.html similarity index 100% rename from docs/widgets/dialog/dialog-success.html rename to demos/widgets/dialog/dialog-success.html diff --git a/docs/widgets/dialog/dialog-with-select.html b/demos/widgets/dialog/dialog-with-select.html similarity index 100% rename from docs/widgets/dialog/dialog-with-select.html rename to demos/widgets/dialog/dialog-with-select.html diff --git a/docs/widgets/dialog/dialog.html b/demos/widgets/dialog/dialog.html similarity index 100% rename from docs/widgets/dialog/dialog.html rename to demos/widgets/dialog/dialog.html diff --git a/docs/widgets/dialog/index.php b/demos/widgets/dialog/index.php similarity index 100% rename from docs/widgets/dialog/index.php rename to demos/widgets/dialog/index.php diff --git a/docs/widgets/footers/footer-persist-a.php b/demos/widgets/footers/footer-persist-a.php similarity index 100% rename from docs/widgets/footers/footer-persist-a.php rename to demos/widgets/footers/footer-persist-a.php diff --git a/docs/widgets/footers/footer-persist-b.php b/demos/widgets/footers/footer-persist-b.php similarity index 100% rename from docs/widgets/footers/footer-persist-b.php rename to demos/widgets/footers/footer-persist-b.php diff --git a/docs/widgets/footers/footer-persist-c.php b/demos/widgets/footers/footer-persist-c.php similarity index 100% rename from docs/widgets/footers/footer-persist-c.php rename to demos/widgets/footers/footer-persist-c.php diff --git a/docs/widgets/footers/footer-persist-d.php b/demos/widgets/footers/footer-persist-d.php similarity index 100% rename from docs/widgets/footers/footer-persist-d.php rename to demos/widgets/footers/footer-persist-d.php diff --git a/docs/widgets/footers/index.php b/demos/widgets/footers/index.php similarity index 100% rename from docs/widgets/footers/index.php rename to demos/widgets/footers/index.php diff --git a/docs/widgets/forms/form-disabled.php b/demos/widgets/forms/form-disabled.php similarity index 100% rename from docs/widgets/forms/form-disabled.php rename to demos/widgets/forms/form-disabled.php diff --git a/docs/widgets/forms/form-fieldcontain.php b/demos/widgets/forms/form-fieldcontain.php similarity index 100% rename from docs/widgets/forms/form-fieldcontain.php rename to demos/widgets/forms/form-fieldcontain.php diff --git a/docs/widgets/forms/form-gallery.php b/demos/widgets/forms/form-gallery.php similarity index 100% rename from docs/widgets/forms/form-gallery.php rename to demos/widgets/forms/form-gallery.php diff --git a/docs/widgets/forms/form-hide-label.php b/demos/widgets/forms/form-hide-label.php similarity index 100% rename from docs/widgets/forms/form-hide-label.php rename to demos/widgets/forms/form-hide-label.php diff --git a/docs/widgets/forms/form-label-hidden.php b/demos/widgets/forms/form-label-hidden.php similarity index 100% rename from docs/widgets/forms/form-label-hidden.php rename to demos/widgets/forms/form-label-hidden.php diff --git a/docs/widgets/forms/index.php b/demos/widgets/forms/index.php similarity index 100% rename from docs/widgets/forms/index.php rename to demos/widgets/forms/index.php diff --git a/docs/widgets/grids/grid-buttons.php b/demos/widgets/grids/grid-buttons.php similarity index 100% rename from docs/widgets/grids/grid-buttons.php rename to demos/widgets/grids/grid-buttons.php diff --git a/docs/widgets/grids/grid-custom.php b/demos/widgets/grids/grid-custom.php similarity index 100% rename from docs/widgets/grids/grid-custom.php rename to demos/widgets/grids/grid-custom.php diff --git a/docs/widgets/grids/index.php b/demos/widgets/grids/index.php similarity index 100% rename from docs/widgets/grids/index.php rename to demos/widgets/grids/index.php diff --git a/docs/widgets/headers/bars-fixed-forms.php b/demos/widgets/headers/bars-fixed-forms.php similarity index 100% rename from docs/widgets/headers/bars-fixed-forms.php rename to demos/widgets/headers/bars-fixed-forms.php diff --git a/docs/widgets/headers/bars-fixed.php b/demos/widgets/headers/bars-fixed.php similarity index 100% rename from docs/widgets/headers/bars-fixed.php rename to demos/widgets/headers/bars-fixed.php diff --git a/docs/widgets/headers/bars-fullscreen.php b/demos/widgets/headers/bars-fullscreen.php similarity index 100% rename from docs/widgets/headers/bars-fullscreen.php rename to demos/widgets/headers/bars-fullscreen.php diff --git a/docs/widgets/headers/index.php b/demos/widgets/headers/index.php similarity index 100% rename from docs/widgets/headers/index.php rename to demos/widgets/headers/index.php diff --git a/docs/widgets/icons/index.php b/demos/widgets/icons/index.php similarity index 100% rename from docs/widgets/icons/index.php rename to demos/widgets/icons/index.php diff --git a/docs/widgets/index.php b/demos/widgets/index.php similarity index 100% rename from docs/widgets/index.php rename to demos/widgets/index.php diff --git a/docs/widgets/links/index.php b/demos/widgets/links/index.php similarity index 100% rename from docs/widgets/links/index.php rename to demos/widgets/links/index.php diff --git a/docs/widgets/listviews/index.php b/demos/widgets/listviews/index.php similarity index 100% rename from docs/widgets/listviews/index.php rename to demos/widgets/listviews/index.php diff --git a/docs/widgets/loader/index.php b/demos/widgets/loader/index.php similarity index 100% rename from docs/widgets/loader/index.php rename to demos/widgets/loader/index.php diff --git a/docs/widgets/navbar/footer-persist-a.php b/demos/widgets/navbar/footer-persist-a.php similarity index 100% rename from docs/widgets/navbar/footer-persist-a.php rename to demos/widgets/navbar/footer-persist-a.php diff --git a/docs/widgets/navbar/footer-persist-b.php b/demos/widgets/navbar/footer-persist-b.php similarity index 100% rename from docs/widgets/navbar/footer-persist-b.php rename to demos/widgets/navbar/footer-persist-b.php diff --git a/docs/widgets/navbar/footer-persist-c.php b/demos/widgets/navbar/footer-persist-c.php similarity index 100% rename from docs/widgets/navbar/footer-persist-c.php rename to demos/widgets/navbar/footer-persist-c.php diff --git a/docs/widgets/navbar/footer-persist-d.php b/demos/widgets/navbar/footer-persist-d.php similarity index 100% rename from docs/widgets/navbar/footer-persist-d.php rename to demos/widgets/navbar/footer-persist-d.php diff --git a/docs/widgets/navbar/index.php b/demos/widgets/navbar/index.php similarity index 100% rename from docs/widgets/navbar/index.php rename to demos/widgets/navbar/index.php diff --git a/docs/widgets/navigation/demo.js b/demos/widgets/navigation/demo.js similarity index 100% rename from docs/widgets/navigation/demo.js rename to demos/widgets/navigation/demo.js diff --git a/docs/widgets/navigation/index.php b/demos/widgets/navigation/index.php similarity index 100% rename from docs/widgets/navigation/index.php rename to demos/widgets/navigation/index.php diff --git a/docs/widgets/pages/index.php b/demos/widgets/pages/index.php similarity index 100% rename from docs/widgets/pages/index.php rename to demos/widgets/pages/index.php diff --git a/docs/widgets/pages/multipage-template.php b/demos/widgets/pages/multipage-template.php similarity index 100% rename from docs/widgets/pages/multipage-template.php rename to demos/widgets/pages/multipage-template.php diff --git a/docs/widgets/panels/index.php b/demos/widgets/panels/index.php similarity index 100% rename from docs/widgets/panels/index.php rename to demos/widgets/panels/index.php diff --git a/docs/widgets/panels/panel-fixed.php b/demos/widgets/panels/panel-fixed.php similarity index 100% rename from docs/widgets/panels/panel-fixed.php rename to demos/widgets/panels/panel-fixed.php diff --git a/docs/widgets/popup/index.php b/demos/widgets/popup/index.php similarity index 100% rename from docs/widgets/popup/index.php rename to demos/widgets/popup/index.php diff --git a/docs/widgets/popup/map.html b/demos/widgets/popup/map.html similarity index 100% rename from docs/widgets/popup/map.html rename to demos/widgets/popup/map.html diff --git a/docs/widgets/popup/popup-examples.css b/demos/widgets/popup/popup-examples.css similarity index 100% rename from docs/widgets/popup/popup-examples.css rename to demos/widgets/popup/popup-examples.css diff --git a/docs/widgets/popup/popup-examples.js b/demos/widgets/popup/popup-examples.js similarity index 100% rename from docs/widgets/popup/popup-examples.js rename to demos/widgets/popup/popup-examples.js diff --git a/docs/widgets/popup/popup-iframes.php b/demos/widgets/popup/popup-iframes.php similarity index 100% rename from docs/widgets/popup/popup-iframes.php rename to demos/widgets/popup/popup-iframes.php diff --git a/docs/widgets/popup/popup-images.php b/demos/widgets/popup/popup-images.php similarity index 100% rename from docs/widgets/popup/popup-images.php rename to demos/widgets/popup/popup-images.php diff --git a/docs/widgets/radiobuttons/index.php b/demos/widgets/radiobuttons/index.php similarity index 100% rename from docs/widgets/radiobuttons/index.php rename to demos/widgets/radiobuttons/index.php diff --git a/docs/widgets/selects/custom-selects.php b/demos/widgets/selects/custom-selects.php similarity index 100% rename from docs/widgets/selects/custom-selects.php rename to demos/widgets/selects/custom-selects.php diff --git a/docs/widgets/selects/index.php b/demos/widgets/selects/index.php similarity index 100% rename from docs/widgets/selects/index.php rename to demos/widgets/selects/index.php diff --git a/docs/widgets/sliders/index.php b/demos/widgets/sliders/index.php similarity index 100% rename from docs/widgets/sliders/index.php rename to demos/widgets/sliders/index.php diff --git a/docs/widgets/sliders/rangeslider.php b/demos/widgets/sliders/rangeslider.php similarity index 100% rename from docs/widgets/sliders/rangeslider.php rename to demos/widgets/sliders/rangeslider.php diff --git a/docs/widgets/sliders/switch.php b/demos/widgets/sliders/switch.php similarity index 100% rename from docs/widgets/sliders/switch.php rename to demos/widgets/sliders/switch.php diff --git a/docs/widgets/table-column-toggle/index.php b/demos/widgets/table-column-toggle/index.php similarity index 100% rename from docs/widgets/table-column-toggle/index.php rename to demos/widgets/table-column-toggle/index.php diff --git a/docs/widgets/table-reflow/index.php b/demos/widgets/table-reflow/index.php similarity index 100% rename from docs/widgets/table-reflow/index.php rename to demos/widgets/table-reflow/index.php diff --git a/docs/widgets/textinputs/index.php b/demos/widgets/textinputs/index.php similarity index 100% rename from docs/widgets/textinputs/index.php rename to demos/widgets/textinputs/index.php diff --git a/docs/widgets/transitions/index.php b/demos/widgets/transitions/index.php similarity index 100% rename from docs/widgets/transitions/index.php rename to demos/widgets/transitions/index.php diff --git a/docs/widgets/transitions/page-transitions-dialog.php b/demos/widgets/transitions/page-transitions-dialog.php similarity index 100% rename from docs/widgets/transitions/page-transitions-dialog.php rename to demos/widgets/transitions/page-transitions-dialog.php diff --git a/docs/widgets/transitions/page-transitions-page.php b/demos/widgets/transitions/page-transitions-page.php similarity index 100% rename from docs/widgets/transitions/page-transitions-page.php rename to demos/widgets/transitions/page-transitions-page.php diff --git a/index.php b/index.php index a489309650f..83275cbde58 100644 --- a/index.php +++ b/index.php @@ -5,20 +5,20 @@ jQuery Mobile Demos - - + + - +
-

jQuery Mobile Framework

+

jQuery Mobile Framework

Search - +
@@ -39,10 +39,10 @@

Widget reference

@@ -50,7 +50,7 @@

Test drive every component in the library, and easily build pages by copying and pasting the markup configuration you need.

    - +
From a992db295bb43265341881b48e0c9e3c5fb11d07 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 20:39:12 -0700 Subject: [PATCH 76/94] Demos: Changed the way the version is set on demo pages --- demos/_assets/js/jqm-demos.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/demos/_assets/js/jqm-demos.js b/demos/_assets/js/jqm-demos.js index b6a3e87dbea..677ed3c498d 100644 --- a/demos/_assets/js/jqm-demos.js +++ b/demos/_assets/js/jqm-demos.js @@ -49,8 +49,8 @@ $( document ).on( "pageinit", function() { var version = $.mobile.version || "dev", words = version.split( "-" ), ver = words[0], - str = ( words[1] || "Final" ), - html = "Version " + ver; + str = version === "dev" ? "" : ( words[1] || "Final" ), + text = ver; if ( str.indexOf( "rc" ) == -1 ) { str = str.charAt( 0 ).toUpperCase() + str.slice( 1 ); @@ -59,10 +59,11 @@ $( document ).on( "pageinit", function() { } if ( $.mobile.version && str ) { - html += " " + str; + text += " " + str; } - $( ".jqm-version" ).html( html ); + $( ".jqm-version" ).html( "Version " + text ); + $( ".jqm-version-number" ).html( text ); }); From 8c227aef013ebb7659aaa1953b515e9ef2129c46 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 20:43:21 -0700 Subject: [PATCH 77/94] Build: Added grunt-contrib-clean --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 88008eb63c2..ccbd202592e 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "devDependencies": { "async": "latest", "grunt": "0.4.x", + "grunt-contrib-clean": "~0.4.0", "grunt-contrib-compress": "~0.4.1", "grunt-contrib-concat": "git://github.com/gruntjs/grunt-contrib-concat.git", "grunt-contrib-connect": "git://github.com/gruntjs/grunt-contrib-connect.git", From d3fc23b71ce81105651cc6a7f9ea4b89462d18c4 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 21:04:41 -0700 Subject: [PATCH 78/94] Demos: Completed move from docs to demos --- demos/_assets/js/globalnav.js | 2 +- demos/examples/index.php | 2 +- demos/faq/index.php | 2 +- demos/global-nav.php | 4 +-- demos/index.php | 66 ++++++++++++++++++++++++++--------- demos/widgets/index.php | 2 +- index.php | 64 +++------------------------------ 7 files changed, 61 insertions(+), 81 deletions(-) diff --git a/demos/_assets/js/globalnav.js b/demos/_assets/js/globalnav.js index e5373686646..7f356bb7d8d 100644 --- a/demos/_assets/js/globalnav.js +++ b/demos/_assets/js/globalnav.js @@ -22,7 +22,7 @@ } }, _globalnav: function(){ - var base = $( "base" ).attr( "href" ).split('docs')[0], + var base = $( "base" ).attr( "href" ).split('demos')[0], base = base.split('index.html')[0] + this.options.globalNav + "/"; this.element.find( "a" ).each(function() { diff --git a/demos/examples/index.php b/demos/examples/index.php index 4ac82809bb6..b67fede63c7 100644 --- a/demos/examples/index.php +++ b/demos/examples/index.php @@ -28,7 +28,7 @@

This section explores how you can customize, extend, re-style and take full advantage of jQuery Mobile.

-
    +
    diff --git a/demos/faq/index.php b/demos/faq/index.php index 471c95bb91f..6083b0b53ac 100644 --- a/demos/faq/index.php +++ b/demos/faq/index.php @@ -28,7 +28,7 @@

    We've collected common questions and solutions to help get you up to speed and solve tricky issues when working with jQuery Mobile.

    -
      +
      diff --git a/demos/global-nav.php b/demos/global-nav.php index c8c0e10643d..aac28b8b8af 100644 --- a/demos/global-nav.php +++ b/demos/global-nav.php @@ -1,7 +1,7 @@
      -
        +
        • jQuery Mobile Demos
          • -
        • Home
          • +
        • Home
        • Introduction
        • Demo Showcase
        • Questions & Answers
          • diff --git a/demos/index.php b/demos/index.php index 6823706137b..b269ff8f097 100644 --- a/demos/index.php +++ b/demos/index.php @@ -1,31 +1,65 @@ - - - - - - - - jQuery Mobile Demos - - - + + + jQuery Mobile Demos + + + - - - + + + -
          +
          + +
          +

          jQuery Mobile Framework

          + Search + +
          -

          Nothing to see here folks. View the documentation home page →

          +
          +

          Demo center for

          + +

          jQuery Mobile is a touch-optimized HTML5 UI framework designed to make sites and apps that are accessible on all popular smartphone, tablet and desktop devices.

          + +

          For technical info, visit the API documentation.

          + +
          + +
          +

          The API docs are a separate site from the demos and cover the technical details of each jQuery Mobile plugin in depth.

          + Stay here + Visit API Site +
          + + + +

          Widget reference

          + +

          Test drive every component in the library, and easily build pages by copying and pasting the markup configuration you need.

          + +
            + +
          +
          +

          +

          Copyright 2013 The jQuery Foundation

          +
          +
          diff --git a/demos/widgets/index.php b/demos/widgets/index.php index c36aa4f0b65..a79be1bde08 100644 --- a/demos/widgets/index.php +++ b/demos/widgets/index.php @@ -28,7 +28,7 @@

          This section is a reference for all widget options.

          -
            +
            • Widget reference
            diff --git a/index.php b/index.php index 83275cbde58..e9ccff932f3 100644 --- a/index.php +++ b/index.php @@ -1,65 +1,11 @@ - - - jQuery Mobile Demos - - - - - - - + + + + + -
            - -
            -

            jQuery Mobile Framework

            - Search - -
            - -
            - -
            -

            Demo center for 1.3.0

            - -

            jQuery Mobile is a touch-optimized HTML5 UI framework designed to make sites and apps that are accessible on all popular smartphone, tablet and desktop devices.

            - -

            For technical info, visit the API documentation.

            - -
            - -
            -

            The API docs are a separate site from the demos and cover the technical details of each jQuery Mobile plugin in depth.

            - Stay here - Visit API Site -
            - - - -

            Widget reference

            - -

            Test drive every component in the library, and easily build pages by copying and pasting the markup configuration you need.

            - -
              - -
            - -
            - -
            -

            -

            Copyright 2013 The jQuery Foundation

            -
            - -
            - From d94bce18c5f79a65a430693ffb1eb77e307eda42 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 21:09:40 -0700 Subject: [PATCH 79/94] Demos: Removed "Final" from the version string --- demos/_assets/js/jqm-demos.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/_assets/js/jqm-demos.js b/demos/_assets/js/jqm-demos.js index 677ed3c498d..8fc475801c2 100644 --- a/demos/_assets/js/jqm-demos.js +++ b/demos/_assets/js/jqm-demos.js @@ -49,7 +49,7 @@ $( document ).on( "pageinit", function() { var version = $.mobile.version || "dev", words = version.split( "-" ), ver = words[0], - str = version === "dev" ? "" : ( words[1] || "Final" ), + str = words[1] || "", text = ver; if ( str.indexOf( "rc" ) == -1 ) { From 663f80ce425d4b626a12b0668537064ed4016ed9 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 21:11:32 -0700 Subject: [PATCH 80/94] Build: New demos + clean target --- Gruntfile.js | 57 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 68b8acd7648..6d12abf9c12 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -29,6 +29,7 @@ module.exports = function( grunt ) { // grunt plugins grunt.loadNpmTasks( "grunt-contrib-jshint" ); + grunt.loadNpmTasks( "grunt-contrib-clean" ); grunt.loadNpmTasks( "grunt-contrib-copy" ); grunt.loadNpmTasks( "grunt-contrib-compress" ); grunt.loadNpmTasks( "grunt-contrib-concat" ); @@ -133,18 +134,17 @@ module.exports = function( grunt ) { dest: path.join( dist, name ) + ".js" }, demos: { - src: [ "docs/demos/_assets/js/*.js" ], - dest: path.join( dist, "demos/_assets/js/demos.js" ) + src: [ "demos/_assets/js/*.js" ], + dest: path.join( dist, "demos/_assets/js/index.js" ) } }, uglify: { all: { options: { - cwd: dist, banner: banner.minified, - sourceMapPrefix: 1, sourceMap: path.join( dist, name ) + ".min.map", + sourceMappingURL: "./" + name + ".min.map", beautify: { ascii_only: true } @@ -214,36 +214,56 @@ module.exports = function( grunt ) { src: "*", dest: path.join( dist, "images/" ), }, - "demos.processed": { + "demos.firstpass": { options: { - processContentExclude: [ "**/*.png", "**/*.gif" ], processContent: function( content, srcPath ) { - if ( srcPath === "docs/demos/nav.html" ) { - return false; - } - content = content.replace( /_assets\/js\/">/gi, "_assets/js/demos.js\">" ); - content = content.replace( /\.\.\/\.\.\/js\/">/gi, "js/" + name + ".min.js\">" ); - content = content.replace( /\.\.\/\.\.\/css\//gi, "css/" ); + content = content.replace( /_assets\/js\/">/gi, "_assets/js/index.js\">" ); + content = content.replace( /\.\.\/js\//gi, "js/" ); + content = content.replace( /js\/"/gi, "js/" + name + ".min.js\"" ); + content = content.replace( /\.\.\/css\//gi, "css/" ); content = content.replace( /^\s*<\?php include\(\s*['"]([^'"]+)['"].*$/gmi, function( match, includePath, offset, string ) { var fileToInclude = path.resolve( path.join( path.dirname( srcPath ), includePath ) ); return grunt.file.read( fileToInclude ); } ); + content = content.replace( /\.php/gi, ".html" ); return content; } }, files: [ { expand: true, - cwd: "docs/demos", - src: [ "**" ], - dest: path.join( dist, "demos/" ) + src: [ "*.php", "demos/**/*.php" ], + dest: dist, + ext: ".html" + } + ] + }, + "demos.secondpass": { + options: { + processContentExclude: [ "**/*.png", "**/*.gif" ], + processContent: function( content, srcPath ) { + content = content.replace( /\.php/gi, ".html" ); + return content; + } + }, + files: [ + { + expand: true, + src: [ "demos/**", "!**/*.php" ], + dest: dist } ] }, "demos.unprocessed": { files: [ + { + expand: true, + cwd: "js", + src: [ "jquery.js" ], + dest: path.join( dist, "demos/js/" ) + }, { expand: true, cwd: dist, @@ -405,8 +425,9 @@ module.exports = function( grunt ) { options: { versionRegExp: /^(\d)\.(\d+)\.(\d)(-(?:alpha|beta|rc)\.\d|pre)?$/ } - } + }, + clean: [ dist ] }); grunt.registerTask( "js:release", [ "requirejs", "concat:js", "uglify" ] ); @@ -416,7 +437,7 @@ module.exports = function( grunt ) { grunt.registerTask( "css:release", [ "cssbuild", "cssmin" ] ); grunt.registerTask( "css", [ "config:dev", "css:release" ] ); - grunt.registerTask( "demos", [ "concat:demos", "copy:demos.processed", "copy:demos.unprocessed" ] ); + grunt.registerTask( "demos", [ "concat:demos", "copy:demos.firstpass", "copy:demos.secondpass", "copy:demos.unprocessed" ] ); grunt.registerTask( "dist:release", [ "js:release", "css:release", "copy:images", "demos", "compress:dist" ] ); grunt.registerTask( "dist", [ "config:dev", "dist:release" ] ); @@ -426,7 +447,7 @@ module.exports = function( grunt ) { grunt.registerTask( "test:ci", [ "qunit_junit", "connect", "qunit:http" ] ); grunt.registerTask( "deploy:latest", [ "release:init", "release:git:status", "dist:release", "rsync:latest", "curl:latest" ] ); - grunt.registerTask( "deploy:release", ["release:init", "release:git:status", "release:set-version", "recurse:_deploy", "release:set-next-version" ] ); + grunt.registerTask( "deploy:release", [ "release:init", "release:git:status", "release:set-version", "recurse:_deploy", "release:set-next-version" ] ); grunt.registerTask( "_deploy", [ "release:init", "release:fail-if-pre", "dist:release", "rsync:release" ] ); // Default grunt From b22a8564a3ed2573fddb829c7880d0ca37bb48c1 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 21:38:33 -0700 Subject: [PATCH 81/94] Build: Added task "lint" as an alias to "jshint" --- Gruntfile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 6d12abf9c12..057bd430c4c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -430,10 +430,11 @@ module.exports = function( grunt ) { clean: [ dist ] }); + grunt.registerTask( "lint", [ "jshint" ] ); + grunt.registerTask( "js:release", [ "requirejs", "concat:js", "uglify" ] ); grunt.registerTask( "js", [ "config:dev", "js:release" ] ); - grunt.registerTask( "css:release", [ "cssbuild", "cssmin" ] ); grunt.registerTask( "css", [ "config:dev", "css:release" ] ); From 4854ee9fdfd81c4e94ec12526ebe157993b00136 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 21:39:03 -0700 Subject: [PATCH 82/94] Quality: Fixed lints --- js/jquery.tag.inserter.js | 13 ++--- js/widgets/forms/rangeslider.js | 2 +- js/widgets/forms/slider.js | 82 +++++++++++++++--------------- js/widgets/forms/slider.tooltip.js | 2 +- js/widgets/forms/textinput.js | 2 +- 5 files changed, 52 insertions(+), 49 deletions(-) diff --git a/js/jquery.tag.inserter.js b/js/jquery.tag.inserter.js index 39da85fccfd..99d55b22329 100644 --- a/js/jquery.tag.inserter.js +++ b/js/jquery.tag.inserter.js @@ -1,4 +1,5 @@ -(function() { +(function () { + /*jshint evil: true */ // Insert a script tag pointing at the desired version of jQuery // Get the version from the url @@ -10,8 +11,8 @@ url = baseUrl + "jquery.js"; if ( results ) { - version = decodeURIComponent(results[results.length - 1].replace(/\+/g, " ")); - url = "http://code.jquery.com/jquery-"+version+".js"; + version = decodeURIComponent( results[results.length - 1].replace( /\+/g, " " ) ); + url = "http://code.jquery.com/jquery-" + version + ".js"; } document.write( "" ); @@ -19,8 +20,8 @@ document.write( '' + 'define( "jquery", [], function () { return jQuery; } );' + + '}' + + '' ); }()); \ No newline at end of file diff --git a/js/widgets/forms/rangeslider.js b/js/widgets/forms/rangeslider.js index 71040641ba8..3a5545ea025 100644 --- a/js/widgets/forms/rangeslider.js +++ b/js/widgets/forms/rangeslider.js @@ -129,7 +129,7 @@ define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", ". }, _change: function( event ) { - if ( event.type == "keyup" ) { + if ( event.type === "keyup" ) { this._updateHighlight(); return false; } diff --git a/js/widgets/forms/slider.js b/js/widgets/forms/slider.js index e9cb8e9ad44..017f479af29 100644 --- a/js/widgets/forms/slider.js +++ b/js/widgets/forms/slider.js @@ -50,7 +50,8 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( { bg.className = "ui-slider-bg " + $.mobile.activeBtnClass + " ui-btn-corner-all"; return $( bg ).prependTo( slider ); })() : false, - options; + options, + wrapper; domHandle.setAttribute( "href", "#" ); domSlider.setAttribute( "role", "application" ); @@ -85,7 +86,7 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( { }); if ( this.isToggleSwitch ) { - var wrapper = document.createElement( "div" ); + wrapper = document.createElement( "div" ); wrapper.className = "ui-slider-inneroffset"; for ( var j = 0, length = domSlider.childNodes.length; j < length; j++ ) { @@ -141,7 +142,7 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( { // wrap in a div for styling purposes if ( !this.isToggleSwitch && !isRangeslider ) { - var wrapper = this.options.mini ? "
            " : "
            "; + wrapper = this.options.mini ? "
            " : "
            "; control.add( slider ).wrapAll( wrapper ); } @@ -211,42 +212,42 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( { // In all cases prevent the default and mark the handle as active switch ( event.keyCode ) { - case $.mobile.keyCode.HOME: - case $.mobile.keyCode.END: - case $.mobile.keyCode.PAGE_UP: - case $.mobile.keyCode.PAGE_DOWN: - case $.mobile.keyCode.UP: - case $.mobile.keyCode.RIGHT: - case $.mobile.keyCode.DOWN: - case $.mobile.keyCode.LEFT: - event.preventDefault(); - - if ( !this._keySliding ) { - this._keySliding = true; - this.handle.addClass( "ui-state-active" ); - } + case $.mobile.keyCode.HOME: + case $.mobile.keyCode.END: + case $.mobile.keyCode.PAGE_UP: + case $.mobile.keyCode.PAGE_DOWN: + case $.mobile.keyCode.UP: + case $.mobile.keyCode.RIGHT: + case $.mobile.keyCode.DOWN: + case $.mobile.keyCode.LEFT: + event.preventDefault(); + + if ( !this._keySliding ) { + this._keySliding = true; + this.handle.addClass( "ui-state-active" ); + } - break; + break; } // move the slider according to the keypress switch ( event.keyCode ) { - case $.mobile.keyCode.HOME: - this.refresh( this.min ); - break; - case $.mobile.keyCode.END: - this.refresh( this.max ); - break; - case $.mobile.keyCode.PAGE_UP: - case $.mobile.keyCode.UP: - case $.mobile.keyCode.RIGHT: - this.refresh( index + this.step ); - break; - case $.mobile.keyCode.PAGE_DOWN: - case $.mobile.keyCode.DOWN: - case $.mobile.keyCode.LEFT: - this.refresh( index - this.step ); - break; + case $.mobile.keyCode.HOME: + this.refresh( this.min ); + break; + case $.mobile.keyCode.END: + this.refresh( this.max ); + break; + case $.mobile.keyCode.PAGE_UP: + case $.mobile.keyCode.UP: + case $.mobile.keyCode.RIGHT: + this.refresh( index + this.step ); + break; + case $.mobile.keyCode.PAGE_DOWN: + case $.mobile.keyCode.DOWN: + case $.mobile.keyCode.LEFT: + this.refresh( index - this.step ); + break; } }, // remove active mark @@ -276,7 +277,7 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( { this.refresh( event ); - this._trigger( "start" ); + this._trigger( "start" ); return false; }, @@ -332,7 +333,7 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( { }, _checkedRefresh: function() { - if ( this.value != this._value() ) { + if ( this.value !== this._value() ) { this.refresh( this._value() ); } }, @@ -353,7 +354,8 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( { var self = this, parentTheme = $.mobile.getInheritedTheme( this.element, "c" ), theme = this.options.theme || parentTheme, - trackTheme = this.options.trackTheme || parentTheme; + trackTheme = this.options.trackTheme || parentTheme, + left, width, data, tol; self.slider[0].className = [ this.isToggleSwitch ? "ui-slider ui-slider-switch" : "ui-slider-track"," ui-btn-down-" + trackTheme,' ui-btn-corner-all', ( this.options.mini ) ? " ui-mini":""].join( "" ); if ( this.options.disabled || this.element.attr( "disabled" ) ) { @@ -380,9 +382,9 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( { step = ( isInput && parseFloat( control.attr( "step" ) ) > 0 ) ? parseFloat( control.attr( "step" ) ) : 1; if ( typeof val === "object" ) { - var left, width, data = val, - // a slight tolerance helped get to the ends of the slider - tol = 8; + data = val; + // a slight tolerance helped get to the ends of the slider + tol = 8; left = this.slider.offset().left; width = this.slider.width(); diff --git a/js/widgets/forms/slider.tooltip.js b/js/widgets/forms/slider.tooltip.js index ee93515fa18..95e7b5f59d1 100644 --- a/js/widgets/forms/slider.tooltip.js +++ b/js/widgets/forms/slider.tooltip.js @@ -5,7 +5,7 @@ //>>css.theme: ../css/themes/default/jquery.mobile.theme.css //>>css.structure: ../css/structure/jquery.mobile.slider.tooltip.css -define( [ "jquery", "./slider" ], function( $ ) { +define( [ "jquery", "./slider" ], function( jQuery ) { //>>excludeEnd("jqmBuildExclude"); (function( $, undefined ) { diff --git a/js/widgets/forms/textinput.js b/js/widgets/forms/textinput.js index 40d100218a1..2ee20012b36 100644 --- a/js/widgets/forms/textinput.js +++ b/js/widgets/forms/textinput.js @@ -112,7 +112,7 @@ $.widget( "mobile.textinput", $.mobile.widget, { if ( o.preventFocusZoom ) { $.mobile.zoom.enable( true ); } - }) + }); // Autogrow if ( input.is( "textarea" ) ) { From d531826aee25af5689de736a9357bf36589c0372 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 21:52:23 -0700 Subject: [PATCH 83/94] Build: Added tagging task --- Gruntfile.js | 4 ++-- build/tasks/release.js | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 057bd430c4c..3757d0193aa 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -447,8 +447,8 @@ module.exports = function( grunt ) { grunt.registerTask( "test", [ "config:dev", "requirejs", "connect", "qunit:http" ] ); grunt.registerTask( "test:ci", [ "qunit_junit", "connect", "qunit:http" ] ); - grunt.registerTask( "deploy:latest", [ "release:init", "release:git:status", "dist:release", "rsync:latest", "curl:latest" ] ); - grunt.registerTask( "deploy:release", [ "release:init", "release:git:status", "release:set-version", "recurse:_deploy", "release:set-next-version" ] ); + grunt.registerTask( "deploy:latest", [ "release:init", "release:check-git-status", "dist:release", "rsync:latest", "curl:latest" ] ); + grunt.registerTask( "deploy:release", [ "release:init", "release:check-git-status", "release:set-version", "release:tag", "recurse:_deploy", "release:set-next-version" ] ); grunt.registerTask( "_deploy", [ "release:init", "release:fail-if-pre", "dist:release", "rsync:release" ] ); // Default grunt diff --git a/build/tasks/release.js b/build/tasks/release.js index 44c177a0b3c..0485ae67860 100644 --- a/build/tasks/release.js +++ b/build/tasks/release.js @@ -100,7 +100,7 @@ module.exports = function( grunt ) { grunt.task.run( "release:set-version:" + nextVersion ); }); - grunt.registerTask( 'release:git:status', 'Retrieve git status and ensures the workspace is clean', function() { + grunt.registerTask( 'release:check-git-status', 'Retrieve git status and ensures the workspace is clean', function() { var done = this.async(); grunt.util.spawn( @@ -131,5 +131,36 @@ module.exports = function( grunt ) { ); }); + grunt.registerTask( 'release:tag', 'Tag the repo with the current release', function() { + var done = this.async(), + gitArgs = [ "tag", releaseVersion ], + child; + + grunt.log.writeln( "`git " + gitArgs.join( " " ) + "`" ); + + if ( !isDryRun ) { + child = grunt.util.spawn( + { + cmd: "git", + args: gitArgs + }, + function ( err, result ) { + if ( err ) { + grunt.log.error( result.stderr ); + return done( false ); + } + + grunt.log.ok( "Version bumped to " + newVersion ); + done(); + } + ); + + child.stdout.setEncoding( "utf8" ); + child.stdout.on( "data", function( data ) { + grunt.log.write( data ); + }); + } + }) + grunt.registerTask( 'release', [ "release:init", "release:git:status" ]); }; \ No newline at end of file From 45ffb10d1ac602c6e8d21ee96de002c4ce81dc3c Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 1 Mar 2013 21:55:39 -0700 Subject: [PATCH 84/94] Build: Fixed tagging task --- build/tasks/release.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tasks/release.js b/build/tasks/release.js index 0485ae67860..f939c53487a 100644 --- a/build/tasks/release.js +++ b/build/tasks/release.js @@ -150,7 +150,7 @@ module.exports = function( grunt ) { return done( false ); } - grunt.log.ok( "Version bumped to " + newVersion ); + grunt.log.ok( "Created tag: " + releaseVersion ); done(); } ); From d5aaae5abc3202394c1aeb8d86fee24600630cec Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sat, 2 Mar 2013 15:41:43 -0700 Subject: [PATCH 85/94] Build: Fixed sourceMap by removing the leading "dist/" Added a linefeed at the end of the minified copyright Whitespace changes --- Gruntfile.js | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 3757d0193aa..25f415a45a9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -24,7 +24,7 @@ module.exports = function( grunt ) { "", "", "" ].join( grunt.util.linefeed ), - minified: "/*! jQuery Mobile <%= version %> | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */" + minified: "/*! jQuery Mobile <%= version %> | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */\n" }; // grunt plugins @@ -144,13 +144,13 @@ module.exports = function( grunt ) { options: { banner: banner.minified, sourceMap: path.join( dist, name ) + ".min.map", - sourceMappingURL: "./" + name + ".min.map", + sourceMappingURL: name + ".min.map", beautify: { ascii_only: true } }, files: { - "dist/jquery.mobile.min.js": path.join( dist, name ) + ".js", + "dist/jquery.mobile.min.js": path.join( dist, name ) + ".js" } } }, @@ -175,7 +175,7 @@ module.exports = function( grunt ) { //inlining. The value of this option should be a string of comma separated //CSS file names to ignore (like 'a.css,b.css'. The file names should match //whatever strings are used in the @import calls. - cssImportIgnore: null, + cssImportIgnore: null }, all: { files: { @@ -283,6 +283,21 @@ module.exports = function( grunt ) { dest: path.join( dist, "demos/" ) }, ] + }, + sourcemap: { + // Processes the sourceMap to fix issue: https://github.com/mishoo/UglifyJS2/issues/47 + options: { + processContent: function( content, srcPath ) { + content = content.replace( /"dist\//g, "\"" ); + return content; + } + }, + files: [ + { + src: "<%= uglify.all.options.sourceMap %>", + dest: "<%= uglify.all.options.sourceMap %>" + } + ] } }, @@ -400,7 +415,7 @@ module.exports = function( grunt ) { "jquery.mobile.structure-<%= pkg.version %>.css": path.join( dist, "jquery.mobile.structure.css" ), "jquery.mobile.structure-<%= pkg.version %>.min.css": path.join( dist, "jquery.mobile.structure.min.css" ), "jquery.mobile.structure-<%= pkg.version %>.zip": path.join( dist, "jquery.mobile.structure.min.css" ) - } + } }, latest: { files: { @@ -432,7 +447,7 @@ module.exports = function( grunt ) { grunt.registerTask( "lint", [ "jshint" ] ); - grunt.registerTask( "js:release", [ "requirejs", "concat:js", "uglify" ] ); + grunt.registerTask( "js:release", [ "requirejs", "concat:js", "uglify", "copy:sourcemap" ] ); grunt.registerTask( "js", [ "config:dev", "js:release" ] ); grunt.registerTask( "css:release", [ "cssbuild", "cssmin" ] ); @@ -443,7 +458,6 @@ module.exports = function( grunt ) { grunt.registerTask( "dist:release", [ "js:release", "css:release", "copy:images", "demos", "compress:dist" ] ); grunt.registerTask( "dist", [ "config:dev", "dist:release" ] ); - grunt.registerTask( "test", [ "config:dev", "requirejs", "connect", "qunit:http" ] ); grunt.registerTask( "test:ci", [ "qunit_junit", "connect", "qunit:http" ] ); From b50bdc14616ec4dd9b1dfb8b0ce8b47cdf6e926e Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sun, 3 Mar 2013 22:24:20 -0700 Subject: [PATCH 86/94] Build: Fixed function that selects tests to run Stripped index.html from test urls as some tests don't react well to it Added comments --- Gruntfile.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 25f415a45a9..ae0fc29a8cf 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -319,6 +319,8 @@ module.exports = function( grunt ) { base: '.', middleware: function(connect, options) { return [ + // For requests to "[...]/js/" return the built jquery.mobile.js + // as opposed to the php combined version function(req, res, next){ var bundle = grunt.config.process( "<%= requirejs.js.options.out %>" ); if (req.url === "/js/") { @@ -371,10 +373,15 @@ module.exports = function( grunt ) { patterns = patterns.concat( [ "tests/unit/" + unit + "/index.html", "tests/unit/" + unit + "/*/index.html", "tests/unit/" + unit + "/**/*-tests.html" ] ); }); } else { - patterns = [ "tests/unit/*/*/index.html", "tests/unit/**/*-tests.html" ]; + patterns = [ "tests/unit/**/index.html", "tests/unit/**/*-tests.html" ]; } - paths = grunt.file.expand( patterns ).sort(); + paths = grunt.file.expand( patterns ) + .sort() + .map( function( path ) { + // Some of our tests (ie. navigation) don't like having the index.html too much + return path.replace( /\/\index.html$/, "/" ); + }); if ( jQueries.length ) { paths.forEach( function( path ) { From 22b5be44f0274b1a32a7c814e9e3ca8e979ce8e6 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sun, 3 Mar 2013 22:24:58 -0700 Subject: [PATCH 87/94] Code Style: Whitespace --- tests/unit/navigation/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/navigation/index.html b/tests/unit/navigation/index.html index 61f3cc507aa..0b914d2dda5 100644 --- a/tests/unit/navigation/index.html +++ b/tests/unit/navigation/index.html @@ -9,9 +9,9 @@ From 16b874817bc97550b2c07483ff99f60cd43a97c3 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sun, 3 Mar 2013 22:25:47 -0700 Subject: [PATCH 88/94] Tests: Re-setup special event navigate when turning off pushstate --- tests/jquery.testHelper.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/jquery.testHelper.js b/tests/jquery.testHelper.js index e4df13f6289..7fcfd1e1bef 100644 --- a/tests/jquery.testHelper.js +++ b/tests/jquery.testHelper.js @@ -52,6 +52,10 @@ setPushState: function() { if( $.support.pushState && location.search.indexOf( "push-state" ) >= 0 ) { $.support.pushState = false; + $.mobile.window.unbind( "popstate.navigate" ); + $.mobile.window.unbind( "popstate.hashchange" ); + $.event.special.navigate.bound = false; + $.event.special.navigate.setup(); } }, From 713b402a5e520f0ddc940dc2a389c72e32db7f2a Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sun, 3 Mar 2013 22:30:15 -0700 Subject: [PATCH 89/94] Tests: Fixed pattern that selects tests to run --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index ae0fc29a8cf..70d8d2f3ba7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -373,7 +373,7 @@ module.exports = function( grunt ) { patterns = patterns.concat( [ "tests/unit/" + unit + "/index.html", "tests/unit/" + unit + "/*/index.html", "tests/unit/" + unit + "/**/*-tests.html" ] ); }); } else { - patterns = [ "tests/unit/**/index.html", "tests/unit/**/*-tests.html" ]; + patterns = [ "tests/unit/*/index.html", "tests/unit/*/*/index.html", "tests/unit/**/*-tests.html" ]; } paths = grunt.file.expand( patterns ) From f97f1a6277e65593238bdd4382686dbe5bc4756a Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Sun, 3 Mar 2013 22:48:22 -0700 Subject: [PATCH 90/94] Tests: RequireJS 2.1.x exposes .undef to undefine module --- tests/jquery.testHelper.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/jquery.testHelper.js b/tests/jquery.testHelper.js index 7fcfd1e1bef..564dc2da9fd 100644 --- a/tests/jquery.testHelper.js +++ b/tests/jquery.testHelper.js @@ -90,8 +90,7 @@ reloads: {}, reloadModule: function(libName){ - var deferred = $.Deferred(), - context; + var deferred = $.Deferred(); // where a module loader isn't defined use the old way if( !window.require ) { @@ -107,11 +106,7 @@ } //Clear internal cache of module inside of require - context = require.s.contexts._; - delete context.defined[libName]; - delete context.specified[libName]; - delete context.loaded[libName]; - delete context.urlFetched[require.toUrl(libName + '.js')]; + requirejs.undef( libName ); require( { From 3c18668acee0becafcd9768ad15e7173b6945d7e Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Mon, 4 Mar 2013 12:32:10 -0700 Subject: [PATCH 91/94] Tests: removed fastClick test as it disappeared a long time ago --- tests/unit/init/init_core.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/unit/init/init_core.js b/tests/unit/init/init_core.js index f7401b779ec..b527a40ab48 100644 --- a/tests/unit/init/init_core.js +++ b/tests/unit/init/init_core.js @@ -77,18 +77,6 @@ ok($("html").hasClass("ui-mobile"), "html elem has class mobile"); }); - asyncTest( "useFastClick is configurable via mobileinit", function(){ - $(document).one( "mobileinit", function(){ - $.mobile.useFastClick = false; - start(); - }); - - $.testHelper.reloadLib(libName); - - deepEqual( $.mobile.useFastClick, false , "fast click is set to false after init" ); - $.mobile.useFastClick = true; - }); - var findFirstPage = function() { return $(":jqmData(role='page')").first(); }; From cbbebf035c91cd051c019e5bf121ee64d73a5c1b Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Mon, 4 Mar 2013 12:50:46 -0700 Subject: [PATCH 92/94] Tests: Added inclusion of define shim to allow reloadLib to work properly --- tests/unit/init/index.html | 4 ++++ tests/unit/navigation/index.html | 6 +++++- tests/unit/path/index.html | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/unit/init/index.html b/tests/unit/init/index.html index b1878a4f11f..2031c4c09b7 100644 --- a/tests/unit/init/index.html +++ b/tests/unit/init/index.html @@ -9,6 +9,10 @@ + + diff --git a/tests/unit/navigation/index.html b/tests/unit/navigation/index.html index 0b914d2dda5..3e5b76f4156 100644 --- a/tests/unit/navigation/index.html +++ b/tests/unit/navigation/index.html @@ -13,7 +13,11 @@ $.testHelper.setPushState(); }); - + + + diff --git a/tests/unit/path/index.html b/tests/unit/path/index.html index 494e7f2060e..5e3044ac845 100644 --- a/tests/unit/path/index.html +++ b/tests/unit/path/index.html @@ -8,9 +8,13 @@ - + + + From fdc6a819eede9393e02924965ddd229d99c1420c Mon Sep 17 00:00:00 2001 From: John Bender Date: Mon, 4 Mar 2013 23:09:08 +0000 Subject: [PATCH 93/94] use before navigate to test hashchangeState addition --- js/events/navigate.js | 2 ++ tests/unit/navigation/event/event_core.js | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/js/events/navigate.js b/js/events/navigate.js index 0edf414c42a..fe5204745d3 100644 --- a/js/events/navigate.js +++ b/js/events/navigate.js @@ -41,6 +41,7 @@ define([ state = event.originalEvent.state || {}, href = location.href; + beforeNavigate.originalEvent = event; $win.trigger( beforeNavigate ); if( beforeNavigate.isDefaultPrevented() ){ @@ -70,6 +71,7 @@ define([ var newEvent = new $.Event( "navigate" ), beforeNavigate = new $.Event( "beforenavigate" ); + beforeNavigate.originalEvent = event; $win.trigger( beforeNavigate ); if( beforeNavigate.isDefaultPrevented() ){ diff --git a/tests/unit/navigation/event/event_core.js b/tests/unit/navigation/event/event_core.js index c74e4a266f0..554c2f6e962 100644 --- a/tests/unit/navigation/event/event_core.js +++ b/tests/unit/navigation/event/event_core.js @@ -89,12 +89,11 @@ $.testHelper.setPushState(); ]); }); } else { - // Make sure the binding happends before any of the navigate bindings - $( window ).bind( "hashchange", function( event ) { - event.hashchangeState = { foo: "bar" }; - }); - asyncTest( "hashchange navigation provides for data added in a later binding", function() { + $( window ).one( "beforenavigate", function( event, data ) { + event.originalEvent.hashchangeState = { foo: "bar" }; + }); + $( window ).one( "navigate", function( event, data ) { equal( event.originalEvent.type, "hashchange", "event triggered by a hashchange" ); equal( data.state.foo, "bar", "state provided properly" ); From 068874d5bff285428f037637429b6b8fa77bdff4 Mon Sep 17 00:00:00 2001 From: John Bender Date: Mon, 4 Mar 2013 23:14:59 +0000 Subject: [PATCH 94/94] ensure that the original event is included with beforenavigate --- tests/unit/navigation/event/event_core.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/unit/navigation/event/event_core.js b/tests/unit/navigation/event/event_core.js index 554c2f6e962..ec1437dea87 100644 --- a/tests/unit/navigation/event/event_core.js +++ b/tests/unit/navigation/event/event_core.js @@ -68,6 +68,23 @@ $.testHelper.setPushState(); location.hash = "bar"; }); + asyncTest( "beforenavigate should carry the original navigation function", function() { + + $( window ).one( "beforenavigate", function(event) { + var type = event.originalEvent.type; + + if( $.support.pushState ) { + equal( type, "popstate", "the original event type is popstate" ); + } else { + equal( type, "hashchange", "the original event type is hashchange" ); + } + + start(); + }); + + location.hash = "beforenavigate"; + }); + if( $.support.pushState ) { asyncTest( "popstate navigation events contain pushed state", function() { $.testHelper.eventTarget = $( window );