Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed a bug that removeObject shows empty selection if an object at i…
…ndex 0 was removed
- Loading branch information
Showing
8 changed files
with
413 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
Tests/Manual/ArrayControllerRemovingFirstTest/AppController.j
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
/* | ||
* AppController.j | ||
* ArrayControllerRemovingFirstTest | ||
* | ||
* Created by You on July 17, 2012. | ||
* Copyright 2012, Your Company All rights reserved. | ||
*/ | ||
|
||
@import <Foundation/CPObject.j> | ||
|
||
|
||
@implementation AppController : CPObject | ||
{ | ||
CPArrayController arrayController; | ||
} | ||
|
||
- (void)applicationDidFinishLaunching:(CPNotification)aNotification | ||
{ | ||
var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask], | ||
contentView = [theWindow contentView]; | ||
|
||
arrayController = [[CPArrayController alloc] init]; | ||
[arrayController addObserver:self forKeyPath:@"selectionIndex" options: nil context: nil]; | ||
var items = [CPMutableArray array]; | ||
[items addObject:[[Item alloc] initWithTitle:@"1st Item"]]; | ||
[items addObject:[[Item alloc] initWithTitle:@"2nd Item"]]; | ||
[items addObject:[[Item alloc] initWithTitle:@"3rd Item"]]; | ||
[items addObject:[[Item alloc] initWithTitle:@"4th Item"]]; | ||
[arrayController setContent:items]; | ||
|
||
var label = [CPTextField labelWithTitle:@"Press buttons to see [Remove First By Object] fails while [Remove First By Index] succeeds"]; | ||
[label setFrameOrigin:CGPointMake(20, 20)]; | ||
[contentView addSubview:label]; | ||
|
||
var field = [CPTextField textFieldWithStringValue:@"" placeholder:@"" width:100]; | ||
[field setFrameOrigin:CGPointMake(20, 50)]; | ||
[field bind:@"value" toObject:self withKeyPath:@"arrayController.selection.title" options:nil]; | ||
[contentView addSubview:field]; | ||
|
||
var button = [CPButton buttonWithTitle:@"Remove First By Object"]; | ||
[button setFrameOrigin:CGPointMake(150, 50)]; | ||
[button setTarget:self]; | ||
[button setAction:@selector(removeFirst:)]; | ||
[contentView addSubview:button]; | ||
|
||
var button2 = [CPButton buttonWithTitle:@"Remove First By Index"]; | ||
[button2 setFrameOrigin:CGPointMake(350, 50)]; | ||
[button2 setTarget:self]; | ||
[button2 setAction:@selector(removeFirstByIndex:)]; | ||
[contentView addSubview:button2]; | ||
|
||
[arrayController setSelectionIndex:0] | ||
|
||
[theWindow orderFront:self]; | ||
|
||
// Uncomment the following line to turn on the standard menu bar. | ||
//[CPMenu setMenuBarVisible:YES]; | ||
} | ||
|
||
- (void)removeFirst:(id)sender | ||
{ | ||
var selectedObjects = [arrayController selectedObjects]; | ||
[arrayController removeObject:[selectedObjects objectAtIndex:0]]; | ||
} | ||
|
||
- (void)removeFirstByIndex:(id)sender | ||
{ | ||
[arrayController removeObjectAtArrangedObjectIndex:0]; | ||
} | ||
|
||
- (void)observeValueForKeyPath:(CPString)keyPath ofObject:(id)object change:(CPDictionary)change context:(id)context | ||
{ | ||
var oldIndex = [change valueForKey:CPKeyValueChangeOldKey]; | ||
var newIndex = [change valueForKey:CPKeyValueChangeNewKey]; | ||
|
||
CPLog("TCDocument selectionIndexChanged from " + oldIndex + " to " + newIndex + ", contains " + [[arrayController arrangedObjects] count] + " objects"); | ||
} | ||
|
||
@end | ||
|
||
@implementation Item : CPObject | ||
{ | ||
CPString title; | ||
} | ||
|
||
- (id)initWithTitle:(CPString)aTitle | ||
{ | ||
self = [super init]; | ||
if (self) | ||
{ | ||
title = aTitle; | ||
} | ||
return self; | ||
} | ||
|
||
- (CPString)title | ||
{ | ||
return title; | ||
} | ||
|
||
@end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
<plist version="1.0"> | ||
<dict> | ||
<key>CPApplicationDelegateClass</key> | ||
<string>AppController</string> | ||
<key>CPBundleName</key> | ||
<string>ArrayControllerRemovingFirstTest</string> | ||
<key>CPPrincipalClass</key> | ||
<string>CPApplication</string> | ||
</dict> | ||
</plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
/* | ||
* Jakefile | ||
* ArrayControllerRemovingFirstTest | ||
* | ||
* Created by You on July 17, 2012. | ||
* Copyright 2012, Your Company 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 ("ArrayControllerRemovingFirstTest", function(task) | ||
{ | ||
task.setBuildIntermediatesPath(FILE.join("Build", "ArrayControllerRemovingFirstTest.build", configuration)); | ||
task.setBuildPath(FILE.join("Build", configuration)); | ||
|
||
task.setProductName("ArrayControllerRemovingFirstTest"); | ||
task.setIdentifier("com.yourcompany.ArrayControllerRemovingFirstTest"); | ||
task.setVersion("1.0"); | ||
task.setAuthor("Your Company"); | ||
task.setEmail("feedback @nospam@ yourcompany.com"); | ||
task.setSummary("ArrayControllerRemovingFirstTest"); | ||
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", ["ArrayControllerRemovingFirstTest"], 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", "ArrayControllerRemovingFirstTest", "index.html")]); | ||
}); | ||
|
||
task ("run-release", ["release"], function() | ||
{ | ||
OS.system(["open", FILE.join("Build", "Release", "ArrayControllerRemovingFirstTest", "index.html")]); | ||
}); | ||
|
||
task ("deploy", ["release"], function() | ||
{ | ||
FILE.mkdirs(FILE.join("Build", "Deployment", "ArrayControllerRemovingFirstTest")); | ||
OS.system(["press", "-f", FILE.join("Build", "Release", "ArrayControllerRemovingFirstTest"), FILE.join("Build", "Deployment", "ArrayControllerRemovingFirstTest")]); | ||
printResults("Deployment") | ||
}); | ||
|
||
task ("desktop", ["release"], function() | ||
{ | ||
FILE.mkdirs(FILE.join("Build", "Desktop", "ArrayControllerRemovingFirstTest")); | ||
require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "ArrayControllerRemovingFirstTest"), FILE.join("Build", "Desktop", "ArrayControllerRemovingFirstTest", "ArrayControllerRemovingFirstTest.app")); | ||
printResults("Desktop") | ||
}); | ||
|
||
task ("run-desktop", ["desktop"], function() | ||
{ | ||
OS.system([FILE.join("Build", "Desktop", "ArrayControllerRemovingFirstTest", "ArrayControllerRemovingFirstTest.app", "Contents", "MacOS", "NativeHost"), "-i"]); | ||
}); | ||
|
||
function printResults(configuration) | ||
{ | ||
print("----------------------------"); | ||
print(configuration+" app built at path: "+FILE.join("Build", configuration, "ArrayControllerRemovingFirstTest")); | ||
print("----------------------------"); | ||
} |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
107 changes: 107 additions & 0 deletions
107
Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
<!DOCTYPE html | ||
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" | ||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | ||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | ||
<!-- | ||
index-debug.html | ||
ArrayControllerRemovingFirstTest | ||
Created by You on July 17, 2012. | ||
Copyright 2012, Your Company All rights reserved. | ||
--> | ||
<head> | ||
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" /> | ||
|
||
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" /> | ||
|
||
<meta name="apple-mobile-web-app-capable" content="yes" /> | ||
<meta name="apple-mobile-web-app-status-bar-style" content="black" /> | ||
|
||
<link rel="apple-touch-icon" href="Resources/icon.png" /> | ||
<link rel="apple-touch-startup-image" href="Resources/default.png" /> | ||
|
||
<title>ArrayControllerRemovingFirstTest</title> | ||
|
||
<script type="text/javascript"> | ||
OBJJ_MAIN_FILE = "main.j"; | ||
OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"]; | ||
</script> | ||
|
||
<script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script> | ||
|
||
<script type="text/javascript"> | ||
objj_msgSend_reset(); | ||
|
||
// DEBUG OPTIONS: | ||
|
||
// Uncomment to enable printing of backtraces on exceptions: | ||
//objj_msgSend_decorate(objj_backtrace_decorator); | ||
|
||
// Uncomment to supress exceptions that take place inside a message | ||
//objj_msgSend_decorate(objj_supress_exceptions_decorator) | ||
|
||
// Uncomment to enable runtime type checking: | ||
//objj_msgSend_decorate(objj_typecheck_decorator); | ||
|
||
// Uncomment (along with both above) to print backtraces on type check errors: | ||
//objj_typecheck_prints_backtrace = true; | ||
|
||
// Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise): | ||
//CPLogUnregister(CPLogDefault); | ||
|
||
// Uncomment to enable a specific logger: | ||
//CPLogRegister(CPLogConsole); | ||
//CPLogRegister(CPLogPopup); | ||
|
||
// Tag view DOM elements with a "data-cappuccino-view" attribute that contains | ||
// the class name of the view that created them. Comment this or set to false to disable. | ||
appkit_tag_dom_elements = true; | ||
</script> | ||
|
||
<style type="text/css"> | ||
body{margin:0; padding:0;} | ||
#container {position: absolute; top:50%; left:50%;} | ||
#content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;} | ||
#content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; } | ||
#loadgraphic {margin-right: 0.2em; margin-bottom:-2px;} | ||
</style> | ||
|
||
<!--[if lt IE 7]> | ||
<STYLE type="text/css"> | ||
#container { position: relative; top: 50%; } | ||
#content { position: relative;} | ||
</STYLE> | ||
<![endif]--> | ||
|
||
</head> | ||
|
||
<body style=""> | ||
<div id="cappuccino-body"> | ||
<div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;"> | ||
<script type="text/javascript"> | ||
document.write("<div id='container'><p id='content'>" + | ||
"<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " + | ||
"Loading ArrayControllerRemovingFirstTest...</p></div>"); | ||
</script> | ||
|
||
<noscript> | ||
<div id="container"> | ||
<div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555"> | ||
<p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p> | ||
<p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p> | ||
<p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p> | ||
<ul style="margin:0;padding:0; text-align: center; font-size:80%;" > | ||
<li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li> | ||
<li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li> | ||
<li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li> | ||
<li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li> | ||
<li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li> | ||
</ul> | ||
</div> | ||
</div> | ||
</noscript> | ||
</div> | ||
</div> | ||
</body> | ||
|
||
</html> |
Oops, something went wrong.