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

Fix issue #3556: Consolidate link handling code #4718

Merged
merged 3 commits into from
Sep 5, 2013
Merged

Fix issue #3556: Consolidate link handling code #4718

merged 3 commits into from
Sep 5, 2013

Conversation

TomMalbran
Copy link
Contributor

This is a fix for issue #3556. I added the link handling code to the new code that prevents the links to do the default behavior and removed every other handling code. I also updated all the links to use the href for the url.

@ghost ghost assigned jasonsanjose Aug 9, 2013
@jasonsanjose
Copy link
Member

Nominating sprint 30

@jasonsanjose
Copy link
Member

I need to reconcile this with #4695. Just learned about this from @peterflynn.

@TomMalbran
Copy link
Contributor Author

The link handling code is inside Peter's fix. I figured that would be the best place to handle it. Everything is together now.

@jasonsanjose
Copy link
Member

@TomMalbran can you merge with master? Thanks!

@TomMalbran
Copy link
Contributor Author

This will be harder to merge... but will do it soon :)

@TomMalbran
Copy link
Contributor Author

@jasonsanjose Done

@@ -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='http://www.adobe.com/go/thirdparty/'>http://www.adobe.com/go/thirdparty/</a> a začleněny prostřednictvím odkazu zde.",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<a href='http://www.adobe.com/go/thirdparty/'> should be <a href='{ADOBE_THIRD_PARTY}'>

@jasonsanjose
Copy link
Member

Initial review complete. Sorry for the mixup on #4695. I see that these don't overlap how I thought they might have. Nice cleanup.

@TomMalbran
Copy link
Contributor Author

@jasonsanjose Fixed all the urls issues. I had to create some new urls files and added several missing languages in nls/urls.

@jasonsanjose
Copy link
Member

Looks great. Thanks @TomMalbran. Merging.

jasonsanjose added a commit that referenced this pull request Sep 5, 2013
Fix issue #3556: Consolidate link handling code
@jasonsanjose jasonsanjose merged commit 630e0fe into adobe:master Sep 5, 2013
@TomMalbran TomMalbran deleted the tom/issue-3556 branch September 5, 2013 16:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants