aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
authorJonathan Duran2012-02-27 11:22:51 -0800
committerJonathan Duran2012-02-27 11:22:51 -0800
commitab10898c78f2bd5d765d9c915848ed8c8e08c5a3 (patch)
treeb1ebb87e9c101c558108e1cec043d64a03cc50a1 /js/lib
parentfb8aacbadba8dffb9619eb16e4626c197dc9264d (diff)
parentda60be29baab67440535b6b2b71fe7de989dfed0 (diff)
downloadninja-ab10898c78f2bd5d765d9c915848ed8c8e08c5a3.tar.gz
Merge branch 'refs/heads/integration-candidate' into Timeline
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 887743c5..e16715a4 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -113,8 +113,8 @@ exports.NJUtils = Object.create(Object.prototype, {
113 }, 113 },
114 114
115 ///// Element Model creation for existing elements based on element type. 115 ///// Element Model creation for existing elements based on element type.
116 ///// TODO: find a different place for this function and return different element models based on type. 116 ///// TODO: Selection and model should be based on the element type
117 makeElementModel2: { 117 makeModelFromElement: {
118 value: function(el) { 118 value: function(el) {
119 this.makeElementModel(el, "Div", "block", false); 119 this.makeElementModel(el, "Div", "block", false);
120 } 120 }