Skip to content

Commit

Permalink
Merge branch 'MDL-58182-31' of https://github.com/snake/moodle into M…
Browse files Browse the repository at this point in the history
…OODLE_31_STABLE
  • Loading branch information
dmonllao committed Mar 20, 2017
2 parents 72536bd + cd099d0 commit c5ed804
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ DIALOGUE = function(config) {
.append(Y.Node.create('<div class="'+CSS.FOOTER+' yui3-widget-ft"></div>')));
Y.one(document.body).append(config.notificationBase);
config.srcNode = '#' + id;
delete config.buttons; // Don't let anyone pass in buttons as we want to control these during init. addButton can be used later.
DIALOGUE.superclass.constructor.apply(this, [config]);
};
Y.extend(DIALOGUE, Y.Panel, {
Expand Down Expand Up @@ -778,9 +779,8 @@ Y.Base.modifyAttrs(DIALOGUE, {
* @default {}
*/
buttons: {
// Readonly is really important. We don't want to allow users of the plugin to pass in buttons. closeButton handles this.
readOnly: true,
getter: Y.WidgetButtons.prototype._getButtons,
setter: Y.WidgetButtons.prototype._setButtons,
valueFn: function() {
if (this.get('closeButton') === false) {
return null;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ DIALOGUE = function(config) {
.append(Y.Node.create('<div class="'+CSS.FOOTER+' yui3-widget-ft"></div>')));
Y.one(document.body).append(config.notificationBase);
config.srcNode = '#' + id;
delete config.buttons; // Don't let anyone pass in buttons as we want to control these during init. addButton can be used later.
DIALOGUE.superclass.constructor.apply(this, [config]);
};
Y.extend(DIALOGUE, Y.Panel, {
Expand Down Expand Up @@ -775,9 +776,8 @@ Y.Base.modifyAttrs(DIALOGUE, {
* @default {}
*/
buttons: {
// Readonly is really important. We don't want to allow users of the plugin to pass in buttons. closeButton handles this.
readOnly: true,
getter: Y.WidgetButtons.prototype._getButtons,
setter: Y.WidgetButtons.prototype._setButtons,
valueFn: function() {
if (this.get('closeButton') === false) {
return null;
Expand Down
4 changes: 2 additions & 2 deletions lib/yui/src/notification/js/dialogue.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ DIALOGUE = function(config) {
.append(Y.Node.create('<div class="'+CSS.FOOTER+' yui3-widget-ft"></div>')));
Y.one(document.body).append(config.notificationBase);
config.srcNode = '#' + id;
delete config.buttons; // Don't let anyone pass in buttons as we want to control these during init. addButton can be used later.
DIALOGUE.superclass.constructor.apply(this, [config]);
};
Y.extend(DIALOGUE, Y.Panel, {
Expand Down Expand Up @@ -748,9 +749,8 @@ Y.Base.modifyAttrs(DIALOGUE, {
* @default {}
*/
buttons: {
// Readonly is really important. We don't want to allow users of the plugin to pass in buttons. closeButton handles this.
readOnly: true,
getter: Y.WidgetButtons.prototype._getButtons,
setter: Y.WidgetButtons.prototype._setButtons,
valueFn: function() {
if (this.get('closeButton') === false) {
return null;
Expand Down

0 comments on commit c5ed804

Please sign in to comment.