[CLOSED] Use templates instead of jQuery in the Debug Commands extension

[core-ai-bot]

Issue by TomMalbran
Thursday Apr 04, 2013 at 01:23 GMT
Originally opened as adobe/brackets#3336

---

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.

---

TomMalbran included the following code: https://github.com/adobe/brackets/pull/3336/commits

[core-ai-bot]

Comment by jasonsanjose
Friday Apr 19, 2013 at 18:22 GMT

---

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

[core-ai-bot]

Comment by jbalsas
Thursday May 02, 2013 at 16:46 GMT

---

Reviewing...

[core-ai-bot]

Comment by jbalsas
Thursday May 02, 2013 at 18:37 GMT

---

Review complete.

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

[core-ai-bot]

Comment by TomMalbran
Thursday May 02, 2013 at 23:20 GMT

---

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

[core-ai-bot]

Comment by jbalsas
Friday May 03, 2013 at 17:18 GMT

---

@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?

[core-ai-bot]

Comment by njx
Friday May 03, 2013 at 17:21 GMT

---

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

[core-ai-bot]

Comment by jbalsas
Friday May 03, 2013 at 17:29 GMT

---

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

[core-ai-bot]

Comment by TomMalbran
Friday May 03, 2013 at 18:57 GMT

---

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

[core-ai-bot]

Comment by TomMalbran
Friday May 03, 2013 at 23:43 GMT

---

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

[core-ai-bot]

Comment by jbalsas
Saturday May 04, 2013 at 23:55 GMT

---

@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.

[core-ai-bot]

Comment by TomMalbran
Saturday May 04, 2013 at 23:59 GMT

---

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?

[core-ai-bot]

Comment by njx
Friday May 10, 2013 at 02:04 GMT

---

@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.

[core-ai-bot]

Comment by jbalsas
Monday May 13, 2013 at 20:32 GMT

---

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 adobe/brackets#3704, but it looks like it should be quite straightforward to resolve. Could you look into it and merge with master?

[core-ai-bot]

Comment by TomMalbran
Monday May 13, 2013 at 21:34 GMT

---

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

[core-ai-bot]

Comment by jbalsas
Monday May 13, 2013 at 21:57 GMT

---

Looks good. Merging!

Thanks again for your patience on this one :)