@qtoggle/qui 1.16.1 → 1.16.3

package/js/forms/common-forms/page-form.js

@@ -96,6 +96,10 @@ class PageForm extends mix(Form).with(PageMixin) {
             }
 
             let context = currentSection.getPagesContext()
+            if (!context) {
+                return
+            }
+
             let pages = context.getPages()
             let pageForms = pages.filter(p => p instanceof PageForm)
 

package/js/pages/page.js

@@ -9,6 +9,7 @@ import * as Navigation  from '$qui/navigation.js'
 import * as Theme       from '$qui/theme.js'
 import {asap}           from '$qui/utils/misc.js'
 import ViewMixin        from '$qui/views/view.js'
+import * as Sections    from '$qui/sections/sections.js'
 import * as Window      from '$qui/window.js'
 
 import {getPagesContainer} from './pages.js'
@@ -182,7 +183,7 @@ const PageMixin = Mixin((superclass = Object, rootclass) => {
         /**
          * Override this to implement how the page is loaded.
          *
-         * By default does nothing, returning a resolved promise.
+         * Does nothing by default, returning a resolved promise.
          *
          * @returns {Promise}
          */
@@ -727,6 +728,14 @@ const PageMixin = Mixin((superclass = Object, rootclass) => {
             this.onSectionHide()
         }
 
+        /**
+         * Returns the section to which the page currently belongs (may be `null`).
+         * @returns {?qui.sections.Section}
+         */
+        getSection() {
+            return Sections.all().find(s => s.getPagesContext() === this.getContext()) || null
+        }
+
         /**
          * Override this method to enable the options bar for this page.
          * @returns {?jQuery|qui.views.ViewMixin}

package/js/pages/pages.js

@@ -48,7 +48,7 @@ export function getCurrentContext() {
 /**
  * Replace the current pages context.
  * @alias qui.pages.setCurrentContext
- * @param {?qui.pages.PagesContext} context new context, or `null` to replace with a brand new context
+ * @param {?qui.pages.PagesContext} context new context, or `null` to replace with a brand-new context
  */
 export function setCurrentContext(context) {
     let pagesToDetach = currentContext.getPages()

package/js/sections/section.js

@@ -3,6 +3,7 @@ import $      from '$qui/lib/jquery.module.js'
 import Logger from '$qui/lib/logger.module.js'
 
 import {NotImplementedError} from '$qui/base/errors.js'
+import {AssertionError}      from '$qui/base/errors.js'
 import {mix}                 from '$qui/base/mixwith.js'
 import SingletonMixin        from '$qui/base/singleton.js'
 import StockIcon             from '$qui/icons/stock-icon.js'
@@ -358,18 +359,24 @@ class Section extends mix().with(SingletonMixin) {
      * @returns {?qui.pages.PageMixin}
      */
     getCurrentPage() {
-        return this.getPagesContext().getCurrentPage()
+        let context = this.getPagesContext()
+        return context ? context.getCurrentPage() : null
     }
 
     /**
      * Return the pages context of this section.
-     * @returns {qui.pages.PagesContext}
+     * @returns {?qui.pages.PagesContext}
      */
     getPagesContext() {
         /* A hidden section has its pages context stored in _savedPagesContext. A visible (current) section owns the
          * current pages context. */
 
-        return this._savedPagesContext || getCurrentContext()
+        if (this.isCurrent()) {
+            return getCurrentContext()
+        }
+        else {
+            return this._savedPagesContext
+        }
     }
 
 
@@ -525,6 +532,10 @@ class Section extends mix().with(SingletonMixin) {
         }
 
         let context = this.getPagesContext()
+        if (!context) {
+            throw new AssertionError('Attempt to push page to uninitialized section')
+        }
+
         if (!context.isCurrent()) {
             historyEntry = false
         }

package/js/widgets/common-widgets/choice-buttons.js

@@ -192,7 +192,9 @@ $.widget('qui.choicebuttons', $.qui.basewidget, {
 
     _setActive: function (button) {
         this._getButtons().removeClass(this.options.onClass)
-        button.addClass(this.options.onClass)
+        if (button) {
+            button.addClass(this.options.onClass)
+        }
     },
 
     _installClickHandlers: function () {
@@ -226,6 +228,7 @@ $.widget('qui.choicebuttons', $.qui.basewidget, {
     },
 
     setValue: function (value) {
+        this._setActive(null)
         let widget = this
         this._getButtons().each(function () {
             if ($(this).data('value') === value) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qtoggle/qui",
   "description": "A JavaScript UI library with batteries included.",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "author": {
     "name": "Calin Crisan",
     "email": "ccrisan@gmail.com"

package/setup.py

@@ -8,7 +8,7 @@ except ImportError:
 
 setup(
     name='qui-server',
-    version='1.16.1',
+    version='1.16.3',
     description='QUI server-side',
     author='Calin Crisan',
     author_email='ccrisan@gmail.com',