Skip to content

Commit

Permalink
Merge branch 'master' of github.com:enyojs/enyo
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Miles committed May 19, 2012
2 parents 79b3ed2 + d43ff2d commit 76aa00e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
6 changes: 6 additions & 0 deletions source/dom/Control.js
Expand Up @@ -303,6 +303,12 @@ enyo.kind({
enyo.Control.cssTextToDomStyles(inCssText, this.domStyles);
this.domStylesChanged();
},
getComputedStyleValue: function(inStyle, inDefault) {
if (this.hasNode()) {
return enyo.dom.getComputedStyleValue(this.node, inStyle);
}
return inDefault;
},
domStylesChanged: function() {
this.domCssText = enyo.Control.domStylesToCssText(this.domStyles);
this.invalidateTags();
Expand Down
7 changes: 4 additions & 3 deletions source/ui/Popup.js
Expand Up @@ -15,7 +15,7 @@
The _autoDismiss_ property controls how a popup may be dismissed. If true
(the default), then tapping outside the popup or pressing the ESC key will
dismiss the popup.
The _modal_ property may be set to true to prevent any
controls outside the popup from responding to events while the popup is
showing.
Expand Down Expand Up @@ -95,10 +95,11 @@ enyo.kind({
}
},
updatePosition: function() {
if (this.centered) {
if( this.centered ) {
var d = this.calcViewportSize();
var b = this.getBounds();
this.addStyles("top: " + ((d.height-b.height)/2) + "px; left: " + ((d.width-b.width)/2) + "px;");

this.addStyles( "top: " + Math.max( ( ( d.height - b.height ) / 2 ), 0 ) + "px; left: " + Math.max( ( ( d.width - b.width ) / 2 ), 0 ) + "px;" );
}
},
showingChanged: function() {
Expand Down
9 changes: 9 additions & 0 deletions source/ui/Select.js
Expand Up @@ -48,6 +48,15 @@ enyo.kind({
change: function() {
this.selected = this.getSelected();
},
render: function() {
// work around IE bug with innerHTML setting of <select>, rerender parent instead
// http://support.microsoft.com/default.aspx?scid=kb;en-us;276228
if (enyo.platform.ie) {
this.parent.render();
} else {
this.inherited(arguments);
}
},
//* @public
//* Returns the value of the selected option.
getValue: function() {
Expand Down

0 comments on commit 76aa00e

Please sign in to comment.