pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-11-13 08:44:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

$native.alert takes an array of [name, callback] tuples for buttons.

Browse Source 
I'd rather use a hash, but they aren't ordered.
This commit is contained in:
Corey Johnson 2012-05-07 15:29:19 -07:00
parent eef2c54ae8
commit b422040d52
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Atom/src/native_handler.mm
View File

@ -178,38 +178,32 @@ bool NativeHandler::Execute(const CefString& name,
NSString *message = stringFromCefV8Value(arguments[0]);
NSString *detailedMessage = stringFromCefV8Value(arguments[1]);
CefRefPtr<CefV8Value> buttons;
CefRefPtr<CefV8Value> buttonNamesAndCallbacks;
if (arguments.size() < 3) {
buttons = CefV8Value::CreateObject(NULL, NULL);
buttonNamesAndCallbacks = CefV8Value::CreateArray();
}
else {
buttons = arguments[2];
buttonNamesAndCallbacks = arguments[2];
}
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
[alert setMessageText:message];
[alert setInformativeText:detailedMessage];
std::vector<CefString> buttonTitles;
std::vector<CefString>::iterator iter;
NSMutableDictionary *titleForTag = [NSMutableDictionary dictionary];
buttons->GetKeys(buttonTitles);
for (iter = buttonTitles.begin(); iter != buttonTitles.end(); iter++) {
NSString *buttonTitle = [NSString stringWithUTF8String:(*iter).ToString().c_str()];
for (int i = 0; i < buttonNamesAndCallbacks->GetArrayLength(); i++) {
std::string title = buttonNamesAndCallbacks->GetValue(i)->GetValue(0)->GetStringValue().ToString();
NSString *buttonTitle = [NSString stringWithUTF8String:title.c_str()];
NSButton *button = [alert addButtonWithTitle:buttonTitle];
[titleForTag setObject:buttonTitle forKey:[NSNumber numberWithInt:button.tag]];
[button setTag:i];
}
NSUInteger buttonTag = [alert runModal];
const char *buttonTitle = [[titleForTag objectForKey:[NSNumber numberWithInt:buttonTag]] UTF8String];
if (!buttonTitle) { // No button title if there were no buttons specified.
if (buttonNamesAndCallbacks->GetArrayLength() == 0) { // No button title if there were no buttons specified.
return true;
}
CefRefPtr<CefV8Value> callback = buttons->GetValue(buttonTitle);
CefRefPtr<CefV8Value> callback = buttonNamesAndCallbacks->GetValue(buttonTag)->GetValue(1);
CefV8ValueList args;
CefRefPtr<CefV8Exception> e;
callback->ExecuteFunction(callback, args, retval, e, true);