From 9ef9bf9f4244547bca953952f7a7eeff61801e8f Mon Sep 17 00:00:00 2001 From: Blair Duncan Date: Wed, 25 Apr 2012 17:07:13 -0400 Subject: [PATCH] CPFlashView a few minor fixes, includes Test file --- AppKit/CPFlashView.j | 28 +++-- Tests/Manual/CPFlashviewTest/AppController.j | 42 +++++++ Tests/Manual/CPFlashviewTest/Info.plist | 12 ++ Tests/Manual/CPFlashviewTest/Jakefile | 93 +++++++++++++++ .../CPFlashviewTest/Resources/spinner.gif | Bin 0 -> 1849 bytes Tests/Manual/CPFlashviewTest/index-debug.html | 107 ++++++++++++++++++ Tests/Manual/CPFlashviewTest/index.html | 78 +++++++++++++ Tests/Manual/CPFlashviewTest/main.j | 18 +++ 8 files changed, 367 insertions(+), 11 deletions(-) create mode 100644 Tests/Manual/CPFlashviewTest/AppController.j create mode 100644 Tests/Manual/CPFlashviewTest/Info.plist create mode 100644 Tests/Manual/CPFlashviewTest/Jakefile create mode 100644 Tests/Manual/CPFlashviewTest/Resources/spinner.gif create mode 100644 Tests/Manual/CPFlashviewTest/index-debug.html create mode 100644 Tests/Manual/CPFlashviewTest/index.html create mode 100644 Tests/Manual/CPFlashviewTest/main.j diff --git a/AppKit/CPFlashView.j b/AppKit/CPFlashView.j index 841b5fc8c..c9505b8e9 100644 --- a/AppKit/CPFlashView.j +++ b/AppKit/CPFlashView.j @@ -38,7 +38,6 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"; #if PLATFORM(DOM) DOMElement _DOMParamElement; DOMElement _DOMObjectElement; - DOMElement _DOMInnerObjectElement; #endif } @@ -52,22 +51,16 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"; if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine)) { _DOMObjectElement = document.createElement(@"object"); + _DOMObjectElement.id = [self elementID]; _DOMObjectElement.width = @"100%"; _DOMObjectElement.height = @"100%"; _DOMObjectElement.style.top = @"0px"; _DOMObjectElement.style.left = @"0px"; _DOMObjectElement.type = @"application/x-shockwave-flash"; - _DOMObjectElement.setAttribute(@"classid", IEFlashCLSID); - _DOMParamElement = document.createElement(@"param"); _DOMParamElement.name = @"movie"; - _DOMInnerObjectElement = document.createElement(@"object"); - _DOMInnerObjectElement.width = @"100%"; - _DOMInnerObjectElement.height = @"100%"; - _DOMObjectElement.appendChild(_DOMParamElement); - _DOMObjectElement.appendChild(_DOMInnerObjectElement); _DOMElement.appendChild(_DOMObjectElement); } @@ -89,7 +82,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"; if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine)) { _DOMParamElement.value = [aFlashMovie filename]; - _DOMInnerObjectElement.data = [aFlashMovie filename]; + _DOMObjectElement.data = [aFlashMovie filename]; } else [self _rebuildIEObjects]; @@ -107,7 +100,10 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"; enumerator = [aDictionary keyEnumerator], key; - while ((key = [enumerator nextObject]) !== nil) + if (key = [enumerator nextObject]) + varString = [varString stringByAppendingFormat:@"%@=%@", key, [aDictionary objectForKey:key]]; + + while (key = [enumerator nextObject]) varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]]; if (!_params) @@ -184,10 +180,20 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"; _DOMObjectElement = document.createElement(@"object"); _DOMElement.appendChild(_DOMObjectElement); - _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"%@", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString]; + _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"%@", [self elementID], IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString]; } #endif +- (CPString)elementID +{ + return @"CPFV_" + [self UID]; +} + +- (void)mouseMoved:(id)sommit +{ + [[[self window] platformWindow] _propagateCurrentDOMEvent:YES]; +} + - (void)mouseDragged:(CPEvent)anEvent { [[[self window] platformWindow] _propagateCurrentDOMEvent:YES]; diff --git a/Tests/Manual/CPFlashviewTest/AppController.j b/Tests/Manual/CPFlashviewTest/AppController.j new file mode 100644 index 000000000..28000bc5d --- /dev/null +++ b/Tests/Manual/CPFlashviewTest/AppController.j @@ -0,0 +1,42 @@ +/* + * AppController.j + * CPFlashviewTest + * + * Created by Blair Duncan on April 23, 2012. + * Copyright 2012, SGL Studio, BBDO Toronto All rights reserved. + */ + +@import + + +@implementation AppController : CPObject +{ +} + +- (void)applicationDidFinishLaunching:(CPNotification)aNotification +{ + var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask], + contentView = [theWindow contentView], + flashView; + + flashView = [[CPFlashView alloc] initWithFrame:CGRectMake(0,0,320,240)], + [flashView setFlashMovie:[CPFlashMovie flashMovieWithFile:@"http://flashjournalism.com/examples/airplane.swf"]]; + + // note: + // if both flashParams and flashVars are used flashParams must be setup first + + var flashParameters = [CPDictionary dictionary]; + [flashVars setObject:@"SampleParam" forKey:"SampleParamKey"]; + [flashView setParameters:flashParameters]; + + var flashVars = [CPDictionary dictionary]; + [flashVars setObject:@"SampleVar" forKey:"SampleVarKey"]; + [flashView setFlashVars:flashVars]; + + + [flashView setCenter:[contentView center]]; + [contentView addSubview:flashView]; + [theWindow orderFront:self]; +} + +@end diff --git a/Tests/Manual/CPFlashviewTest/Info.plist b/Tests/Manual/CPFlashviewTest/Info.plist new file mode 100644 index 000000000..8dbe56ff0 --- /dev/null +++ b/Tests/Manual/CPFlashviewTest/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + CPFlashviewTest + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/CPFlashviewTest/Jakefile b/Tests/Manual/CPFlashviewTest/Jakefile new file mode 100644 index 000000000..540a707ab --- /dev/null +++ b/Tests/Manual/CPFlashviewTest/Jakefile @@ -0,0 +1,93 @@ +/* + * Jakefile + * CPFlashviewTest + * + * Created by Blair Duncan on April 23, 2012. + * Copyright 2012, SGL Studio, BBDO Toronto All rights reserved. + */ + +var ENV = require("system").env, + FILE = require("file"), + JAKE = require("jake"), + task = JAKE.task, + FileList = JAKE.FileList, + app = require("cappuccino/jake").app, + configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug", + OS = require("os"); + +app ("CPFlashviewTest", function(task) +{ + task.setBuildIntermediatesPath(FILE.join("Build", "CPFlashviewTest.build", configuration)); + task.setBuildPath(FILE.join("Build", configuration)); + + task.setProductName("CPFlashviewTest"); + task.setIdentifier("com.yourcompany.CPFlashviewTest"); + task.setVersion("1.0"); + task.setAuthor("SGL Studio, BBDO Toronto"); + task.setEmail("Blair.Duncan@BBDO.com"); + task.setSummary("CPFlashviewTest"); + task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**"))); + task.setResources(new FileList("Resources/**")); + task.setIndexFilePath("index.html"); + task.setInfoPlistPath("Info.plist"); + + if (configuration === "Debug") + task.setCompilerFlags("-DDEBUG -g"); + else + task.setCompilerFlags("-O"); +}); + +task ("default", ["CPFlashviewTest"], function() +{ + printResults(configuration); +}); + +task ("build", ["default"]); + +task ("debug", function() +{ + ENV["CONFIGURATION"] = "Debug"; + JAKE.subjake(["."], "build", ENV); +}); + +task ("release", function() +{ + ENV["CONFIGURATION"] = "Release"; + JAKE.subjake(["."], "build", ENV); +}); + +task ("run", ["debug"], function() +{ + OS.system(["open", FILE.join("Build", "Debug", "CPFlashviewTest", "index.html")]); +}); + +task ("run-release", ["release"], function() +{ + OS.system(["open", FILE.join("Build", "Release", "CPFlashviewTest", "index.html")]); +}); + +task ("deploy", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Deployment", "CPFlashviewTest")); + OS.system(["press", "-f", FILE.join("Build", "Release", "CPFlashviewTest"), FILE.join("Build", "Deployment", "CPFlashviewTest")]); + printResults("Deployment") +}); + +task ("desktop", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Desktop", "CPFlashviewTest")); + require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "CPFlashviewTest"), FILE.join("Build", "Desktop", "CPFlashviewTest", "CPFlashviewTest.app")); + printResults("Desktop") +}); + +task ("run-desktop", ["desktop"], function() +{ + OS.system([FILE.join("Build", "Desktop", "CPFlashviewTest", "CPFlashviewTest.app", "Contents", "MacOS", "NativeHost"), "-i"]); +}); + +function printResults(configuration) +{ + print("----------------------------"); + print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPFlashviewTest")); + print("----------------------------"); +} diff --git a/Tests/Manual/CPFlashviewTest/Resources/spinner.gif b/Tests/Manual/CPFlashviewTest/Resources/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..06dbc2bc21dddcf0e09b566d5b211aee89570f52 GIT binary patch literal 1849 zcma*odr(tX9tZHtz31lM+(&Y`A`Ou`NeG&R#DrIfV%?hng21vs6v>ooRQQFbk7E_K!V( z{?5!fpZWgIZ%*d6t%i*j24bL}AZUJm9)h6R*;%L4IWse3G#VWaN1#$zSSXcBhlYlH zJ|D}n{r&w2f+Qp)SS*&n?*G4}{}!h?td_mjU6Kad-rW*QwWYCUk7d^e+sjpZAn6kT z5rM;`{~_}-wm+L@%+E;JphLm}C3WzQAQD0wBoY|rOTQX{(@pp-WAA8Iw0HKl|15j) zhGh(SFWu#5zUCw^T!}C~eC}~?{xG-r7ugQC>taC+|L^xr&a%{#cgUOZXIM&v?)k^2 z1i5%0!U00wq)r4vlAwXBA_m5J5WNeuBm-XJQ5pG4GD%vc|K){+TJ{AkHqN@SJKczX zU}QRd9n*_bf^h94)6Ctv{CUfz_;qs#RDuQ$DR%y1&5G-a6rhf*4Y zl+UOD1*GE{GQ7vv;c-tTIMkz0ovO>9j%b5hpa@a*CBJ#W!0@ndSwF|%hMkdFtXiU) z`BEp+yhkt8ZY>tg&uyH@%^%K4jDrbA;et&vnnzZ3z22@e6<27z2Vk13kb7OtISyxv z(XoO-LNQCZe3lfzc%*pNqU<9T+p~teThOEB+~e&U0mC|zS{Q)dJZ)!^1f7L(zg*L> z*vSW%?dR~@@0(}x6-V^A`~ImD;)NaBUnP8;RH=bS2@pk`wp>>8r&jGjmGPy%1BW}v zoPo}ca$~bze@efc3kapuEVW1!%teOZT3j2Tw5=hjiAf02d}7dL0oFC%@=RXp5Ow#% z@a>+AM|YWt$n&e`>sB-32gBcuTi>R>*|8@lp`y6thc7ydyqDsuUn~YzZf|{-R@-3y zL#wx{Ii}xxL_csiW*LBn0-A$>zp4WOmkf6=ilrjlW?-l9+bCd7|i?*b5NTmy<<6NZ0T8$SN@mwdC2f z6jqK=N@bS@!=YSj%>h0}*4p+%0HbTIrE$w7UMT6+AZZ&DAo*qZAAi(OtNbIfl#Dw^ zJWeiCp~zi#&t6x}m9)O^eR4HiLV3QA<<0>HZ8%$^lrSE94Wb}=+MM^!b>n#5&-JQR zkr-CEu9C;_F*7DqDisulV6Pmg$nFL0TPn%~*m^-`Z3^BgU(sNpnx%nW(!eV9A&FvI zHL3X3lw8Wji^6=8KbQDE-e%b?svdFxxdh$8r97@7$ojeI`6AL8Ob6QC$qh&>ZWVDX1F{0vJnT%%mE;GveKWR%C} zM&4d;Jf3s9|HAA)yVUPo`Aq;0do#)uHSXi5*QF*)x@MVVHr+cN)uMZ__F|&Ta#p8d z53TOKtce!PJUuie8UWol-S(`c2nH?UGqJP{!4RR4u$LCfn)q-hj0^f=h(VYy)T6eN zhRO!ja-aDBTcgeyP(8Ua4IdiOog^*CQa?R(cP#9AgL9`j>EX-6Yf1lzX(!~``M1XC zNmM<4<6d~wWZ$Xrk0K}UteTrq@LBBk#MsjkK;pbuVhe)NI7(7Pf(l?lxC7=1Z7Pzl zMbS;nV4NI5_N{1$P)&XC)huOGQ+h^zpYUZfb*1n6>!`#*b3y52LGmi+<4sY5jyD#- zw&$d}DTguLAfnRtjrM*JfqtHqUu6rQoU=g%1E9xk%;)TDm^2<8n-0IhTsQFaek)MY}>PK4;nBk=ow4pF>vzkO& gna%Org-kgQCf=+BeMi^RbuY;YE~rTjend;_cdi8t>i_@% literal 0 HcmV?d00001 diff --git a/Tests/Manual/CPFlashviewTest/index-debug.html b/Tests/Manual/CPFlashviewTest/index-debug.html new file mode 100644 index 000000000..6f1e04102 --- /dev/null +++ b/Tests/Manual/CPFlashviewTest/index-debug.html @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + CPFlashviewTest + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/CPFlashviewTest/index.html b/Tests/Manual/CPFlashviewTest/index.html new file mode 100644 index 000000000..3e904ed0e --- /dev/null +++ b/Tests/Manual/CPFlashviewTest/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + CPFlashviewTest + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/CPFlashviewTest/main.j b/Tests/Manual/CPFlashviewTest/main.j new file mode 100644 index 000000000..f7f567228 --- /dev/null +++ b/Tests/Manual/CPFlashviewTest/main.j @@ -0,0 +1,18 @@ +/* + * AppController.j + * CPFlashviewTest + * + * Created by Blair Duncan on April 23, 2012. + * Copyright 2012, SGL Studio, BBDO Toronto All rights reserved. + */ + +@import +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +}