Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Untitled #4

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Untitled #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
43ef651
Fix for http://rentzsch.lighthouseapp.com/projects/24342/tickets/517-…
lapcat Feb 23, 2010
e4cc502
Don't read version from Flash Player Info.plist, because the version …
lapcat Feb 23, 2010
35a3e57
Merge branch 'rentzsch'
lapcat Mar 23, 2010
992697d
Merge branch 'rentzsch'
lapcat Mar 31, 2010
b856699
Ooops, merging with rentzsch/master didn't go so well, because my cha…
lapcat Mar 31, 2010
738eef6
Fix for ticket 615. Probably a bug in CFNetwork, but it doesn't like …
lapcat Apr 1, 2010
eb3c623
If a containing block element in small, then the ClickToFlash view wi…
lapcat Jun 11, 2010
9a8314a
Merge branch 'rentzsch'
lapcat Jul 4, 2010
4c460ed
Update Flash version to 10.1.82.76
lapcat Sep 13, 2010
f51ed59
Make sure that ClickToFlash view is on top, otherwise it can be cover…
lapcat Oct 19, 2010
c6e305d
Bump faked Flash version to r85.
lapcat Oct 19, 2010
4985bb4
Allow Xcode to add developmentRegion junk.
lapcat Nov 4, 2010
d07e837
Bump version for Flash Player 10.1.102.64
lapcat Nov 4, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ClickToFlash.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,14 @@
isa = PBXProject;
buildConfigurationList = 55EB70350E04A8410016593D /* Build configuration list for PBXProject "ClickToFlash" */;
compatibilityVersion = "Xcode 3.0";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
Japanese,
French,
German,
);
mainGroup = 55EB70300E04A8410016593D;
productRefGroup = 55EB70430E04A8640016593D /* Products */;
projectDirPath = "";
Expand Down
4 changes: 2 additions & 2 deletions Plugin/Info-Plugin.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<string>http://rentzsch.github.com/clicktoflash/release_notes/appcast.xml</string>
<!--<string>http://rentzsch.github.com/clicktoflash/release_notes/appcast_distantfuture.xml</string>-->
<key>WebPluginDescription</key>
<string>Shockwave Flash 10.0 r45</string>
<string>Shockwave Flash 10.1 r102</string>
<key>WebPluginMIMETypes</key>
<dict>
<key>application/x-shockwave-flash</key>
Expand All @@ -46,6 +46,6 @@
<key>WebPluginName</key>
<string>Shockwave Flash</string>
<key>CTFFlashVariableVersion</key>
<string>MAC 10,0,45,2</string>
<string>MAC 10,1,102,64</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Plugin/Plugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ - (id) initWithArguments:(NSDictionary *)arguments
// problems with opacity

NSMutableDictionary *originalOpacityDict = [NSMutableDictionary dictionary];
NSString *opacityResetString = @"; opacity: 1.000 !important; -moz-opacity: 1 !important; filter: alpha(opacity=1) !important;";
NSString *opacityResetString = @"; opacity: 1.000 !important; -moz-opacity: 1 !important; filter: alpha(opacity=1) !important; z-index: 1000 !important;";

NSString *originalWmode = [[self container] getAttribute:@"wmode"];
NSString *originalStyle = [[self container] getAttribute:@"style"];
Expand Down Expand Up @@ -1632,7 +1632,7 @@ - (void)_retrieveEmbeddedPlayerFlashVarsAndCheckForVariantsWithVideoId:(NSString
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

NSString *URLString = [NSString stringWithFormat:@"http://youtube.com/watch?v=%@",videoId];
NSString *URLString = [NSString stringWithFormat:@"http://www.youtube.com/watch?v=%@",videoId];
NSURL *YouTubePageURL = [NSURL URLWithString:URLString];
NSError *pageSourceError = nil;
NSString *pageSourceString = [NSString stringWithContentsOfURL:YouTubePageURL
Expand Down