Permalink
Browse files

MDL-28195 confirm_action should allow the button labels to be customised

  • Loading branch information...
1 parent a8361fc commit c159d8e8722916b93e875b23c0ddf2977d8ea157 @timhunt timhunt committed with Sam Hemelryk Jul 5, 2011
Showing with 16 additions and 5 deletions.
  1. +11 −2 lib/javascript-static.js
  2. +4 −2 lib/outputactions.php
  3. +1 −1 lib/outputcomponents.php
View
@@ -275,8 +275,17 @@ M.util.show_confirm_dialog = function(e, args) {
}
};
- var buttons = [ {text: M.str.moodle.cancel, handler: handle_cancel, isDefault: true},
- {text: M.str.moodle.yes, handler: handle_yes} ];
+ if (!args.cancellabel) {
+ args.cancellabel = M.str.moodle.cancel;
+ }
+ if (!args.continuelabel) {
+ args.continuelabel = M.str.moodle.yes;
+ }
+
+ var buttons = [
+ {text: args.cancellabel, handler: handle_cancel, isDefault: true},
+ {text: args.continuelabel, handler: handle_yes}
+ ];
simpledialog.cfg.queueProperty('buttons', buttons);
View
@@ -85,8 +85,10 @@ public function __construct($event, $jsfunction, $jsfunctionargs=array()) {
* Confirm action
*/
class confirm_action extends component_action {
- public function __construct($message, $callback=null) {
- parent::__construct('click', 'M.util.show_confirm_dialog', array('message' => $message, 'callback' => $callback));
+ public function __construct($message, $callback = null, $continuelabel = null, $cancellabel = null) {
+ parent::__construct('click', 'M.util.show_confirm_dialog', array(
+ 'message' => $message, 'callback' => $callback,
+ 'continuelabel' => $continuelabel, 'cancellabel' => $cancellabel));
}
}
View
@@ -481,7 +481,7 @@ public function __construct(moodle_url $url, $label, $method='post') {
* @return void
*/
public function add_confirm_action($confirmmessage) {
- $this->add_action(new component_action('click', 'M.util.show_confirm_dialog', array('message' => $confirmmessage)));
+ $this->add_action(new confirm_action($confirmmessage));
}
/**

0 comments on commit c159d8e

Please sign in to comment.