| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 return normalizedPath; | 105 return normalizedPath; |
| 106 } | 106 } |
| 107 | 107 |
| 108 /** | 108 /** |
| 109 * @param {!Array.<string>} scriptNames | 109 * @param {!Array.<string>} scriptNames |
| 110 * @param {string=} base | 110 * @param {string=} base |
| 111 * @return {!Promise.<undefined>} | 111 * @return {!Promise.<undefined>} |
| 112 */ | 112 */ |
| 113 function loadScriptsPromise(scriptNames, base) | 113 function loadScriptsPromise(scriptNames, base) |
| 114 { | 114 { |
| 115 /** @type {!Array.<!Promise.<string>>} */ | 115 /** @type {!Array<!Promise<undefined>>} */ |
| 116 var promises = []; | 116 var promises = []; |
| 117 /** @type {!Array.<string>} */ | 117 /** @type {!Array<string>} */ |
| 118 var urls = []; | 118 var urls = []; |
| 119 var sources = new Array(scriptNames.length); | 119 var sources = new Array(scriptNames.length); |
| 120 var scriptToEval = 0; | 120 var scriptToEval = 0; |
| 121 for (var i = 0; i < scriptNames.length; ++i) { | 121 for (var i = 0; i < scriptNames.length; ++i) { |
| 122 var scriptName = scriptNames[i]; | 122 var scriptName = scriptNames[i]; |
| 123 var sourceURL = (base || self._importScriptPathPrefix) + scriptName; | 123 var sourceURL = (base || self._importScriptPathPrefix) + scriptName; |
| 124 var schemaIndex = sourceURL.indexOf("://") + 3; | 124 var schemaIndex = sourceURL.indexOf("://") + 3; |
| 125 sourceURL = sourceURL.substring(0, schemaIndex) + normalizePath(sourceUR
L.substring(schemaIndex)); | 125 sourceURL = sourceURL.substring(0, schemaIndex) + normalizePath(sourceUR
L.substring(schemaIndex)); |
| 126 if (_loadedScripts[sourceURL]) | 126 if (_loadedScripts[sourceURL]) |
| 127 continue; | 127 continue; |
| (...skipping 979 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1107 { | 1107 { |
| 1108 var sourceURL = window.location.href; | 1108 var sourceURL = window.location.href; |
| 1109 if (window.location.search) | 1109 if (window.location.search) |
| 1110 sourceURL = sourceURL.replace(window.location.search, ""); | 1110 sourceURL = sourceURL.replace(window.location.search, ""); |
| 1111 sourceURL = sourceURL.substring(0, sourceURL.lastIndexOf("/") + 1) + path; | 1111 sourceURL = sourceURL.substring(0, sourceURL.lastIndexOf("/") + 1) + path; |
| 1112 return "\n/*# sourceURL=" + sourceURL + " */"; | 1112 return "\n/*# sourceURL=" + sourceURL + " */"; |
| 1113 } | 1113 } |
| 1114 | 1114 |
| 1115 /** @type {!Runtime} */ | 1115 /** @type {!Runtime} */ |
| 1116 var runtime; | 1116 var runtime; |
| OLD | NEW |