mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-17 23:33:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123 from Ventero/opacity

Browse Source 
Simplify setting element opacity.
This commit is contained in:
iangilman 2013-06-14 09:50:55 -07:00
commit 2a11c209c4
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/openseadragon.js
View File

@ -1013,8 +1013,7 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){
*/ */
setElementOpacity: function( element, opacity, usesAlpha ) { setElementOpacity: function( element, opacity, usesAlpha ) {
var previousFilter, var ieOpacity,
ieOpacity,
ieFilter; ieFilter;
element = $.getElement( element ); element = $.getElement( element );
@ -1023,31 +1022,16 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){
opacity = Math.round( opacity ); opacity = Math.round( opacity );
} }
if ( opacity < 1 ) { if ( $.Browser.opacity ) {
element.style.opacity = opacity; element.style.opacity = opacity < 1 ? opacity : "";
} else { } else {
element.style.opacity = ""; if ( opacity < 1 ) {
}
if ( opacity == 1 ) {
prevFilter = element.style.filter || "";
element.style.filter = prevFilter.replace(/alpha\(.*?\)/g, "");
return;
}
ieOpacity = Math.round( 100 * opacity ); ieOpacity = Math.round( 100 * opacity );
ieFilter = "alpha(opacity=" + ieOpacity + ")"; ieFilter = "alpha(opacity=" + ieOpacity + ")";
element.style.filter = ieFilter;
//TODO: find out why this uses a try/catch instead of a predetermined
// routine or at least an if/elseif/else
try {
if ( element.filters && element.filters.alpha ) {
element.filters.alpha.opacity = ieOpacity;
} else { } else {
element.style.filter += ieFilter; element.style.filter = "";
} }
} catch ( e ) {
element.style.filter += ieFilter;
} }
}, },
@ -1630,6 +1614,12 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){
) )
); );
//determine if this browser supports element.style.opacity
$.Browser.opacity = !(
$.Browser.vendor == $.BROWSERS.IE &&
$.Browser.version < 9
);
})(); })();