From bec4454d75f2699659dc820e39b8e236ed0af12a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Malbr=C3=A1n?= Date: Wed, 3 Apr 2013 20:10:18 -0300 Subject: [PATCH 1/2] Use templates instead of jQuery in the Debug Commands extension --- .../htmlContent/language-dialog.html | 20 +++ .../htmlContent/perf-dialog.html | 23 +++ src/extensions/default/DebugCommands/main.js | 164 ++++++------------ src/nls/root/strings.js | 14 +- 4 files changed, 102 insertions(+), 119 deletions(-) create mode 100644 src/extensions/default/DebugCommands/htmlContent/language-dialog.html create mode 100644 src/extensions/default/DebugCommands/htmlContent/perf-dialog.html diff --git a/src/extensions/default/DebugCommands/htmlContent/language-dialog.html b/src/extensions/default/DebugCommands/htmlContent/language-dialog.html new file mode 100644 index 00000000000..66425e5014c --- /dev/null +++ b/src/extensions/default/DebugCommands/htmlContent/language-dialog.html @@ -0,0 +1,20 @@ +
+
+ × +

{{LANGUAGE_TITLE}}

+
+
+

+ {{LANGUAGE_MESSAGE}} + +

+
+
+ + +
+
diff --git a/src/extensions/default/DebugCommands/htmlContent/perf-dialog.html b/src/extensions/default/DebugCommands/htmlContent/perf-dialog.html new file mode 100644 index 00000000000..970c8d51771 --- /dev/null +++ b/src/extensions/default/DebugCommands/htmlContent/perf-dialog.html @@ -0,0 +1,23 @@ +
+
+ × +

Performance Data

+
+ Raw data (copy paste out): + +
+
+
+ + + + {{#perfData}} + + + + + {{/perfData}} + +
OperationTime (ms)
{{testName}}{{value}}
+
+
diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index f3fe6e0068d..7006ca38f4e 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -23,23 +23,27 @@ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define, $, brackets, window, WebSocket */ +/*global define, $, brackets, window, WebSocket, Mustache */ define(function (require, exports, module) { "use strict"; - var Commands = brackets.getModule("command/Commands"), - CommandManager = brackets.getModule("command/CommandManager"), - Editor = brackets.getModule("editor/Editor").Editor, - FileUtils = brackets.getModule("file/FileUtils"), - KeyBindingManager = brackets.getModule("command/KeyBindingManager"), - Menus = brackets.getModule("command/Menus"), - Strings = brackets.getModule("strings"), - PerfUtils = brackets.getModule("utils/PerfUtils"), - ProjectManager = brackets.getModule("project/ProjectManager"), - NativeApp = brackets.getModule("utils/NativeApp"), - NativeFileSystem = brackets.getModule("file/NativeFileSystem").NativeFileSystem, - NodeDebugUtils = require("NodeDebugUtils"); + var Commands = brackets.getModule("command/Commands"), + CommandManager = brackets.getModule("command/CommandManager"), + KeyBindingManager = brackets.getModule("command/KeyBindingManager"), + Menus = brackets.getModule("command/Menus"), + Editor = brackets.getModule("editor/Editor").Editor, + FileUtils = brackets.getModule("file/FileUtils"), + NativeFileSystem = brackets.getModule("file/NativeFileSystem").NativeFileSystem, + ProjectManager = brackets.getModule("project/ProjectManager"), + PerfUtils = brackets.getModule("utils/PerfUtils"), + NativeApp = brackets.getModule("utils/NativeApp"), + CollectionUtils = brackets.getModule("utils/CollectionUtils"), + Dialogs = brackets.getModule("widgets/Dialogs"), + Strings = brackets.getModule("strings"), + NodeDebugUtils = require("NodeDebugUtils"), + PerfDialogTemplate = require("text!htmlContent/perf-dialog.html"), + LanguageDialogTemplate = require("text!htmlContent/language-dialog.html"); var KeyboardPrefs = JSON.parse(require("text!keyboard.json")); @@ -87,20 +91,9 @@ define(function (require, exports, module) { } function _handleShowPerfData() { - var $perfHeader = $("
") - .append("×") - .append("

Performance Data

") - .append("
Raw data (copy paste out):
"); - - var $perfBody = $("
"); - - var $data = $("") - .append("") - .append("") - .appendTo($perfBody); - - var makeCell = function (content) { - return $("") - .append(makeCell(testName)) - .append(makeCell(getValue(perfData[testName]))) - .appendTo($data); - } - } - - $("
") - .append($perfHeader) - .append($perfBody) - .appendTo(window.document.body) - .modal({ - backdrop: "static", - show: true + CollectionUtils.forEach(perfData, function (value, testName) { + templateVars.perfData.push({ + testName: testName, + value: getValue(value) }); - + }); + + var template = Mustache.render(PerfDialogTemplate, templateVars); + Dialogs.showModalDialogUsingTemplate(template); + // Select the raw perf data field on click since select all doesn't // work outside of the editor $("#brackets-perf-raw-data").click(function () { @@ -158,80 +141,23 @@ define(function (require, exports, module) { var stringsPath = FileUtils.getNativeBracketsDirectoryPath() + "/nls"; NativeFileSystem.requestNativeFileSystem(stringsPath, function (fs) { fs.root.createReader().readEntries(function (entries) { - - var $submit, + var $dialog, + $submit, $select, locale, - curLocale = (brackets.isLocaleDefault() ? null : brackets.getLocale()); + curLocale = (brackets.isLocaleDefault() ? null : brackets.getLocale()), + languages = []; function setLanguage(event) { locale = $select.val(); $submit.attr("disabled", false); } - - var $modal = $("
"); - - var $header = $("
") - .append("×") - .append("

" + Strings.LANGUAGE_TITLE + "

") - .appendTo($modal); - - var $body = $("
") - .appendTo($modal); - - var $p = $("

") - .text(Strings.LANGUAGE_MESSAGE) - .appendTo($body); - - $select = $("

OperationTime (ms)
").text(content); + var templateVars = { + delimitedPerfData: PerfUtils.getDelimitedPerfData(), + perfData: [] }; var getValue = function (entry) { @@ -121,28 +114,18 @@ define(function (require, exports, module) { return entry; } }; - - var testName; + var perfData = PerfUtils.getData(); - for (testName in perfData) { - if (perfData.hasOwnProperty(testName)) { - // Add row to error table - $("