You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/03/07 06:57:07 UTC
mac commit: Removed resize restriction (so app can go full-screen)
Updated Branches:
refs/heads/master 5bfb9c0ce -> 7b2fb3de2
Removed resize restriction (so app can go full-screen)
Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/7b2fb3de
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/7b2fb3de
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/7b2fb3de
Branch: refs/heads/master
Commit: 7b2fb3de2085b2a62f7cfbf8039550ec7bc081c2
Parents: 5bfb9c0
Author: Shazron Abdullah <sh...@apache.org>
Authored: Wed Mar 6 21:56:58 2013 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Wed Mar 6 21:56:58 2013 -0800
----------------------------------------------------------------------
CordovaMac/CordovaLib/CDVViewController.m | 7 -
CordovaMac/CordovaLib/Commands/CDVPlugin.h | 6 -
CordovaMac/CordovaLib/Commands/CDVPlugin.m | 21 +--
CordovaMac/CordovaLib/Utils/CDVUtils.h | 32 ---
CordovaMac/CordovaLib/Utils/CDVUtils.m | 47 ----
.../Utils/NSMutableArray+QueueAdditions.h | 29 --
.../Utils/NSMutableArray+QueueAdditions.m | 58 ----
CordovaMac/CordovaLib/Utils/NSWindow+Utils.h | 27 ++
CordovaMac/CordovaLib/Utils/NSWindow+Utils.m | 34 +++
CordovaMac/CordovaMac.xcodeproj/project.pbxproj | 34 +--
CordovaMac/CordovaMac/Classes/AppDelegate.m | 6 -
CordovaMac/CordovaMac/Classes/Constants.h | 22 --
CordovaMac/CordovaMac/CordovaMac-Prefix.pch | 1 -
.../Resources/en.lproj/MainViewController.xib | 202 +++++++--------
CordovaMac/www/js/index.js | 3 -
15 files changed, 163 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaLib/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaLib/CDVViewController.m b/CordovaMac/CordovaLib/CDVViewController.m
index 12a6368..5324871 100644
--- a/CordovaMac/CordovaLib/CDVViewController.m
+++ b/CordovaMac/CordovaLib/CDVViewController.m
@@ -18,7 +18,6 @@
*/
#import "CDVViewController.h"
-#import "CDVUtils.h"
#import "CDVConfigParser.h"
#import "CDVCommandDelegateImpl.h"
@@ -188,12 +187,6 @@
- (void) windowResized:(NSNotification*)notification;
{
- NSWindow* window = (NSWindow*)notification.object;
- NSSize size = [window frame].size;
-
- //DebugNSLog(@"window width = %f, window height = %f", size.width, size.height);
- [self.webView setFrame:NSMakeRect(0, 0, size.width, size.height - [CDVUtils titleBarHeight:window])];
- [self.webView stringByEvaluatingJavaScriptFromString:@"var e = document.createEvent('Events'); e.initEvent('orientationchange', true, false); document.dispatchEvent(e); "];
}
@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaLib/Commands/CDVPlugin.h
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaLib/Commands/CDVPlugin.h b/CordovaMac/CordovaLib/Commands/CDVPlugin.h
index 6e0754a..f9debe5 100644
--- a/CordovaMac/CordovaLib/Commands/CDVPlugin.h
+++ b/CordovaMac/CordovaLib/Commands/CDVPlugin.h
@@ -20,7 +20,6 @@
#import <Foundation/Foundation.h>
#import <WebKit/WebKit.h>
#import "CDVPluginResult.h"
-#import "NSMutableArray+QueueAdditions.h"
#import "CDVCommandDelegate.h"
#import "CDVViewController.h"
@@ -57,9 +56,4 @@ NSString* const CDVLocalNotification;
- (id)appDelegate;
-// TODO(agrieve): Deprecate these in favour of using CDVCommandDelegate directly.
-- (NSString*)writeJavascript:(NSString*)javascript;
-- (NSString*)success:(CDVPluginResult*)pluginResult callbackId:(NSString*)callbackId;
-- (NSString*)error:(CDVPluginResult*)pluginResult callbackId:(NSString*)callbackId;
-
@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaLib/Commands/CDVPlugin.m
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaLib/Commands/CDVPlugin.m b/CordovaMac/CordovaLib/Commands/CDVPlugin.m
index 6301fac..a7d98ed 100644
--- a/CordovaMac/CordovaLib/Commands/CDVPlugin.m
+++ b/CordovaMac/CordovaLib/Commands/CDVPlugin.m
@@ -117,26 +117,7 @@ NSString* const CDVLocalNotification = @"CDVLocalNotification";
- (id)appDelegate
{
- // TODO:
- //return [[UIApplication sharedApplication] delegate];
- return nil;
-}
-
-- (NSString*)writeJavascript:(NSString*)javascript
-{
- return [self.webView stringByEvaluatingJavaScriptFromString:javascript];
-}
-
-- (NSString*)success:(CDVPluginResult*)pluginResult callbackId:(NSString*)callbackId
-{
- [self.commandDelegate evalJs:[pluginResult toSuccessCallbackString:callbackId]];
- return @"";
-}
-
-- (NSString*)error:(CDVPluginResult*)pluginResult callbackId:(NSString*)callbackId
-{
- [self.commandDelegate evalJs:[pluginResult toErrorCallbackString:callbackId]];
- return @"";
+ return [[NSApplication sharedApplication] delegate];
}
// default implementation does nothing, ideally, we are not registered for notification if we aren't going to do anything.
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaLib/Utils/CDVUtils.h
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaLib/Utils/CDVUtils.h b/CordovaMac/CordovaLib/Utils/CDVUtils.h
deleted file mode 100644
index c38869f..0000000
--- a/CordovaMac/CordovaLib/Utils/CDVUtils.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-#define DEG_EPS 0.001
-#define fequal(a,b) (fabs((a) - (b)) < DEG_EPS)
-#define fequalzero(a) (fabs(a) < DEG_EPS)
-
-@interface CDVUtils : NSObject {
-}
-
-+ (float) titleBarHeight:(NSWindow*)aWindow;
-+ (NSString*) pathForResource:(NSString*)resourcepath;
-
-@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaLib/Utils/CDVUtils.m
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaLib/Utils/CDVUtils.m b/CordovaMac/CordovaLib/Utils/CDVUtils.m
deleted file mode 100644
index 77c9dfc..0000000
--- a/CordovaMac/CordovaLib/Utils/CDVUtils.m
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-#import "CDVUtils.h"
-#import "Constants.h"
-
-@implementation CDVUtils
-
-+ (float) titleBarHeight:(NSWindow*)aWindow
-{
- NSRect frame = [aWindow frame];
- NSRect contentRect = [NSWindow contentRectForFrameRect: frame
- styleMask: NSTitledWindowMask];
-
- return (frame.size.height - contentRect.size.height);
-}
-
-+ (NSString*) pathForResource:(NSString*)resourcepath
-{
- NSBundle * mainBundle = [NSBundle mainBundle];
- NSMutableArray *directoryParts = [NSMutableArray arrayWithArray:[resourcepath componentsSeparatedByString:@"/"]];
- NSString *filename = [directoryParts lastObject];
- [directoryParts removeLastObject];
-
- NSString *directoryStr = [NSString stringWithFormat:@"%@/%@", kCDVStartFolder, [directoryParts componentsJoinedByString:@"/"]];
- return [mainBundle pathForResource:filename
- ofType:@""
- inDirectory:directoryStr];
-}
-
-@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaLib/Utils/NSMutableArray+QueueAdditions.h
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaLib/Utils/NSMutableArray+QueueAdditions.h b/CordovaMac/CordovaLib/Utils/NSMutableArray+QueueAdditions.h
deleted file mode 100644
index 3194094..0000000
--- a/CordovaMac/CordovaLib/Utils/NSMutableArray+QueueAdditions.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface NSMutableArray (QueueAdditions)
-
-- (id)pop;
-- (id)queueHead;
-- (id)dequeue;
-- (void)enqueue:(id)obj;
-
-@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaLib/Utils/NSMutableArray+QueueAdditions.m
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaLib/Utils/NSMutableArray+QueueAdditions.m b/CordovaMac/CordovaLib/Utils/NSMutableArray+QueueAdditions.m
deleted file mode 100644
index 9e67ede..0000000
--- a/CordovaMac/CordovaLib/Utils/NSMutableArray+QueueAdditions.m
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-#import "NSMutableArray+QueueAdditions.h"
-
-@implementation NSMutableArray (QueueAdditions)
-
-- (id)queueHead
-{
- if ([self count] == 0) {
- return nil;
- }
-
- return [self objectAtIndex:0];
-}
-
-- (__autoreleasing id)dequeue
-{
- if ([self count] == 0) {
- return nil;
- }
-
- id head = [self objectAtIndex:0];
- if (head != nil) {
- // [[head retain] autorelease]; ARC - the __autoreleasing on the return value should so the same thing
- [self removeObjectAtIndex:0];
- }
-
- return head;
-}
-
-- (id)pop
-{
- return [self dequeue];
-}
-
-- (void)enqueue:(id)object
-{
- [self addObject:object];
-}
-
-@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaLib/Utils/NSWindow+Utils.h
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaLib/Utils/NSWindow+Utils.h b/CordovaMac/CordovaLib/Utils/NSWindow+Utils.h
new file mode 100644
index 0000000..03e4253
--- /dev/null
+++ b/CordovaMac/CordovaLib/Utils/NSWindow+Utils.h
@@ -0,0 +1,27 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+
+#import <Cocoa/Cocoa.h>
+
+@interface NSWindow (Utils)
+
+- (float) titleBarHeight;
+
+@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaLib/Utils/NSWindow+Utils.m
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaLib/Utils/NSWindow+Utils.m b/CordovaMac/CordovaLib/Utils/NSWindow+Utils.m
new file mode 100644
index 0000000..a4b5f8c
--- /dev/null
+++ b/CordovaMac/CordovaLib/Utils/NSWindow+Utils.m
@@ -0,0 +1,34 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+
+#import "NSWindow+Utils.h"
+
+@implementation NSWindow (Utils)
+
+- (float) titleBarHeight
+{
+ NSRect frame = [self frame];
+ NSRect contentRect = [NSWindow contentRectForFrameRect: frame
+ styleMask: NSTitledWindowMask];
+
+ return (frame.size.height - contentRect.size.height);
+}
+
+@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaMac.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaMac.xcodeproj/project.pbxproj b/CordovaMac/CordovaMac.xcodeproj/project.pbxproj
index a5a0388..909bd45 100644
--- a/CordovaMac/CordovaMac.xcodeproj/project.pbxproj
+++ b/CordovaMac/CordovaMac.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 308726E716E861F00020AF48 /* NSWindow+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 308726E616E861F00020AF48 /* NSWindow+Utils.m */; };
48B43519152E5E3500906A36 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48B43518152E5E3500906A36 /* Cocoa.framework */; };
48B43525152E5E3500906A36 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 48B43524152E5E3500906A36 /* main.m */; };
48B43536152E5E4100906A36 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48B43535152E5E4100906A36 /* WebKit.framework */; };
@@ -32,13 +33,13 @@
7E608F7F16E7F0320018F512 /* CDVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E608F7E16E7F0320018F512 /* CDVViewController.m */; };
7E608F8216E7F0880018F512 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E608F8116E7F0880018F512 /* MainViewController.m */; };
7E608F8716E7F9D80018F512 /* CDVWebViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E608F8616E7F9D80018F512 /* CDVWebViewDelegate.m */; };
- 7E608F8F16E7FC990018F512 /* CDVUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E608F8A16E7FC990018F512 /* CDVUtils.m */; };
7E608F9016E7FC990018F512 /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E608F8C16E7FC990018F512 /* NSData+Base64.m */; };
- 7E608F9116E7FC990018F512 /* NSMutableArray+QueueAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E608F8E16E7FC990018F512 /* NSMutableArray+QueueAdditions.m */; };
7E79276A16E7C900002E20B9 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E79276916E7C8FF002E20B9 /* SystemConfiguration.framework */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 308726E516E861F00020AF48 /* NSWindow+Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSWindow+Utils.h"; sourceTree = "<group>"; };
+ 308726E616E861F00020AF48 /* NSWindow+Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSWindow+Utils.m"; sourceTree = "<group>"; };
48B43514152E5E3500906A36 /* CordovaMac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CordovaMac.app; sourceTree = BUILT_PRODUCTS_DIR; };
48B43518152E5E3500906A36 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
48B4351B152E5E3500906A36 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -51,7 +52,6 @@
7E608F2A16E7D9B00018F512 /* config.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = config.xml; path = CordovaMac/config.xml; sourceTree = "<group>"; };
7E608F3316E7EE8D0018F512 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
7E608F3416E7EE8D0018F512 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
- 7E608F3516E7EE8D0018F512 /* Constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
7E608F4116E7EE970018F512 /* Cordova.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Cordova.icns; sourceTree = "<group>"; };
7E608F4316E7EE970018F512 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = "<group>"; };
7E608F4516E7EE970018F512 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -91,12 +91,8 @@
7E608F8316E7F6940018F512 /* CordovaMac-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "CordovaMac-Info.plist"; path = "CordovaMac/CordovaMac-Info.plist"; sourceTree = SOURCE_ROOT; };
7E608F8516E7F9D80018F512 /* CDVWebViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVWebViewDelegate.h; sourceTree = "<group>"; };
7E608F8616E7F9D80018F512 /* CDVWebViewDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVWebViewDelegate.m; sourceTree = "<group>"; };
- 7E608F8916E7FC990018F512 /* CDVUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVUtils.h; sourceTree = "<group>"; };
- 7E608F8A16E7FC990018F512 /* CDVUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVUtils.m; sourceTree = "<group>"; };
7E608F8B16E7FC990018F512 /* NSData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Base64.h"; sourceTree = "<group>"; };
7E608F8C16E7FC990018F512 /* NSData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Base64.m"; sourceTree = "<group>"; };
- 7E608F8D16E7FC990018F512 /* NSMutableArray+QueueAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+QueueAdditions.h"; sourceTree = "<group>"; };
- 7E608F8E16E7FC990018F512 /* NSMutableArray+QueueAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+QueueAdditions.m"; sourceTree = "<group>"; };
7E79276916E7C8FF002E20B9 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
@@ -139,24 +135,16 @@
48B43517152E5E3500906A36 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 48B4351B152E5E3500906A36 /* AppKit.framework */,
+ 48B4351C152E5E3500906A36 /* CoreData.framework */,
+ 48B4351D152E5E3500906A36 /* Foundation.framework */,
7E79276916E7C8FF002E20B9 /* SystemConfiguration.framework */,
48B43535152E5E4100906A36 /* WebKit.framework */,
48B43518152E5E3500906A36 /* Cocoa.framework */,
- 48B4351A152E5E3500906A36 /* Other Frameworks */,
);
name = Frameworks;
sourceTree = "<group>";
};
- 48B4351A152E5E3500906A36 /* Other Frameworks */ = {
- isa = PBXGroup;
- children = (
- 48B4351B152E5E3500906A36 /* AppKit.framework */,
- 48B4351C152E5E3500906A36 /* CoreData.framework */,
- 48B4351D152E5E3500906A36 /* Foundation.framework */,
- );
- name = "Other Frameworks";
- sourceTree = "<group>";
- };
7E608F2E16E7EC900018F512 /* Other Sources */ = {
isa = PBXGroup;
children = (
@@ -172,7 +160,6 @@
7E608F4616E7EE970018F512 /* MainViewController.xib */,
7E608F3316E7EE8D0018F512 /* AppDelegate.h */,
7E608F3416E7EE8D0018F512 /* AppDelegate.m */,
- 7E608F3516E7EE8D0018F512 /* Constants.h */,
7E608F8016E7F0880018F512 /* MainViewController.h */,
7E608F8116E7F0880018F512 /* MainViewController.m */,
);
@@ -243,12 +230,10 @@
7E608F8816E7FC990018F512 /* Utils */ = {
isa = PBXGroup;
children = (
- 7E608F8916E7FC990018F512 /* CDVUtils.h */,
- 7E608F8A16E7FC990018F512 /* CDVUtils.m */,
7E608F8B16E7FC990018F512 /* NSData+Base64.h */,
7E608F8C16E7FC990018F512 /* NSData+Base64.m */,
- 7E608F8D16E7FC990018F512 /* NSMutableArray+QueueAdditions.h */,
- 7E608F8E16E7FC990018F512 /* NSMutableArray+QueueAdditions.m */,
+ 308726E516E861F00020AF48 /* NSWindow+Utils.h */,
+ 308726E616E861F00020AF48 /* NSWindow+Utils.m */,
);
path = Utils;
sourceTree = "<group>";
@@ -338,9 +323,8 @@
7E608F7F16E7F0320018F512 /* CDVViewController.m in Sources */,
7E608F8216E7F0880018F512 /* MainViewController.m in Sources */,
7E608F8716E7F9D80018F512 /* CDVWebViewDelegate.m in Sources */,
- 7E608F8F16E7FC990018F512 /* CDVUtils.m in Sources */,
7E608F9016E7FC990018F512 /* NSData+Base64.m in Sources */,
- 7E608F9116E7FC990018F512 /* NSMutableArray+QueueAdditions.m in Sources */,
+ 308726E716E861F00020AF48 /* NSWindow+Utils.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaMac/Classes/AppDelegate.m
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaMac/Classes/AppDelegate.m b/CordovaMac/CordovaMac/Classes/AppDelegate.m
index 66a762e..9a463e0 100644
--- a/CordovaMac/CordovaMac/Classes/AppDelegate.m
+++ b/CordovaMac/CordovaMac/Classes/AppDelegate.m
@@ -18,9 +18,7 @@
*/
#import "AppDelegate.h"
-#import "Constants.h"
#import "MainViewController.h"
-#import "CDVUtils.h"
@implementation AppDelegate
@@ -43,10 +41,6 @@
- (void) applicationDidFinishLaunching:(NSNotification*)aNotification
{
- [[NSNotificationCenter defaultCenter] addObserver:self.viewController
- selector:@selector(windowResized:)
- name:NSWindowDidResizeNotification
- object:[self window]];
}
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaMac/Classes/Constants.h
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaMac/Classes/Constants.h b/CordovaMac/CordovaMac/Classes/Constants.h
deleted file mode 100644
index 5b7fc2b..0000000
--- a/CordovaMac/CordovaMac/Classes/Constants.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-#define kCDVStartPage @"index.html"
-#define kCDVStartFolder @"www"
-
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaMac/CordovaMac-Prefix.pch
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaMac/CordovaMac-Prefix.pch b/CordovaMac/CordovaMac/CordovaMac-Prefix.pch
index c4c1d52..03d1fa2 100644
--- a/CordovaMac/CordovaMac/CordovaMac-Prefix.pch
+++ b/CordovaMac/CordovaMac/CordovaMac-Prefix.pch
@@ -21,6 +21,5 @@
#import <Cocoa/Cocoa.h>
-#import "Constants.h"
#endif
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/CordovaMac/Resources/en.lproj/MainViewController.xib
----------------------------------------------------------------------
diff --git a/CordovaMac/CordovaMac/Resources/en.lproj/MainViewController.xib b/CordovaMac/CordovaMac/Resources/en.lproj/MainViewController.xib
index 5d6e5e5..ea1e2ff 100644
--- a/CordovaMac/CordovaMac/Resources/en.lproj/MainViewController.xib
+++ b/CordovaMac/CordovaMac/Resources/en.lproj/MainViewController.xib
@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1070</int>
- <string key="IBDocument.SystemVersion">12C3012</string>
+ <string key="IBDocument.SystemVersion">12C60</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
@@ -1301,7 +1301,6 @@
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
- <string key="NSWindowContentMaxSize">{1024, 768}</string>
<string key="NSWindowContentMinSize">{640, 480}</string>
<object class="NSView" key="NSWindowView" id="439893737">
<reference key="NSNextResponder"/>
@@ -1329,6 +1328,7 @@
</set>
<string key="NSFrameSize">{640, 480}</string>
<reference key="NSSuperview" ref="439893737"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSHuggingPriority">{1, 1}</string>
<string key="NSAntiCompressionPriority">{1, 1}</string>
@@ -1350,13 +1350,14 @@
</array>
<string key="NSFrameSize">{640, 480}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="286545035"/>
<string key="NSHuggingPriority">{1000, 1000}</string>
<string key="NSAntiCompressionPriority">{1, 1}</string>
</object>
- <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMinSize">{640, 502}</string>
- <string key="NSMaxSize">{1024, 790}</string>
+ <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<int key="NSWindowCollectionBehavior">128</int>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -2652,38 +2653,6 @@
<int key="objectID">372</int>
<reference key="object" ref="439893737"/>
<array class="NSMutableArray" key="children">
- <object class="IBNSLayoutConstraint" id="580015066">
- <reference key="firstItem" ref="286545035"/>
- <int key="firstAttribute">3</int>
- <int key="relation">-1</int>
- <reference key="secondItem" ref="439893737"/>
- <int key="secondAttribute">3</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">1300</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="439893737"/>
- <int key="scoringType">9</int>
- <float key="scoringTypeFloat">40</float>
- <int key="contentType">3</int>
- </object>
- <object class="IBNSLayoutConstraint" id="524952465">
- <reference key="firstItem" ref="286545035"/>
- <int key="firstAttribute">5</int>
- <int key="relation">-1</int>
- <reference key="secondItem" ref="439893737"/>
- <int key="secondAttribute">5</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">800</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="439893737"/>
- <int key="scoringType">9</int>
- <float key="scoringTypeFloat">40</float>
- <int key="contentType">3</int>
- </object>
<object class="IBNSLayoutConstraint" id="459110769">
<reference key="firstItem" ref="286545035"/>
<int key="firstAttribute">6</int>
@@ -2696,8 +2665,8 @@
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="439893737"/>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
+ <int key="scoringType">9</int>
+ <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="1016678070">
@@ -2712,8 +2681,8 @@
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="439893737"/>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
+ <int key="scoringType">9</int>
+ <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="456072447">
@@ -2728,8 +2697,8 @@
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="439893737"/>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
+ <int key="scoringType">9</int>
+ <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="684866909">
@@ -2744,8 +2713,8 @@
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="439893737"/>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
+ <int key="scoringType">9</int>
+ <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<reference ref="286545035"/>
@@ -3234,40 +3203,7 @@
<object class="IBObjectRecord">
<int key="objectID">536</int>
<reference key="object" ref="286545035"/>
- <array class="NSMutableArray" key="children">
- <object class="IBNSLayoutConstraint" id="1053527946">
- <reference key="firstItem" ref="286545035"/>
- <int key="firstAttribute">7</int>
- <int key="relation">-1</int>
- <nil key="secondItem"/>
- <int key="secondAttribute">0</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">1300</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="286545035"/>
- <int key="scoringType">9</int>
- <float key="scoringTypeFloat">40</float>
- <int key="contentType">1</int>
- </object>
- <object class="IBNSLayoutConstraint" id="256099932">
- <reference key="firstItem" ref="286545035"/>
- <int key="firstAttribute">8</int>
- <int key="relation">-1</int>
- <nil key="secondItem"/>
- <int key="secondAttribute">0</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">800</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="286545035"/>
- <int key="scoringType">9</int>
- <float key="scoringTypeFloat">40</float>
- <int key="contentType">1</int>
- </object>
- </array>
+ <array class="NSMutableArray" key="children"/>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
@@ -3291,26 +3227,6 @@
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">688</int>
- <reference key="object" ref="524952465"/>
- <reference key="parent" ref="439893737"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">685</int>
- <reference key="object" ref="580015066"/>
- <reference key="parent" ref="439893737"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">704</int>
- <reference key="object" ref="256099932"/>
- <reference key="parent" ref="286545035"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">693</int>
- <reference key="object" ref="1053527946"/>
- <reference key="parent" ref="286545035"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">739</int>
<reference key="object" ref="898714931"/>
<reference key="parent" ref="0"/>
@@ -3384,9 +3300,7 @@
<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="371.IBWindowTemplateEditedContentRect">{{380, 496}, {480, 360}}</string>
<integer value="1" key="371.NSWindowTemplate.visibleAtLaunch"/>
- <array key="372.IBNSViewMetadataConstraints">
- <reference ref="580015066"/>
- <reference ref="524952465"/>
+ <array class="NSMutableArray" key="372.IBNSViewMetadataConstraints">
<reference ref="459110769"/>
<reference ref="1016678070"/>
<reference ref="456072447"/>
@@ -3469,10 +3383,6 @@
<string key="516.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="534.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <array key="536.IBNSViewMetadataConstraints">
- <reference ref="1053527946"/>
- <reference ref="256099932"/>
- </array>
<boolean value="NO" key="536.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="536.IBPluginDependency">com.apple.WebKitIBPlugin</string>
<real value="0.0" key="536.IBViewIntegration.shadowBlurRadius"/>
@@ -3485,10 +3395,6 @@
<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="685.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="688.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="693.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="704.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="719.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="725.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3513,7 +3419,83 @@
<nil key="sourceID"/>
<int key="maxID">751</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <array class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <object class="IBPartialClassDescription">
+ <string key="className">AppDelegate</string>
+ <string key="superclassName">NSObject</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="viewController">CDVViewController</string>
+ <string key="window">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="viewController">
+ <string key="name">viewController</string>
+ <string key="candidateClassName">CDVViewController</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window">
+ <string key="name">window</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AppDelegate.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">CDVViewController</string>
+ <string key="superclassName">NSWindowController</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="contentView">NSView</string>
+ <string key="webView">WebView</string>
+ <string key="webViewDelegate">CDVWebViewDelegate</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="contentView">
+ <string key="name">contentView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="webView">
+ <string key="name">webView</string>
+ <string key="candidateClassName">WebView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="webViewDelegate">
+ <string key="name">webViewDelegate</string>
+ <string key="candidateClassName">CDVWebViewDelegate</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/CDVViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">CDVWebViewDelegate</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/CDVWebViewDelegate.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">MainViewController</string>
+ <string key="superclassName">CDVViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/MainViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSLayoutConstraint</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+ </object>
+ </object>
+ </array>
+ </object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/7b2fb3de/CordovaMac/www/js/index.js
----------------------------------------------------------------------
diff --git a/CordovaMac/www/js/index.js b/CordovaMac/www/js/index.js
index 5b90364..31d9064 100644
--- a/CordovaMac/www/js/index.js
+++ b/CordovaMac/www/js/index.js
@@ -34,9 +34,6 @@ var app = {
// function, we must explicity call 'app.receivedEvent(...);'
onDeviceReady: function() {
app.receivedEvent('deviceready');
-
-// var exec = cordova.require('cordova/exec');
-// exec(null, null, 'Device', 'getDeviceInfo', [1, "two", { 'three': 3, 4: 'four'}]);
},
// Update DOM on a Received Event
receivedEvent: function(id) {