Merge branch 'refs/heads/master' into minorFixes_7.1

2 files changed, 3 insertions, 3 deletions

diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
index 5eba72e8..2c547a22 100755
--- a/js/components/layout/document-bar.reel/document-bar.css
+++ b/js/components/layout/document-bar.reel/document-bar.css
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
     background: -webkit-radial-gradient(center, ellipse cover, rgba(100, 100, 100, .9) 40%, rgba(100, 100, 100, .4) 50%, rgba(100, 100, 100, 0) 51%), -webkit-radial-gradient(center, ellipse cover, rgba(100, 100, 100, .9) 40%, rgba(100, 100, 100, .4) 50%, rgba(100, 100, 100, 0) 51%), -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgb(60, 60, 60)), color-stop(70%, rgb(30, 30, 30)), color-stop(100%, rgb(25, 25, 25))), -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgb(10, 10, 10)), color-stop(50%, rgb(20, 20, 20)), color-stop(100%, rgb(10, 10, 10))) !important;
     background-repeat: no-repeat, no-repeat, no-repeat, no-repeat, no-repeat !important;
     background-position: 49.5% center, 50.5% center, center center, left top !important;
-    background-size: 5px 5px, 5px 5px, 3% 100%, 100% 100%;
+    background-size: 5px 5px, 5px 5px, 3% 100%, 100% 100% !important;
 }
 
 .documentBar {
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 098e9e68..88c4a24b 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -246,7 +246,7 @@ exports.DocumentBar = Montage.create(Component, {
                         file: this._currentDocument.model.file,
                         webgl: this._currentDocument.model.webGlHelper.glData,
                         styles: this._currentDocument.model.getStyleSheets(),
-                        template: this._currentDocument.fileTemplate,
+                        template: this._currentDocument.model.fileTemplate,
                         document: this._currentDocument.model.views.design.iframe.contentWindow.document,
                         head: this._currentDocument.model.views.design.iframe.contentWindow.document.head,
                         body: this._currentDocument.model.views.design.iframe.contentWindow.document.body,
@@ -256,7 +256,7 @@ exports.DocumentBar = Montage.create(Component, {
                     doc = this._currentDocument.model.views.code.textArea.value;
                 }
                 //Reloading the document from changes made
-                this._currentDocument.reloadView(view, this.fileTemplate, doc);
+                this._currentDocument.reloadView(view, doc.template, doc);
             }
             }
     },