diff options
| author | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
| commit | d59cb51c275fbbef84604f9ed77afedba8168099 (patch) | |
| tree | 7d3f51c20eb6b6940c1ce648d828fa1e2d8d510b /js/document | |
| parent | 857aafee732b6a85fa155ff4a05d1b8fde48f09d (diff) | |
| parent | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (diff) | |
| download | ninja-d59cb51c275fbbef84604f9ed77afedba8168099.tar.gz | |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/document')
| -rwxr-xr-x | js/document/document-html.js | 2 | ||||
| -rwxr-xr-x | js/document/templates/montage-html/package.json | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index 87c776d5..a26b74d5 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
| @@ -41,7 +41,7 @@ exports.HtmlDocument = Montage.create(Component, { | |||
| 41 | //////////////////////////////////////////////////////////////////// | 41 | //////////////////////////////////////////////////////////////////// |
| 42 | // | 42 | // |
| 43 | exclusionList: { | 43 | exclusionList: { |
| 44 | value: ["HTML", "BODY"] //TODO: Update to correct list | 44 | value: ["HTML", "BODY", "NINJA-CONTENT"] //TODO: Update to correct list |
| 45 | }, | 45 | }, |
| 46 | //////////////////////////////////////////////////////////////////// | 46 | //////////////////////////////////////////////////////////////////// |
| 47 | // | 47 | // |
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json new file mode 100755 index 00000000..d1e839dc --- /dev/null +++ b/js/document/templates/montage-html/package.json | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | { | ||
| 2 | "directories": { | ||
| 3 | "lib": "" | ||
| 4 | }, | ||
| 5 | "mappings": { | ||
| 6 | "montage": "../../../../node_modules/montage/", | ||
| 7 | "montage-google": "../../../../node_modules/montage-google/" | ||
| 8 | } | ||
| 9 | } \ No newline at end of file | ||