fixes for scrolling in the modaldialog kind

This commit is contained in:
Morgan McMillian 2012-03-11 21:06:11 -04:00
parent 763df87ad0
commit 315f28edfa
3 changed files with 10 additions and 6 deletions

View file

@ -22,14 +22,15 @@ enyo.kind({
"onSave": "" "onSave": ""
}, },
components: [ components: [
{name: "insertPopup", kind: "Popup", dismissWithClick: false, {name: "insertPopup", kind: "ModalDialog", dismissWithClick: true,
layoutKind: "VFlexLayout", height: "60%", layoutKind: "VFlexLayout", height: "60%",
contentHeight: "100%", onClose: "closePopup",
components: [ components: [
{flex: 1, kind: "Scroller", components: [ {flex: 1, name: "iscroller", kind: "Scroller",
components: [
{name: "projects", kind: "RowGroup", caption: "Projects"}, {name: "projects", kind: "RowGroup", caption: "Projects"},
{name: "contexts", kind: "RowGroup", caption: "Contexts"} {name: "contexts", kind: "RowGroup", caption: "Contexts"}
]}, ]}
{kind: "Button", caption: "Dismiss", onclick: "closePopup"}
]}, ]},
{name: "filterToolbar", kind: "Toolbar", pack: "justify", className: "enyo-toolbar-light", {name: "filterToolbar", kind: "Toolbar", pack: "justify", className: "enyo-toolbar-light",
components: [ components: [
@ -93,6 +94,7 @@ enyo.kind({
); );
} }
this.$.contexts.render(); this.$.contexts.render();
this.$.iscroller.render();
}, },
closePopup: function() { closePopup: function() {
@ -106,6 +108,7 @@ enyo.kind({
eval("this.$."+name+".destroy()"); eval("this.$."+name+".destroy()");
} }
this.$.contexts.render(); this.$.contexts.render();
this.$.tododetail.forceFocus();
this.$.insertPopup.close(); this.$.insertPopup.close();
}, },

View file

@ -26,9 +26,9 @@ enyo.kind({
{caption: "Preferences", onclick: "showPrefView"}, {caption: "Preferences", onclick: "showPrefView"},
{caption: "About", onclick: "showAbout"} {caption: "About", onclick: "showAbout"}
]}, ]},
{kind: "Popup", name: "about", layoutKind: "VFlexLayout", {kind: "ModalDialog", name: "about", layoutKind: "VFlexLayout",
contentHeight: "100%", height: "80%", width: "80%", contentHeight: "100%", height: "80%", width: "80%",
components: [ dismissWithClick: true, components: [
{name: "aboutTitle", content: ""}, {name: "aboutTitle", content: ""},
{content: "by Morgan McMillian"}, {content: "by Morgan McMillian"},
{kind: "Divider", caption: "Version History"}, {kind: "Divider", caption: "Version History"},

View file

@ -33,3 +33,4 @@
} }
.ver-history { font-size: 16px; } .ver-history { font-size: 16px; }
.version { font-weight: bold;} .version { font-weight: bold;}
.enyo-modaldialog > * { height:100%; }