Skip to content

Commit

Permalink
Added option to disable ClickToFlash globally. Re: Ticket #94
Browse files Browse the repository at this point in the history 
Signed-off-by: Jonathan 'Wolf' Rentzsch <jwr.git@redshed.net>
  • Loading branch information
@rentzsch
Patrick authored and rentzsch committed Apr 7, 2009
1 parent b19cf32 commit b224861
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 15 deletions.
103 changes: 91 additions & 12 deletions Plugin/English.lproj/WhitelistPanel.xib
View file
@@ -1,20 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9G55</string>
<string key="IBDocument.InterfaceBuilderVersion">672</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.43</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2"/>
<integer value="42"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilderKit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1001">
Expand Down Expand Up @@ -279,7 +288,7 @@
<object class="NSButton" id="619486495">
<reference key="NSNextResponder" ref="235344690"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{93, 169}, {286, 18}}</string>
<string key="NSFrame">{{93, 149}, {286, 18}}</string>
<reference key="NSSuperview" ref="235344690"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="356052318">
Expand Down Expand Up @@ -310,7 +319,7 @@
<object class="NSButton" id="90714319">
<reference key="NSNextResponder" ref="235344690"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{93, 149}, {286, 18}}</string>
<string key="NSFrame">{{93, 129}, {286, 18}}</string>
<reference key="NSSuperview" ref="235344690"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="688316371">
Expand Down Expand Up @@ -348,7 +357,7 @@
<object class="NSMatrix" id="211748724">
<reference key="NSNextResponder" ref="235344690"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{93, 74}, {285, 58}}</string>
<string key="NSFrame">{{93, 58}, {285, 58}}</string>
<reference key="NSSuperview" ref="235344690"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">3</int>
Expand Down Expand Up @@ -619,7 +628,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="1020124743">
<reference key="NSNextResponder" ref="235344690"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 115}, {67, 17}}</string>
<string key="NSFrame">{{17, 99}, {67, 17}}</string>
<reference key="NSSuperview" ref="235344690"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="393278813">
Expand All @@ -635,7 +644,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="800069556">
<reference key="NSNextResponder" ref="235344690"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 44}, {67, 17}}</string>
<string key="NSFrame">{{17, 28}, {67, 17}}</string>
<reference key="NSSuperview" ref="235344690"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="345893571">
Expand All @@ -651,7 +660,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="124868638">
<reference key="NSNextResponder" ref="235344690"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{93, 43}, {287, 18}}</string>
<string key="NSFrame">{{93, 27}, {287, 18}}</string>
<reference key="NSSuperview" ref="235344690"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="548281549">
Expand All @@ -673,7 +682,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="912083957">
<reference key="NSNextResponder" ref="235344690"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{117, 13}, {86, 28}}</string>
<string key="NSFrame">{{117, -3}, {86, 28}}</string>
<reference key="NSSuperview" ref="235344690"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="613643996">
Expand All @@ -690,6 +699,28 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="596693856">
<reference key="NSNextResponder" ref="235344690"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{93, 169}, {286, 18}}</string>
<reference key="NSSuperview" ref="235344690"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="410759951">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Enable ClickToFlash</string>
<reference key="NSSupport" ref="906693409"/>
<reference key="NSControlView" ref="596693856"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">130</int>
<reference key="NSNormalImage" ref="1064838318"/>
<reference key="NSAlternateImage" ref="664243181"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<string key="NSFrame">{{65, 224}, {397, 207}}</string>
<reference key="NSSuperview" ref="1006"/>
Expand All @@ -705,6 +736,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSFrameAutosaveName">ClickToFlash_settingsWindow</string>
</object>
<object class="NSUserDefaultsController" id="913882380">
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>ClickToFlash_pluginEnabled</string>
</object>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSArrayController" id="258102979">
Expand Down Expand Up @@ -895,6 +930,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">148</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: values.ClickToFlash_pluginEnabled</string>
<reference key="source" ref="596693856"/>
<reference key="destination" ref="913882380"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="596693856"/>
<reference key="NSDestination" ref="913882380"/>
<string key="NSLabel">value: values.ClickToFlash_pluginEnabled</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">values.ClickToFlash_pluginEnabled</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">155</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
Expand Down Expand Up @@ -1063,6 +1114,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="800069556"/>
<reference ref="912083957"/>
<reference ref="124868638"/>
<reference ref="596693856"/>
</object>
<reference key="parent" ref="1006"/>
</object>
Expand Down Expand Up @@ -1196,6 +1248,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="613643996"/>
<reference key="parent" ref="912083957"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">149</int>
<reference key="object" ref="596693856"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="410759951"/>
</object>
<reference key="parent" ref="235344690"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">150</int>
<reference key="object" ref="410759951"/>
<reference key="parent" ref="596693856"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
Expand Down Expand Up @@ -1240,6 +1306,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>143.IBAttributePlaceholdersKey</string>
<string>143.IBPluginDependency</string>
<string>144.IBPluginDependency</string>
<string>149.IBAttributePlaceholdersKey</string>
<string>149.IBPluginDependency</string>
<string>150.IBPluginDependency</string>
<string>17.IBPluginDependency</string>
<string>2.IBPluginDependency</string>
<string>20.IBPluginDependency</string>
Expand All @@ -1261,7 +1330,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilderKit</string>
<string>{{65, 235}, {527, 427}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="0"/>
<reference ref="8"/>
<string>{{65, 235}, {527, 427}}</string>
<reference ref="5"/>
<string>{196, 240}</string>
Expand Down Expand Up @@ -1329,6 +1398,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string>
<reference key="object" ref="596693856"/>
<string key="toolTip">Automatically load Flash views that are smaller than 8x8 pixels.</string>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -1371,7 +1450,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">148</int>
<int key="maxID">155</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Expand Down
17 changes: 14 additions & 3 deletions Plugin/Plugin.m
View file
Expand Up @@ -42,7 +42,7 @@ of this software and associated documentation files (the "Software"), to deal
// NSUserDefaults keys
static NSString *sUseYouTubeH264DefaultsKey = @"ClickToFlash_useYouTubeH264";
static NSString *sAutoLoadInvisibleFlashViewsKey = @"ClickToFlash_autoLoadInvisibleViews";

static NSString *sPluginEnabled = @"ClickToFlash_pluginEnabled";

@interface CTFClickToFlashPlugin (Internal)
- (void) _convertTypesForFlashContainer;
Expand Down Expand Up @@ -93,7 +93,11 @@ - (id) initWithArguments:(NSDictionary *)arguments
// Default to auto-loading invisible flash views.
[[NSUserDefaults standardUserDefaults] setBool:YES forKey:sAutoLoadInvisibleFlashViewsKey];
}

if (![[NSUserDefaults standardUserDefaults] objectForKey:sPluginEnabled]) {
// Default to enable the plugin
[[NSUserDefaults standardUserDefaults] setBool:YES forKey:sPluginEnabled];
}

self.webView = [[[arguments objectForKey:WebPlugInContainerKey] webFrame] webView];

self.container = [arguments objectForKey:WebPlugInContainingElementKey];
Expand All @@ -119,6 +123,12 @@ - (id) initWithArguments:(NSDictionary *)arguments
NSLog( @"arguments = %@", arguments );
NSLog( @"flashvars = %@", _flashVars );
#endif
if ( ![ [ NSUserDefaults standardUserDefaults ] boolForKey: sPluginEnabled ] ) {
// plugin is disabled, load all content as normal
_isLoadingFromWhitelist = YES;
[self _convertTypesForContainer];
return self;
}

_fromYouTube = [self.host isEqualToString:@"www.youtube.com"]
|| ( flashvars != nil && [flashvars rangeOfString: @"www.youtube.com"].location != NSNotFound );
Expand Down Expand Up @@ -657,7 +667,8 @@ - (BOOL) _hasH264Version
- (BOOL) _useH264Version
{
return [ self _hasH264Version ]
&& [ [ NSUserDefaults standardUserDefaults ] boolForKey: sUseYouTubeH264DefaultsKey ];
&& [ [ NSUserDefaults standardUserDefaults ] boolForKey: sUseYouTubeH264DefaultsKey ]
&& [ [ NSUserDefaults standardUserDefaults ] boolForKey: sPluginEnabled ];
}

- (void) _convertElementForMP4: (DOMElement*) element
Expand Down

0 comments on commit b224861

Please sign in to comment.