aboutsummaryrefslogtreecommitdiff
path: root/js/document/models
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-24 10:06:53 -0700
committerJose Antonio Marquez2012-04-24 10:06:53 -0700
commit4c15e77bdb7f4e0558f3749994a8a37b207b97ae (patch)
tree593ab4917fb5cc3ef8ee36822b56c6edd30c33a5 /js/document/models
parent36d50b6599ab98559c76e1fe57b1bb131c4433da (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-4c15e77bdb7f4e0558f3749994a8a37b207b97ae.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/document/models')
-rwxr-xr-xjs/document/models/base.js4
-rwxr-xr-xjs/document/models/html.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 96156e64..8925fc40 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -21,6 +21,10 @@ exports.BaseDocumentModel = Montage.create(Montage, {
21 file: { 21 file: {
22 value: null 22 value: null
23 }, 23 },
24
25 _name: {
26 value: null
27 },
24 //////////////////////////////////////////////////////////////////// 28 ////////////////////////////////////////////////////////////////////
25 // 29 //
26 njdata: { 30 njdata: {
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 5882d389..ff57454b 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -7,10 +7,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
7//////////////////////////////////////////////////////////////////////// 7////////////////////////////////////////////////////////////////////////
8// 8//
9var Montage = require("montage/core/core").Montage, 9var Montage = require("montage/core/core").Montage,
10 TextDocumentModel = require("js/document/models/text").TextDocumentModel; 10 BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;
11//////////////////////////////////////////////////////////////////////// 11////////////////////////////////////////////////////////////////////////
12// 12//
13exports.HtmlDocumentModel = Montage.create(TextDocumentModel, { 13exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
14 //////////////////////////////////////////////////////////////////// 14 ////////////////////////////////////////////////////////////////////
15 // 15 //
16 hasTemplate: { 16 hasTemplate: {