← Back to branch summary

~rzr/firefox-extensions/flashblock.upstream

« back to all changes in this revision

Viewing changes to content/flashblock/flashblock.xml

  • Committer: rzr at gna
  • Date: 2009-07-03 00:04:41 UTC
  • Revision ID: rzr@gna.org-20090703000441-age1757v6atkd7f5
Update from upstream : cvs://:pserver:guest@mozdev.org:/cvs#20090627

Show diffs side-by-side

added added

removed removed

Lines of Context:
content/flashblock/flashblock.xml
142
142
 
143
143
        var fWidth = fStyle.getPropertyValue("width");
144
144
        var width = parseInt(flash.width || flash.style.width);
145
 
        if(flash.width.match("%$"))
 
145
        if (fWidth && parseInt(fWidth) > 32)
 
146
                width = fWidth;
 
147
        else if(flash.width.match("%$"))
146
148
                width = flash.width;
147
149
        else if (width)
148
150
                        width = Math.max(width,32) + "px";
149
 
        else if (fWidth)
150
 
                width = fWidth;
151
151
        else
152
152
                width = "32px"
153
153
        placeholder.style.width = width;
154
154
 
155
155
        var fHeight = fStyle.getPropertyValue("height");
156
156
        var height = parseInt(flash.height || flash.style.height);
157
 
        if(flash.height.match("%$"))
 
157
        if (fHeight && parseInt(fHeight) > 32)
 
158
                height = fHeight;
 
159
        else if(flash.height.match("%$"))
158
160
                height = flash.height;
159
161
        else if (height)
160
162
                height = Math.max(height,32) + "px";
161
 
        else if (fHeight)
162
 
                height = fHeight;
163
163
        else 
164
164
                height = "32px"
165
165
        placeholder.style.height = height;
442
442
 
443
443
        var fWidth = fStyle.getPropertyValue("width");
444
444
        var width = parseInt(flash.width || flash.style.width);
445
 
        if(flash.width.match("%$"))
 
445
        if (fWidth && parseInt(fWidth) > 32)
 
446
                width = fWidth;
 
447
        else if(flash.width.match("%$"))
446
448
                width = flash.width;
447
 
        else if (fWidth)
448
 
                width = fWidth;
449
449
        else if (width)
450
450
                        width = Math.max(width,32) + "px";
451
451
        else
454
454
 
455
455
        var fHeight = fStyle.getPropertyValue("height");
456
456
        var height = parseInt(flash.height || flash.style.height);
457
 
        if(flash.height.match("%$"))
 
457
        if (fHeight && parseInt(fHeight) > 32)
 
458
                height = fHeight;
 
459
        else if(flash.height.match("%$"))
458
460
                height = flash.height;
459
 
        else if (fHeight)
460
 
                height = fHeight;
461
461
        else if (height)
462
462
                height = Math.max(height,32) + "px";
463
463
        else