mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

s/label/text

Browse source
This commit is contained in:
Samuel Attard 2017-06-23 21:04:39 +10:00
parent 96f9dba595
commit 17e737eba2
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_notification.cc
View file

@ -29,14 +29,14 @@ struct Converter<brightray::NotificationAction> {
if (!dict.Get("type", &(out->type))) { if (!dict.Get("type", &(out->type))) {
return false; return false;
} }
dict.Get("label", &(out->label)); dict.Get("text", &(out->text));
return true; return true;
} }
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
brightray::NotificationAction val) { brightray::NotificationAction val) {
mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate); mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
dict.Set("label", val.label); dict.Set("text", val.text);
dict.Set("type", val.type); dict.Set("type", val.type);
return dict.GetHandle(); return dict.GetHandle();
} }

2
brightray/browser/mac/cocoa_notification.mm
View file

@ -57,7 +57,7 @@ void CocoaNotification::Show(const base::string16& title,
if (action.type == base::UTF8ToUTF16("button")) { if (action.type == base::UTF8ToUTF16("button")) {
[notification_ setHasActionButton:true]; [notification_ setHasActionButton:true];
[notification_ setActionButtonTitle:base::SysUTF16ToNSString(action.label)]; [notification_ setActionButtonTitle:base::SysUTF16ToNSString(action.text)];
actionIndex_ = i; actionIndex_ = i;
} }
} }

2
brightray/browser/notification.h
View file

@ -21,7 +21,7 @@ class NotificationPresenter;
struct NotificationAction { struct NotificationAction {
base::string16 type; base::string16 type;
base::string16 label; base::string16 text;
}; };
class Notification { class Notification {

8
docs/api/structures/notification-action.md
View file

@ -1,13 +1,13 @@
# NotificationAction Object # NotificationAction Object
* `type` String - The type of action, can be `button`. * `type` String - The type of action, can be `button`.
* `label` String - The label for the given action. * `text` String - (optional) The label for the given action.
## Platform / Action Support ## Platform / Action Support
| Action Type | Platform Support | Limitations | | Action Type | Platform Support | Usage of `text` | Default `text` | Limitations |
|-------------|------------------|-------------| |-------------|------------------|------------------|-------------|
| `button` | macOS | Maximum of one button, if multiple are provided only the last is used. This action is also incomptible with `hasReply` and will be ignored if `hasReply` is `true`. | | `button` | macOS | Used as the label for the button | "Show" | Maximum of one button, if multiple are provided only the last is used. This action is also incomptible with `hasReply` and will be ignored if `hasReply` is `true`. |
### Button support on macOS ### Button support on macOS