Merge pull request #3286 from TomMalbran/tom/project-template-vars

redmunds · redmunds · commit 5af37f82bcf2 · 2013-06-17T08:46:03.000-07:00
[OPEN] Move the Project Preferences Dialog variables to the template
diff --git a/src/htmlContent/project-settings-dialog.html b/src/htmlContent/project-settings-dialog.html
@@ -1,14 +1,17 @@
 <div class="project-settings-dialog modal">
     <div class="modal-header">
-        <h1 class="dialog-title"></h1>
+        <h1 class="dialog-title">{{title}}</h1>
     </div>
     <div class="modal-body">
         <div class="field-container">
-            <label>{{PROJECT_SETTING_BASE_URL}}: <input type="text" placeholder="{{PROJECT_SETTING_BASE_URL_HINT}}" class="url" /></label>
-        </div>
+            <label>
+                {{Strings.PROJECT_SETTING_BASE_URL}}: <input type="text" placeholder="{{Strings.PROJECT_SETTING_BASE_URL_HINT}}" value="{{baseUrl}}" class="url" />
+            </label>
+            {{#errorMessage}}<div class="alert" style="margin-bottom: 0">{{{errorMessage}}}</div>{{/errorMessage}}
+         </div>
     </div>
     <div class="modal-footer">
-        <button class="dialog-button btn" data-button-id="cancel">{{CANCEL}}</button>
-        <button class="dialog-button btn primary" data-button-id="ok">{{OK}}</button>
+        <button class="dialog-button btn" data-button-id="cancel">{{Strings.CANCEL}}</button>
+        <button class="dialog-button btn primary" data-button-id="ok">{{Strings.OK}}</button>
     </div>
 </div>
diff --git a/src/preferences/PreferencesDialogs.js b/src/preferences/PreferencesDialogs.js
@@ -80,13 +80,27 @@ define(function (require, exports, module) {
      *      of the clicked button when the dialog is dismissed. Never rejected.
      */
     function showProjectPreferencesDialog(baseUrl, errorMessage) {
-        var $dlg,
-            $title,
-            $baseUrlControl,
+        var $baseUrlControl,
             dialog;
-
-        dialog = Dialogs.showModalDialogUsingTemplate(Mustache.render(SettingsDialogTemplate, Strings));
-
+        
+        // Title
+        var projectName = "",
+            projectRoot = ProjectManager.getProjectRoot(),
+            title;
+        if (projectRoot) {
+            projectName = projectRoot.name;
+        }
+        title = StringUtils.format(Strings.PROJECT_SETTINGS_TITLE, projectName);
+        
+        var templateVars = {
+            title        : title,
+            baseUrl      : baseUrl,
+            errorMessage : errorMessage,
+            Strings      : Strings
+        };
+        
+        dialog = Dialogs.showModalDialogUsingTemplate(Mustache.render(SettingsDialogTemplate, templateVars));
+        
         dialog.done(function (id) {
             if (id === Dialogs.DIALOG_BTN_OK) {
                 var baseUrlValue = $baseUrlControl.val();
@@ -100,32 +114,8 @@ define(function (require, exports, module) {
             }
         });
 
-        // Populate project settings
-        $dlg = dialog.getElement();
-
-        // Title
-        $title = $dlg.find(".dialog-title");
-        var projectName = "",
-            projectRoot = ProjectManager.getProjectRoot(),
-            title;
-        if (projectRoot) {
-            projectName = projectRoot.name;
-        }
-        title = StringUtils.format(Strings.PROJECT_SETTINGS_TITLE, projectName);
-        $title.text(title);
-
-        // Base URL
-        $baseUrlControl = $dlg.find(".url");
-        if (baseUrl) {
-            $baseUrlControl.val(baseUrl);
-        }
-
-        // Error message
-        if (errorMessage) {
-            $dlg.find(".field-container").append("<div class='alert' style='margin-bottom: 0'>" + errorMessage + "</div>");
-        }
-
         // Give focus to first control
+        $baseUrlControl = dialog.getElement().find(".url");
         $baseUrlControl.focus();
 
         return dialog;
