diff options
author | Jose Antonio Marquez | 2012-04-24 10:06:53 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-24 10:06:53 -0700 |
commit | 4c15e77bdb7f4e0558f3749994a8a37b207b97ae (patch) | |
tree | 593ab4917fb5cc3ef8ee36822b56c6edd30c33a5 /js/document/models | |
parent | 36d50b6599ab98559c76e1fe57b1bb131c4433da (diff) | |
parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
download | ninja-4c15e77bdb7f4e0558f3749994a8a37b207b97ae.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/document/models')
-rwxr-xr-x | js/document/models/base.js | 4 | ||||
-rwxr-xr-x | js/document/models/html.js | 4 |
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 | // |
9 | var Montage = require("montage/core/core").Montage, | 9 | var 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 | // |
13 | exports.HtmlDocumentModel = Montage.create(TextDocumentModel, { | 13 | exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { |
14 | //////////////////////////////////////////////////////////////////// | 14 | //////////////////////////////////////////////////////////////////// |
15 | // | 15 | // |
16 | hasTemplate: { | 16 | hasTemplate: { |