-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Use templates instead of jQuery in the Debug Commands extension #3336
Conversation
Tagging open for Sprint 25. Please don't merge in sprint 24. |
Reviewing... |
"LANGUAGE_MESSAGE" : "Language:", | ||
"LANGUAGE_SUBMIT" : "Reload {APP_NAME}", | ||
"LANGUAGE_SYSTEM_DEFAULT" : "System Default", | ||
|
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
Review complete. @TomMalbran Looks great! Code definitely is much cleaner now. Just a couple of comments, and the conflicting strings issue. |
@jbalsas Thanks for the review. Changes pushed. I made the urls breakable, so the table should fit in the dialog now. |
@TomMalbran Changes look good, and the performance data now shows properly, thanks for that! Did you rebase with master? 2af6b67 certainly looks like it... |
Hmmm, 2af6b67 does look weird. Could you try rebasing onto master and seeing if the huge diffs in there go away? |
Yes, if I rebase or just merge with master I only see the right diffs being applied. |
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 |
The changes here aren't that many, so I could just remake this request if that would be better? |
@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. |
Sure, that is ok. Is not such an important issue, so it can wait a few more days. Doing something like |
@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. |
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? |
@jbalsas Just merged with master and fixed the conflict issue. |
Looks good. Merging! Thanks again for your patience on this one :) |
Use templates instead of jQuery in the Debug Commands extension
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.