aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
authorEric Guzman2012-02-29 16:13:19 -0800
committerEric Guzman2012-02-29 16:13:19 -0800
commit53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch)
tree44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/lib
parentb2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff)
parentb09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff)
downloadninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/lib')
-rwxr-xr-xjs/lib/NJUtils.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 49dfd706..fe8623a1 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -115,8 +115,8 @@ exports.NJUtils = Object.create(Object.prototype, {
115 }, 115 },
116 116
117 ///// Element Model creation for existing elements based on element type. 117 ///// Element Model creation for existing elements based on element type.
118 ///// TODO: find a different place for this function and return different element models based on type. 118 ///// TODO: Selection and model should be based on the element type
119 makeElementModel2: { 119 makeModelFromElement: {
120 value: function(el) { 120 value: function(el) {
121 this.makeElementModel(el, "Div", "block", false); 121 this.makeElementModel(el, "Div", "block", false);
122 } 122 }