Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/brackets.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ define(function (require, exports, module) {
NodeConnection = require("utils/NodeConnection"),
ExtensionUtils = require("utils/ExtensionUtils"),
DragAndDrop = require("utils/DragAndDrop"),
ColorUtils = require("utils/ColorUtils");
ColorUtils = require("utils/ColorUtils"),
NativeApp = require("utils/NativeApp");

// Load modules that self-register and just need to get included in the main project
require("command/DefaultMenus");
Expand Down Expand Up @@ -148,7 +149,7 @@ define(function (require, exports, module) {
LiveDevServerManager : require("LiveDevelopment/LiveDevServerManager"),
DOMAgent : require("LiveDevelopment/Agents/DOMAgent"),
Inspector : require("LiveDevelopment/Inspector/Inspector"),
NativeApp : require("utils/NativeApp"),
NativeApp : NativeApp,
ExtensionLoader : ExtensionLoader,
ExtensionUtils : ExtensionUtils,
UpdateNotification : require("utils/UpdateNotification"),
Expand Down Expand Up @@ -346,9 +347,13 @@ define(function (require, exports, module) {
// navigate. Also, a capture handler is more reliable than bubble.
window.document.body.addEventListener("click", function (e) {
// Check parents too, in case link has inline formatting tags
var node = e.target;
var node = e.target, url;
while (node) {
if (node.tagName === "A") {
url = node.getAttribute("href");
if (url && !url.match(/^#/)) {
NativeApp.openURLInDefaultBrowser(url);
}
e.preventDefault();
break;
}
Expand Down
3 changes: 0 additions & 3 deletions src/extensibility/ExtensionManagerView.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@ define(function (require, exports, module) {
ExtensionManager.markForRemoval($target.attr("data-extension-id"), true);
} else if ($target.hasClass("undo-update")) {
ExtensionManager.removeUpdate($target.attr("data-extension-id"));
} else {
// Open any other link in the external browser.
NativeApp.openURLInDefaultBrowser($target.attr("href"));
}
})
.on("click", "button.install", function (e) {
Expand Down
11 changes: 0 additions & 11 deletions src/extensions/default/WebPlatformDocs/InlineDocsViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,8 @@ define(function (require, exports, module) {
});

this._sizeEditorToContent = this._sizeEditorToContent.bind(this);
this._handleLinkClick = this._handleLinkClick.bind(this);
this._handleWheelScroll = this._handleWheelScroll.bind(this);

this.$wrapperDiv.on("click", "a", this._handleLinkClick);
this.$wrapperDiv.find(".scroller").on("mousewheel", this._handleWheelScroll);
}

Expand All @@ -95,15 +93,6 @@ define(function (require, exports, module) {
InlineDocsViewer.prototype.$wrapperDiv = null;


/** Clicking any link should open it in browser, not in Brackets shell */
InlineDocsViewer.prototype._handleLinkClick = function (event) {
var url = $(event.currentTarget).attr("href");
if (url) {
NativeApp.openURLInDefaultBrowser(url);
}
};


/** Don't allow scrollwheel/trackpad to bubble up to host editor - makes scrolling docs painful */
InlineDocsViewer.prototype._handleWheelScroll = function (event) {
var scrollingUp = (event.originalEvent.wheelDeltaY > 0),
Expand Down
11 changes: 0 additions & 11 deletions src/help/HelpCommandHandlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,6 @@ define(function (require, exports, module) {
$(this).trigger("load");
}
});

// Create a link for each contributor image to their github account
$contributors.on("click", "img", function (e) {
var url = $(e.target).data("url");
if (url) {
// Make sure the URL has a domain that we know about
if (/(^|\.)github\.com$/i.test(PathUtils.parseUrl(url).hostname)) {
NativeApp.openURLInDefaultBrowser(url);
}
}
});
}).fail(function () {
$spinner.removeClass("spin");
$contributors.html(Mustache.render("<p class='dialog-message'>{{ABOUT_TEXT_LINE6}}</p>", Strings));
Expand Down
2 changes: 1 addition & 1 deletion src/htmlContent/contributors-list.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#.}}
<a href="#" class="clickable-link" data-url="{{html_url}}" title="{{login}} - {{html_url}}">
<a href="{{html_url}}" title="{{login}} - {{html_url}}">
<img src="{{avatar_url}}" alt="{{login}}" width="30" height="30" />
</a>
{{/.}}
2 changes: 1 addition & 1 deletion src/htmlContent/update-list.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{#.}}
<div>
<h3>{{versionString}} - {{dateString}} (<a href="#" data-url="{{releaseNotesURL}}">{{Strings.RELEASE_NOTES}}</a>)</h3>
<h3>{{versionString}} - {{dateString}} (<a href="{{releaseNotesURL}}" title="{{releaseNotesURL}}">{{Strings.RELEASE_NOTES}}</a>)</h3>
<ul>
{{#newFeatures}}
<li><b>{{name}}</b> - {{description}}</li>
Expand Down
8 changes: 4 additions & 4 deletions src/nls/cs/strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ define({
"LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Chyba při spouštění HTTP serveru pro soubory živého náhledu. Prosím, zkuste to znovu.",
"LIVE_DEVELOPMENT_INFO_TITLE" : "Vítejte v živém náhledu!",
"LIVE_DEVELOPMENT_INFO_MESSAGE" : "Živý náhled připojí {APP_NAME} k vašemu prohlížeči. Spustí náhled HTML souboru, který se aktualizuje pokaždé, kdy editujete svůj kód.<br /><br />V této verzi {APP_NAME}, živý náhled funguje pouze v <strong>Google Chrome</strong> a aktualizuje změny v <strong>CSS souborech</strong>. Změny v HTML nebo JavaScript souborech jsou automaticky načteny, když soubor uložíte.<br /><br />(Tato zpráva se zobrazí pouze jednou.)",
"LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Pro více informací navštivte <a href='#' class='clickable-link' data-href='{0}'>Troubleshooting Live Development connection errors</a>.",
"LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Pro více informací navštivte <a href='{0}' title='{0}'>Troubleshooting Live Development connection errors</a>.",

"LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "Živý náhled",
"LIVE_DEV_STATUS_TIP_PROGRESS1" : "Živý náhled: Připojování\u2026",
Expand Down Expand Up @@ -293,11 +293,11 @@ define({
"ABOUT" : "O aplikaci",
"CLOSE" : "Zavřít",
"ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}",
"ABOUT_TEXT_LINE3" : "Oznámení, podmínky týkající se software třetích stran jsou umístěny na <a href='#' class='clickable-link' data-href='{ADOBE_THIRD_PARTY}'>http://www.adobe.com/go/thirdparty/</a> a začleněny prostřednictvím odkazu zde.",
"ABOUT_TEXT_LINE4" : "Dokumentace a zdrojový kód na <a href='#' class='clickable-link' data-href='https://github.com/adobe/brackets/'>https://github.com/adobe/brackets/</a>.",
"ABOUT_TEXT_LINE3" : "Oznámení, podmínky týkající se software třetích stran jsou umístěny na <a href='{ADOBE_THIRD_PARTY}'>{ADOBE_THIRD_PARTY}</a> a začleněny prostřednictvím odkazu zde.",
"ABOUT_TEXT_LINE4" : "Dokumentace a zdrojový kód na <a href='https://github.com/adobe/brackets/'>https://github.com/adobe/brackets/</a>.",
"ABOUT_TEXT_LINE5" : "Vytvořeno s \u2764 a pomocí JavaScript těmito lidmi:",
"ABOUT_TEXT_LINE6" : "Mnoho lidí (ale momentálně máme problém s načítáním dat).",
"ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs a Web Platform logo využívají licenci Creative Commons Attribution, <a href='#' class='clickable-link' data-href='{WEB_PLATFORM_DOCS_LICENSE}'>CC-BY 3.0 Unported</a>.",
"ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs a Web Platform logo využívají licenci Creative Commons Attribution, <a href='{WEB_PLATFORM_DOCS_LICENSE}'>CC-BY 3.0 Unported</a>.",
"UPDATE_NOTIFICATION_TOOLTIP" : "Je dostupná nová verze {APP_NAME} ! Klikněte zde pro více informací.",
"UPDATE_AVAILABLE_TITLE" : "Dostupná aktualizace",
"UPDATE_MESSAGE" : "Nová verze {APP_NAME} je dostupná. Seznam některých vylepšení:",
Expand Down
31 changes: 31 additions & 0 deletions src/nls/cs/urls.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* 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 define */

define({
// Relative to the samples folder
"ADOBE_THIRD_PARTY" : "http://www.adobe.com/go/thirdparty/",
"WEB_PLATFORM_DOCS_LICENSE" : "http://creativecommons.org/licenses/by/3.0/deed.cs"
});
10 changes: 5 additions & 5 deletions src/nls/de/strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ define({
"LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Ein Fehler ist beim Starten des HTTP-Servers oder der Live-Vorschau-Dateien aufgetreten. Bitte versuchen Sie es später erneut.",
"LIVE_DEVELOPMENT_INFO_TITLE" : "Willkommen bei der Live-Vorschau!",
"LIVE_DEVELOPMENT_INFO_MESSAGE" : "Die Live-Vorschau verbindet {APP_NAME} mit Ihrem Browser. Sie startet eine Vorschau Ihrer HTML-Datei im Browser, und aktualisiert die Vorschau dann sofort, wenn Sie Ihren Code bearbeiten.<br /><br />In dieser frühen Version von {APP_NAME} funktioniert die Live-Vorschau nur beim Bearbeiten von <strong>CSS-Dateien</strong> und nur mit <strong>Google Chrome</strong>. Wir werden sie bald für HTML und JavaScript implementieren!<br /><br />(Sie sehen diese Meldung nur einmal.)",
"LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Weitere Informationen finden Sie unter dem Thema <a href='#' class='clickable-link' data-href='{0}'>Fehlerbehebung bei Verbindungs-Fehlern der Live-Entwicklung</a>.",

"LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Weitere Informationen finden Sie unter dem Thema <a href='{0}' title='{0}'>Fehlerbehebung bei Verbindungs-Fehlern der Live-Entwicklung</a>.",
"LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "Live-Vorschau",
"LIVE_DEV_STATUS_TIP_PROGRESS1" : "Live-Vorschau: Verbinden\u2026",
"LIVE_DEV_STATUS_TIP_PROGRESS2" : "Live-Vorschau: Initialisieren\u2026",
Expand Down Expand Up @@ -300,11 +300,11 @@ define({
"ABOUT" : "Über",
"CLOSE" : "Schließen",
"ABOUT_TEXT_LINE1" : "Sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}",
"ABOUT_TEXT_LINE3" : "Hinweise, Bestimmungen und Bedingungen, die sich auf Drittanbieter-Software beziehen, finden sich unter <a href='#' class='clickable-link' data-href='{ADOBE_THIRD_PARTY}'>{ADOBE_THIRD_PARTY}</a> und sind hier durch Bezugnahme eingeschlossen.",
"ABOUT_TEXT_LINE4" : "Dokumentation und Quellcode unter <a href='#' class='clickable-link' data-href='https://github.com/adobe/brackets/'>https://github.com/adobe/brackets/</a>",
"ABOUT_TEXT_LINE3" : "Hinweise, Bestimmungen und Bedingungen, die sich auf Drittanbieter-Software beziehen, finden sich unter <a href='{ADOBE_THIRD_PARTY}'>{ADOBE_THIRD_PARTY}</a> und sind hier durch Bezugnahme eingeschlossen.",
"ABOUT_TEXT_LINE4" : "Dokumentation und Quellcode unter <a href='https://github.com/adobe/brackets/'>https://github.com/adobe/brackets/</a>",
"ABOUT_TEXT_LINE5" : "Gemacht mit \u2764 und JavaScript von:",
"ABOUT_TEXT_LINE6" : "…vielen Leuten (…leider haben wir aber gerade Probleme, diese Daten zu laden).",
"ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform-Dokumente und das grafische Logo von Web Platform sind unter einer Creative-Commons-Namensnennungs-Lizenz lizenziert, <a href='#' class='clickable-link' data-href='{WEB_PLATFORM_DOCS_LICENSE}'>CC-BY 3.0 Unported</a>.",
"ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform-Dokumente und das grafische Logo von Web Platform sind unter einer Creative-Commons-Namensnennungs-Lizenz lizenziert, <a href='{WEB_PLATFORM_DOCS_LICENSE}'>CC-BY 3.0 Unported</a>.",
"UPDATE_NOTIFICATION_TOOLTIP" : "Eine neue Version von {APP_NAME} ist verfügbar! Für Details hier klicken.",
"UPDATE_AVAILABLE_TITLE" : "Update verfügbar",
"UPDATE_MESSAGE" : "Hallo! Eine neue Version von {APP_NAME} ist verfügbar. Hier einige der neuen Funktionen:",
Expand Down
8 changes: 4 additions & 4 deletions src/nls/es/strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ define({
"LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Error iniciando el servidor HTTP para Desarrollo en Vivo. Vuelve a intentarlo, por favor.",
"LIVE_DEVELOPMENT_INFO_TITLE" : "¡Bienvenido a Desarrollo en Vivo!",
"LIVE_DEVELOPMENT_INFO_MESSAGE" : "Desarrollo en Vivo conecta {APP_NAME} con tu navegador. Lanza una vista previa de tu archivo HTML en el navegador y la actualiza a medida que modificas tu código.<br /><br />En esta versión preliminar de {APP_NAME}, Desarollo en Vivo sólo funciona para cambios de <strong>archivos CSS</strong> y únicamente con <strong>Google Chrome</strong>. ¡Pronto estará disponible también para HTML y JavaScript!<br /><br />(No volverás a ver este mensaje.)",
"LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Consulta <a href='#' class='clickable-link' data-href='{0}'>Resolución de Problemas de conexión en Desarrollo en Vivo</a> para más información.",
"LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Consulta <a href='{0}' title='{0}'>Resolución de Problemas de conexión en Desarrollo en Vivo</a> para más información.",

"LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "Desarrollo en Vivo",
"LIVE_DEV_STATUS_TIP_PROGRESS1" : "Desarrollo en Vivo: Conectando\u2026",
Expand Down Expand Up @@ -301,11 +301,11 @@ define({
"ABOUT" : "Acerca de\u2026",
"CLOSE" : "Cerrar",
"ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}",
"ABOUT_TEXT_LINE3" : "Los avisos, términos y condiciones pertenecientes a software de terceros se encuentran en <a href='#' class='clickable-link' data-href='http://www.adobe.com/go/thirdparty/'>http://www.adobe.com/go/thirdparty/</a> y se incluyen aquí como referencia.",
"ABOUT_TEXT_LINE4" : "Puedes encontrar la documentación y código fuente en <a href='#' class='clickable-link' data-href='https://github.com/adobe/brackets/'>https://github.com/adobe/brackets/</a>",
"ABOUT_TEXT_LINE3" : "Los avisos, términos y condiciones pertenecientes a software de terceros se encuentran en <a href='{ADOBE_THIRD_PARTY}'>{ADOBE_THIRD_PARTY}</a> y se incluyen aquí como referencia.",
"ABOUT_TEXT_LINE4" : "Puedes encontrar la documentación y código fuente en <a href='https://github.com/adobe/brackets/'>https://github.com/adobe/brackets/</a>",
"ABOUT_TEXT_LINE5" : "Hecho con \u2764 y JavaScript por:",
"ABOUT_TEXT_LINE6" : "Mucha gente (pero ahora mismo estamos teniendo problemas para cargar esos datos).",
"ABOUT_TEXT_WEB_PLATFORM_DOCS" : "El contenido de Web Platform Docs y el logo de Web Platform están disponibles bajo una Licencia de Reconocimiento de Creative Commons, <a href='#' class='clickable-link' data-href='http://creativecommons.org/licenses/by/3.0/'>CC-BY 3.0 Unported</a>.",
"ABOUT_TEXT_WEB_PLATFORM_DOCS" : "El contenido de Web Platform Docs y el logo de Web Platform están disponibles bajo una Licencia de Reconocimiento de Creative Commons, <a href='{WEB_PLATFORM_DOCS_LICENSE}'>CC-BY 3.0 Unported</a>.",
"UPDATE_NOTIFICATION_TOOLTIP" : "¡Hay una nueva versión de {APP_NAME} disponible! Haz click aquí para más detalles.",
"UPDATE_AVAILABLE_TITLE" : "Actualización disponible",
"UPDATE_MESSAGE" : "¡Hay una nueva versión de {APP_NAME} disponible! Éstas son algunas de las nuevas características:",
Expand Down
Loading