Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache #1358

tvoliter · 2012-08-10T00:04:56Z

includes jdiel's "language switching" pull request Added Language Switching #1285 which includes DE translations, a menu and UI for switching languages, and string lookup support through i18n.js
added new module htmlContentLoad.js that dynamically loads main-view.html, localizes it using i18n.js + mustache.js, and injects it into the body of index.html
body of index.html moved to main-view.html
modified SideBarView.js to depend on htmlContentLoad since this module modifies HTML on load.

3rd Party Code Notice: Mustache.js uses an MIT license: https://github.com/janl/mustache.js/blob/master/LICENSE. I will need to complete the Brackets third party check list before this pull request can be merged.

…ly one loc file! - added file htmlContentLoad.js that is a require module that dynamically renders html templates and localized strings in the body of teh page - break apart index.html into main-view.html, modal-windows.html, and side-bar.html

…ocalization pull request https://github.com/adobe/brackets/pull/1285/files from jdiehl that uses requires i18n.js plugin

jasonsanjose · 2012-08-10T16:00:34Z

src/htmlContent/main-view.html

@@ -0,0 +1,176 @@
+<!--


needs copyright header

I'm getting a jslint error for this html template fragment. I'm not sure what the solution is though.

I noticed this too. I think JSLint expects it to be a fully formed html structure since it sees the .html suffix. Since this is really an html fragment it doesn’t have or tags.

I don’t know if the JSLint options you can put in comments work in HTML comments.

jasonsanjose · 2012-08-10T16:23:21Z

Initial review complete.

jasonsanjose · 2012-08-13T18:22:43Z

Also, we need to verify the 3rd party code checklist.

jasonsanjose · 2012-08-13T22:34:30Z

Need to merge with master

jasonsanjose · 2012-08-13T22:51:58Z

src/strings.js

@@ -22,144 +22,17 @@
 */

 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define */
+/*global $, window, define */


window is unused. remove this jslint config option.

jasonsanjose · 2012-08-13T22:58:24Z

The working set wasn't working properly when I did some testing. See my comment in SidebarView.js.

redmunds · 2012-08-14T15:20:58Z

src/index.html

-        <ul data-dropdown="dropdown"></ul>
-    </div>
+    <!-- HTML content is dynamically loaded and rendered by the htmlContentLoad
+         module. Any modules that depend on or modify HTML during load should require the htmlContentLoad module so that it is loaded first. -->


This comment line should be split so that it fits in 80 columns.

Fixed. I also updated the comment now that I am using an event to signal the dom is ready.

…es can touch/modify the dom

jasonsanjose · 2012-08-14T17:32:34Z

src/brackets.js

+    // The htmlContentLoad module renders all of html in Bracktes.
+    // If a module depends on the DOM being fulling formed before it is loaded
+    // then the module should listen for the event "htmlContentLoadComplete"
+    require("htmlContent/htmlContentLoad");


Should have seen this sooner, but do we need a completely separate module anymore? htmlContentLoad.js won't be reused anywhere else. It seems like we could inline the Mustache.render() call inside _onReady() in brackets.js.

If we can make this change, then $(brackets).trigger("htmlContentLoadComplete"); would immediately follow Mustache.render(). I think that would be a cleaner approach.

Good idea. I removed that module and moved the functionality to brackets.js

Now SidebarView.js and ProjectManager.js listen for the htmlContentLoadComplete event since they both init jquery vars on load.

From: Jason San Jose [mailto:notifications@github.com]
Sent: Tuesday, August 14, 2012 10:33 AM
To: adobe/brackets
Cc: Ty Voliter
Subject: Re: [brackets] Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache (#1358)

In src/brackets.js:

@@ -50,6 +57,12 @@ define(function (require, exports, module) {

require("thirdparty/path-utils/path-utils.min"); require("thirdparty/smart-auto-complete/jquery.smart_autocomplete");

// Load HTML Content

// The htmlContentLoad module renders all of html in Bracktes.

// If a module depends on the DOM being fulling formed before it is loaded

// then the module should listen for the event "htmlContentLoadComplete"

require("htmlContent/htmlContentLoad");

Should have seen this sooner, but do we need a completely separate module anymore? htmlContentLoad.js won't be reused anywhere else. It seems like we could inline the Mustache.render() call inside _onReady() in brackets.js.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/1358/files#r1374771.

done

From: Jason San Jose [mailto:notifications@github.com]
Sent: Tuesday, August 14, 2012 10:34 AM
To: adobe/brackets
Cc: Ty Voliter
Subject: Re: [brackets] Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache (#1358)

In src/brackets.js:

@@ -50,6 +57,12 @@ define(function (require, exports, module) {

require("thirdparty/path-utils/path-utils.min"); require("thirdparty/smart-auto-complete/jquery.smart_autocomplete");

// Load HTML Content

// The htmlContentLoad module renders all of html in Bracktes.

// If a module depends on the DOM being fulling formed before it is loaded

// then the module should listen for the event "htmlContentLoadComplete"

require("htmlContent/htmlContentLoad");

If we can make this change, then $(brackets).trigger("htmlContentLoadComplete"); would immediately follow Mustache.render(). I think that would be a cleaner approach.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/1358/files#r1374784.

- modified SidebarView.js and ProjectManager.js to init DOM dependant variables after htmlContentLoadComplete event

tvoliter · 2012-08-14T19:51:37Z

Working on this now…

From: Jason San Jose [mailto:notifications@github.com]
Sent: Monday, August 13, 2012 3:35 PM
To: adobe/brackets
Cc: Ty Voliter
Subject: Re: [brackets] Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache (#1358)

Need to merge with master

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/1358#issuecomment-7710502.

…to tvoliter/localizationSupport * origin/tvoliter/localizationSupport: - removed htmlContentLoad.js module. Functionality moved to brackets.js - modified SidebarView.js and ProjectManager.js to init DOM dependant variables after htmlContentLoadComplete event

gruehle · 2012-08-14T20:10:20Z

src/strings.js

-    exports.CMD_SHOW_PERF_DATA                  = "Show Performance Data";
-    exports.CMD_NEW_BRACKETS_WINDOW             = "New Brackets Window";
-    exports.CMD_USE_TAB_CHARS                   = "Use Tab Characters";
+    'use strict';


Should be double quotes.

fixed

From: Glenn Ruehle [mailto:notifications@github.com]
Sent: Tuesday, August 14, 2012 1:10 PM
To: adobe/brackets
Cc: Ty Voliter
Subject: Re: [brackets] Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache (#1358)

In src/strings.js:

exports.CMD_TOGGLE_QUICK_EDIT = "Quick Edit";

exports.CMD_QUICK_EDIT_PREV_MATCH = "Previous Match";

exports.CMD_QUICK_EDIT_NEXT_MATCH = "Next Match";

exports.CMD_NEXT_DOC = "Next Document";

exports.CMD_PREV_DOC = "Previous Document";

// Debug menu commands

exports.DEBUG_MENU = "Debug";

exports.CMD_REFRESH_WINDOW = "Reload Brackets";

exports.CMD_SHOW_DEV_TOOLS = "Show Developer Tools";

exports.CMD_RUN_UNIT_TESTS = "Run Tests";

exports.CMD_JSLINT = "Enable JSLint";

exports.CMD_SHOW_PERF_DATA = "Show Performance Data";

exports.CMD_NEW_BRACKETS_WINDOW = "New Brackets Window";

exports.CMD_USE_TAB_CHARS = "Use Tab Characters";

'use strict';

Should be double quotes.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/1358/files#r1376639.

…onSupport * origin/master: (33 commits) Update About dialog sprint number. Update README.md don't cache itemsPerPage change height to see 8 items code review changes simplify menu/command lookup handle same command in multiple menus support for scrolling code hint menu Respond to code review: add tag hinting sanity checks; add filtered tag hinting test; fix typo. Set shouldShowHintsOnKeyUp to false as added precaution as we pass key events to hintList. Check keys on keyPress events and invoke code hints on keyUp events. Unit tests for HTML attribute code hinting, plus a few couple extra tests for tag code hinting. Added "brackets" global variable, removed space after exclamation mark (JSLint) implement abortQuit callback add comment for brackets-shell migration Revert verification change in unit test Revert "restore unit test verification step" Revert "restore unit test verification step". Detect brackets-shell vs. brackets-app. Fix HTMLUtils unit tests by adding the new parameter for the new property. Also make it consistent by setting the new property to be true regardless of the value is empty or not as long as there is a equal sign. restore unit test verification step ... Conflicts: src/index.html src/strings.js

tvoliter · 2012-08-14T20:41:04Z

Code code review fixes pushed and I merged with master

jasonsanjose · 2012-08-14T20:54:46Z

src/strings.js

@@ -22,145 +22,17 @@
 */

 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define */
+/*global $, define */


jquery $ is unused

fixed

From: Jason San Jose [mailto:notifications@github.com]
Sent: Tuesday, August 14, 2012 1:55 PM
To: adobe/brackets
Cc: Ty Voliter
Subject: Re: [brackets] Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache (#1358)

In src/strings.js:

@@ -22,145 +22,17 @@

*/

/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */

-/*global define */

+/*global $, define */

jquery $ is unused

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/1358/files#r1377055.

jasonsanjose · 2012-08-14T21:02:02Z

src/debug/DebugCommandHandlers.js

+                      $submit.attr("disabled", false);
+                  }
+
+                  var $modal = $("<div class='modal hide' />");


I'll file a general issue to move blocks such as this one into a template.

Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache

tvoliter added 4 commits August 6, 2012 14:28

localize

da48df8

Remove decomp of index.html into separate template files. Integrate l…

e319956

…ocalization pull request https://github.com/adobe/brackets/pull/1285/files from jdiehl that uses requires i18n.js plugin

adding localization notes in comments

c3a9992

ghost assigned jasonsanjose Aug 10, 2012

jasonsanjose reviewed Aug 10, 2012
View reviewed changes

add mustache submodule

c387fc0

code review fixes

a388de1

jasonsanjose reviewed Aug 13, 2012
View reviewed changes

tvoliter added 2 commits August 13, 2012 18:08

code review fix

ee3a6de

working on load order

b4338bd

redmunds reviewed Aug 14, 2012
View reviewed changes

tvoliter added 3 commits August 14, 2012 08:43

brackest sends "htmlContentLoadComplete" event to indicate when modul…

6ecb6d9

…es can touch/modify the dom

updating comment

545c15b

Updating config of SpecRunner.js to match Bracket.js

c155b92

jasonsanjose reviewed Aug 14, 2012
View reviewed changes

redmunds and others added 2 commits August 14, 2012 10:53

localize quick open and find in files input dialogs

a5440c2

- removed htmlContentLoad.js module. Functionality moved to brackets.js

6593119

- modified SidebarView.js and ProjectManager.js to init DOM dependant variables after htmlContentLoadComplete event

- removed htmlContentLoad.js module. Functionality moved to brackets.js

71c97d6

- modified SidebarView.js and ProjectManager.js to init DOM dependant variables after htmlContentLoadComplete event

gruehle reviewed Aug 14, 2012
View reviewed changes

tvoliter added 3 commits August 14, 2012 13:11

merged index.html

cb74555

use double quotes

baa2c8f

jasonsanjose reviewed Aug 14, 2012
View reviewed changes

remove unused $ in define

ada344b

jasonsanjose reviewed Aug 14, 2012
View reviewed changes

jasonsanjose added a commit that referenced this pull request Aug 14, 2012

Merge pull request #1358 from adobe/tvoliter/localizationSupport

816b155

Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache

jasonsanjose merged commit 816b155 into master Aug 14, 2012

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache #1358

Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache #1358

tvoliter commented Aug 10, 2012

jasonsanjose Aug 10, 2012

jasonsanjose Aug 13, 2012

jasonsanjose Aug 14, 2012

tvoliter Aug 14, 2012

jasonsanjose commented Aug 10, 2012

jasonsanjose commented Aug 13, 2012

jasonsanjose commented Aug 13, 2012

jasonsanjose Aug 13, 2012

jasonsanjose commented Aug 13, 2012

redmunds Aug 14, 2012

tvoliter Aug 14, 2012

jasonsanjose Aug 14, 2012

jasonsanjose Aug 14, 2012

tvoliter Aug 14, 2012

tvoliter Aug 14, 2012

tvoliter commented Aug 14, 2012

gruehle Aug 14, 2012

tvoliter Aug 14, 2012

tvoliter commented Aug 14, 2012

jasonsanjose Aug 14, 2012

tvoliter Aug 14, 2012

jasonsanjose Aug 14, 2012

Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache #1358

Combine jdiel's "language switching" pull request with tvoliter's templatization of index.html using mustache #1358

Conversation

tvoliter commented Aug 10, 2012

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jasonsanjose commented Aug 10, 2012

jasonsanjose commented Aug 13, 2012

jasonsanjose commented Aug 13, 2012

Choose a reason for hiding this comment

jasonsanjose commented Aug 13, 2012

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tvoliter commented Aug 14, 2012

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tvoliter commented Aug 14, 2012

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment