Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

move inline js into external files #4374

Merged
merged 7 commits into from Jul 18, 2013
Merged

move inline js into external files #4374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
404eea9
move inline js into external files
maks Jun 30, 2013
afd88f4
add std license header and placate jslint
maks Jul 1, 2013
9466c4e
add comment for future about no inline scripts
maks Jul 3, 2013
a4b7d46
fix jshint error and add license header
maks Jul 15, 2013
fc72828
fix (c) year
maks Jul 15, 2013
8c48ca3
fix jslinst errors and refactor loops
maks Jul 18, 2013
c0a46b6
oops, of course can't use CollectionUtils...
maks Jul 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 51 additions & 0 deletions src/dependencies.js
View file
Open in desktop
@@ -0,0 +1,51 @@
/*
* Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
*/

/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, evil:true */
/*global window, document:true, CollectionUtils:true */

window.setTimeout(function () {
"use strict";
var deps = { "Mustache": window.Mustache, "jQuery": window.$, "CodeMirror": window.CodeMirror, "RequireJS": window.require };
var key, missingDeps = [];
for (key in deps) {
if (deps.hasOwnProperty(key) && !deps[key]) {
missingDeps.push(key);
}
}
if (missingDeps.length === 0) {
return;
}
document.write("<h1>Missing libraries</h1>");
document.write("<p>Oops! One or more required libraries could not be found.</p>");
document.write("<ul>");
missingDeps.forEach(function (key) {
document.write("<li>" + key + "</li>");
});

document.write("</ul>");
document.write("<p>If you're running from a local copy of the Brackets source, please make sure submodules are updated by running:</p>");
document.write("<pre>git submodule update --init</pre>");
document.write("<p>If you're still having problems, please contact us via one of the channels mentioned at the bottom of the <a target=\"blank\" href=\"../README.md\">README</a>.</p>");
document.write("<p><a href=\"#\" onclick=\"window.location.reload()\">Reload Brackets</a></p>");
}, 1000);
84 changes: 4 additions & 80 deletions src/index.html
View file
Open in desktop
Expand Up @@ -33,59 +33,10 @@
nonstandard WebKit-specific syntax. -->
<link rel="stylesheet" href="styles/quiet-scrollbars.css">

<!-- Warn about failed cross origin requests in Chrome -->
<script type="application/javascript">
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
/*global brackets: true */
(function () {
"use strict";

// Function to test whether a given error represents an illegal cross origin access
var testCrossOriginError;

if (navigator.userAgent.search(" Chrome/") !== -1) {
// Chrome support
testCrossOriginError = function (message, url, line) {
return url === "" && line === 0 && message === "Script error.";
};
} else if (navigator.userAgent.slice(0, 6) === 'Opera/') {
// Opera support
testCrossOriginError = function (message, url, line) {
return message === "Uncaught exception: DOMException: NETWORK_ERR";
};
}

// Abort if running in the shell, running on a server or not running in a supported and affected browser
if (typeof (brackets) !== "undefined"
|| document.location.href.substr(0, 7) !== "file://"
|| !testCrossOriginError) {
return;
}

// Remember the current error handler to restore it once we're done
var previousErrorHandler = window.onerror;

// Our error handler
function handleError(message, url, line) {
// Ignore this error if it does not look like the rather vague cross origin error in Chrome
// Chrome will print it to the console anyway
if (!testCrossOriginError(message, url, line)) {
if (previousErrorHandler) {
return previousErrorHandler(message, url, line);
}
return;
}

// Show an error message
alert("Oops! This application doesn't run in browsers yet.\n\nIt is built in HTML, but right now it runs as a desktop app so you can use it to edit local files. Please use the application shell in the following repo to run this application:\n\ngithub.com/adobe/brackets-shell");

// Restore the original handler for later errors
window.onerror = previousErrorHandler;
}
<!-- NOTE: All scripts must be external for Chrome App support: http://developer.chrome.com/apps/app_csp.html -->

// Install our error handler
window.onerror = handleError;
}());
<!-- Warn about failed cross origin requests in Chrome -->
<script type="application/javascript" src="xorigin.js">
</script>

<!-- TODO (Issue #278): switch between runtime LESS compilation in dev mode and precompiled version -->
Expand Down Expand Up @@ -120,34 +71,7 @@
<script src="thirdparty/requirejs/require.js" data-main="brackets"></script>

<!-- Verify that all dependencies are loaded. -->
<script>
window.setTimeout(function () {
var deps = { "Mustache": window.Mustache, "jQuery": window.$, "CodeMirror": window.CodeMirror, "RequireJS": window.require };
var key, allOK = true;
for (key in deps) {
if (!deps[key]) {
allOK = false;
break;
}
}
if (allOK) {
return;
}
document.write("<h1>Missing libraries</h1>");
document.write("<p>Oops! One or more required libraries could not be found.</p>");
document.write("<ul>");
for (key in deps) {
if (!deps[key]) {
document.write("<li>" + key + "</li>");
}
}
document.write("</ul>");
document.write("<p>If you're running from a local copy of the Brackets source, please make sure submodules are updated by running:</p>");
document.write("<pre>git submodule update --init</pre>");
document.write("<p>If you're still having problems, please contact us via one of the channels mentioned at the bottom of the <a target=\"blank\" href=\"../README.md\">README</a>.</p>");
document.write("<p><a href=\"#\" onclick=\"window.location.reload()\">Reload Brackets</a></p>");
}, 1000);
</script>
<script src="dependencies.js"></script>

</body>
</html>
74 changes: 74 additions & 0 deletions src/xorigin.js
View file
Open in desktop
@@ -0,0 +1,74 @@
/*
* Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
*/

/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
/*global brackets: true, navigator:true, document:true, window:true */
(function () {
"use strict";

// Function to test whether a given error represents an illegal cross origin access
var testCrossOriginError;

if (navigator.userAgent.search(" Chrome/") !== -1) {
// Chrome support
testCrossOriginError = function (message, url, line) {
return url === "" && line === 0 && message === "Script error.";
};
} else if (navigator.userAgent.slice(0, 6) === 'Opera/') {
// Opera support
testCrossOriginError = function (message, url, line) {
return message === "Uncaught exception: DOMException: NETWORK_ERR";
};
}

// Abort if running in the shell, running on a server or not running in a supported and affected browser
if (typeof (brackets) !== "undefined" ||
document.location.href.substr(0, 7) !== "file://" ||
!testCrossOriginError) {
return;
}

// Remember the current error handler to restore it once we're done
var previousErrorHandler = window.onerror;

// Our error handler
function handleError(message, url, line) {
// Ignore this error if it does not look like the rather vague cross origin error in Chrome
// Chrome will print it to the console anyway
if (!testCrossOriginError(message, url, line)) {
if (previousErrorHandler) {
return previousErrorHandler(message, url, line);
}
return;
}

// Show an error message
alert("Oops! This application doesn't run in browsers yet.\n\nIt is built in HTML, but right now it runs as a desktop app so you can use it to edit local files. Please use the application shell in the following repo to run this application:\n\ngithub.com/adobe/brackets-shell");

// Restore the original handler for later errors
window.onerror = previousErrorHandler;
}

// Install our error handler
window.onerror = handleError;
}());