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

Use templates instead of jQuery in the Debug Commands extension #3336

Merged
merged 4 commits into from
May 13, 2013
Merged

Use templates instead of jQuery in the Debug Commands extension #3336

merged 4 commits into from
May 13, 2013

Conversation

TomMalbran
Copy link
Contributor

I moved the jQuery HTML creation to a Mustache template for both the performance data and the language switcher, making the code look a lot cleaner.

@jasonsanjose
Copy link
Member

Tagging open for Sprint 25. Please don't merge in sprint 24.

@ghost ghost assigned jbalsas May 2, 2013
@jbalsas
Copy link
Contributor

jbalsas commented May 2, 2013

Reviewing...

"LANGUAGE_MESSAGE" : "Language:",
"LANGUAGE_SUBMIT" : "Reload {APP_NAME}",
"LANGUAGE_SYSTEM_DEFAULT" : "System Default",

Copy link
Contributor

Choose a reason for hiding this comment

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

This changes are currently in conflict. Since we'll be working on #3575, we could just discard this here and take care of it all together.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll remove this, I did this change before the other request where I found that there were a lot of this problems of the strings not being where they should be.

@jbalsas
Copy link
Contributor

jbalsas commented May 2, 2013

Review complete.

@TomMalbran Looks great! Code definitely is much cleaner now. Just a couple of comments, and the conflicting strings issue.

@TomMalbran
Copy link
Contributor Author

@jbalsas Thanks for the review. Changes pushed. I made the urls breakable, so the table should fit in the dialog now.

@jbalsas
Copy link
Contributor

jbalsas commented May 3, 2013

@TomMalbran Changes look good, and the performance data now shows properly, thanks for that! Did you rebase with master? 2af6b67 certainly looks like it...

@njx Is it ok if we merge this with 2af6b67 as is?

@njx
Copy link

njx commented May 3, 2013

Hmmm, 2af6b67 does look weird. Could you try rebasing onto master and seeing if the huge diffs in there go away?

@jbalsas
Copy link
Contributor

jbalsas commented May 3, 2013

Yes, if I rebase or just merge with master I only see the right diffs being applied.

@TomMalbran
Copy link
Contributor Author

Yes, I merged it with master and since there were conflict issues I fixed them and then fixed the issues mentioned in the same commit. Since the first commit was almost a month ago, that merge was mostly from the last 2 sprints, and the last one had lots of changes.

This is the diff with master: https://github.com/TomMalbran/brackets/compare/adobe:master...tom/debug-templates

@TomMalbran
Copy link
Contributor Author

The changes here aren't that many, so I could just remake this request if that would be better?

@jbalsas
Copy link
Contributor

jbalsas commented May 4, 2013

@TomMalbran. Same as with the other, this seems ok to me, and the commits appear without any additional diffs when I merge them locally, so we should be able to merge as is, no further work needed.

I'll wait a couple of days to merge, though, since I don't want to take any chances of leaving the repo in a strange state.

@TomMalbran
Copy link
Contributor Author

Sure, that is ok. Is not such an important issue, so it can wait a few more days. Doing something like git rebase upstream/master would fix the merge issue leaving only the new changes?

@njx
Copy link

njx commented May 10, 2013

@TomMalbran Yes, you should be able to just rebase it that way. If you run into conflicts that are hard to resolve, then we can just do a merge, but it would be good to rebase it if you can.

@jbalsas
Copy link
Contributor

jbalsas commented May 13, 2013

Hey, @TomMalbran, sorry again for taking so long to get back at this and let some other commits slip in between :S

We have a merge conflict coming from #3704, but it looks like it should be quite straightforward to resolve. Could you look into it and merge with master?

@TomMalbran
Copy link
Contributor Author

@jbalsas Just merged with master and fixed the conflict issue.

@jbalsas
Copy link
Contributor

jbalsas commented May 13, 2013

Looks good. Merging!

Thanks again for your patience on this one :)

jbalsas added a commit that referenced this pull request May 13, 2013
Use templates instead of jQuery in the Debug Commands extension
@jbalsas jbalsas merged commit e8b1119 into adobe:master May 13, 2013
@TomMalbran TomMalbran deleted the tom/debug-templates branch May 13, 2013 21:58
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.

4 participants