diff --git a/app/app/routes/application.js b/app/app/routes/application.js index ffeb5a65..82dc16d4 100644 --- a/app/app/routes/application.js +++ b/app/app/routes/application.js @@ -22,6 +22,20 @@ export default Ember.Route.extend(ApplicationRouteMixin, { session: service(), beforeModel(transition) { + let MutationObserver = window.MutationObserver || window.WebKitMutationObserver; + + let observer = new MutationObserver(function(/*mutations, observer*/) { + // fired when a mutation occurs + // console.log(mutations, observer); + $("#zone-sidebar").css('height', $(document).height() - $("#zone-navigation").height() - $("#zone-header").height() - 35); + }); + + observer.observe(document, { + subtree: true, + attributes: false, + childList: true + }); + return this.get('appMeta').boot(transition.targetName).then(data => { if (this.get('session.session.authenticator') !== "authenticator:documize" && data.allowAnonymousAccess) { return this.get('session').authenticate('authenticator:anonymous', data); @@ -37,14 +51,6 @@ export default Ember.Route.extend(ApplicationRouteMixin, { Mousetrap.reset(); }, - didTransition() { - Ember.run.schedule("afterRender", this, function () { - $("#zone-sidebar").css('height', $(document).height() - $("#zone-navigation").height() - $("#zone-header").height() - 35); - }); - - return true; - }, - error(error /*, transition*/ ) { if (error) { if (netUtil.isAjaxAccessError(error)) { diff --git a/core/product.go b/core/product.go index 65538b44..c7845bbb 100644 --- a/core/product.go +++ b/core/product.go @@ -26,7 +26,7 @@ type ProdInfo struct { // Product returns product edition details func Product() (p ProdInfo) { p.Major = "0" - p.Minor = "18" + p.Minor = "19" p.Patch = "0" p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch) p.Edition = "Community"