diff --git a/assets/behavior.html b/assets/behavior.html index 3fabc50..aace0b9 100644 --- a/assets/behavior.html +++ b/assets/behavior.html @@ -170,8 +170,7 @@ this.setId() var handler = function (ev) { - var val = self.multi ? - (elem.selectedValues || []) : + var val = self.multi ? (elem.selectedValues || []) : (elem.selected || 0) self.update(elem, self.name, val) diff --git a/src/basics/behavior.jl b/src/basics/behavior.jl index 8505367..b59b835 100644 --- a/src/basics/behavior.jl +++ b/src/basics/behavior.jl @@ -134,8 +134,8 @@ render(t::Selectable, state) = Elem("selectable-behavior", attributes = @d( :name=>t.name, - :selector=>t.selector, - :multi=>t.multi + :multi=>boolattr( t.multi ), + :selector=>t.selector ) ) @@ -231,4 +231,3 @@ wire(a, b, chan, attribute) = arg(chan::Symbol, doc="The name of the channel.") arg(attr::Symbol, doc="The attribute/property to connect.") end - diff --git a/src/library/layout2.jl b/src/library/layout2.jl index 663e1dc..9c1689e 100644 --- a/src/library/layout2.jl +++ b/src/library/layout2.jl @@ -56,7 +56,7 @@ wrapbehavior(w::IconButton) = clickable(w, name=w.name) -abstract Selection <: Widget +abstract Selection <: Widget @api pages => (Pages <: Selection) begin #FIXME: Why is this a widget? doc("A set of pages. Only one selected page will be visible at any given time.") @@ -67,7 +67,7 @@ end render(ps::Pages, state) = Elem("iron-pages", - map(t -> Elem("section", render(t, state)), ps.pages.tiles), + map(t -> Elem("div", render(t, state)), ps.pages.tiles), attributes = @d(:selected=>ps.selected-1)) @api tabs => (Tabs <: Selection) begin @@ -225,4 +225,3 @@ render(dm::DropdownMenu, state) = begin ) end wrapbehavior(d::DropdownMenu) = selectable(d, name=d.name, selector=".dropdown-content") -