L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-43979-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

Browse Source 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
This commit is contained in:
Sam Hemelryk
2014-02-17 08:28:06 +13:00
parent acbd69f7ee 5ce1ff33ce
commit 3c60db1a84
4 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
Vendored
+19 -8
View File
@@ -123,16 +123,16 @@ Y.extend(DIALOGUE, Y.Panel, {
* @method initializer
* @return void
*/
initializer : function(config) {
initializer : function() {
var bb;
if (config.render && !this.get('rendered')) {
if (this.get('render') && !this.get('rendered')) {
this.render();
}
this.makeResponsive();
this.after('visibleChange', this.visibilityChanged, this);
if (config.center) {
if (this.get('center')) {
this.centerDialogue();
}
this.set('COUNT', COUNT);
@@ -145,10 +145,10 @@ Y.extend(DIALOGUE, Y.Panel, {
// and allow setting of z-index in theme.
bb = this.get('boundingBox');
if (config.extraClasses) {
Y.Array.each(config.extraClasses, bb.addClass, bb);
}
if (config.visible) {
// Add any additional classes that were specified.
Y.Array.each(this.get('extraClasses'), bb.addClass, bb);
if (this.get('visible')) {
this.applyZIndex();
}
// Recalculate the zIndex every time the modal is altered.
@@ -157,7 +157,7 @@ Y.extend(DIALOGUE, Y.Panel, {
// either by centerDialogue or makeResonsive. This is because the show() will trigger
// a focus on the dialogue, which will scroll the page. If the dialogue has not
// been positioned it will scroll back to the top of the page.
if (config.visible) {
if (this.get('visible')) {
this.show();
this.keyDelegation();
}
@@ -502,6 +502,17 @@ Y.extend(DIALOGUE, Y.Panel, {
*/
responsiveWidth : {
value : 768
},
/**
* Any additional classes to add to the boundingBox.
*
* @attributes extraClasses
* @type Array
* @default []
*/
extraClasses: {
value: []
}
}
});
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
Vendored
+19 -8
View File
@@ -123,16 +123,16 @@ Y.extend(DIALOGUE, Y.Panel, {
* @method initializer
* @return void
*/
initializer : function(config) {
initializer : function() {
var bb;
if (config.render && !this.get('rendered')) {
if (this.get('render') && !this.get('rendered')) {
this.render();
}
this.makeResponsive();
this.after('visibleChange', this.visibilityChanged, this);
if (config.center) {
if (this.get('center')) {
this.centerDialogue();
}
this.set('COUNT', COUNT);
@@ -145,10 +145,10 @@ Y.extend(DIALOGUE, Y.Panel, {
// and allow setting of z-index in theme.
bb = this.get('boundingBox');
if (config.extraClasses) {
Y.Array.each(config.extraClasses, bb.addClass, bb);
}
if (config.visible) {
// Add any additional classes that were specified.
Y.Array.each(this.get('extraClasses'), bb.addClass, bb);
if (this.get('visible')) {
this.applyZIndex();
}
// Recalculate the zIndex every time the modal is altered.
@@ -157,7 +157,7 @@ Y.extend(DIALOGUE, Y.Panel, {
// either by centerDialogue or makeResonsive. This is because the show() will trigger
// a focus on the dialogue, which will scroll the page. If the dialogue has not
// been positioned it will scroll back to the top of the page.
if (config.visible) {
if (this.get('visible')) {
this.show();
this.keyDelegation();
}
@@ -502,6 +502,17 @@ Y.extend(DIALOGUE, Y.Panel, {
*/
responsiveWidth : {
value : 768
},
/**
* Any additional classes to add to the boundingBox.
*
* @attributes extraClasses
* @type Array
* @default []
*/
extraClasses: {
value: []
}
}
});
lib/yui/src/notification/js/dialogue.js
Vendored
+19 -8
View File
@@ -92,16 +92,16 @@ Y.extend(DIALOGUE, Y.Panel, {
* @method initializer
* @return void
*/
initializer : function(config) {
initializer : function() {
var bb;
if (config.render && !this.get('rendered')) {
if (this.get('render') && !this.get('rendered')) {
this.render();
}
this.makeResponsive();
this.after('visibleChange', this.visibilityChanged, this);
if (config.center) {
if (this.get('center')) {
this.centerDialogue();
}
this.set('COUNT', COUNT);
@@ -114,10 +114,10 @@ Y.extend(DIALOGUE, Y.Panel, {
// and allow setting of z-index in theme.
bb = this.get('boundingBox');
if (config.extraClasses) {
Y.Array.each(config.extraClasses, bb.addClass, bb);
}
if (config.visible) {
// Add any additional classes that were specified.
Y.Array.each(this.get('extraClasses'), bb.addClass, bb);
if (this.get('visible')) {
this.applyZIndex();
}
// Recalculate the zIndex every time the modal is altered.
@@ -126,7 +126,7 @@ Y.extend(DIALOGUE, Y.Panel, {
// either by centerDialogue or makeResonsive. This is because the show() will trigger
// a focus on the dialogue, which will scroll the page. If the dialogue has not
// been positioned it will scroll back to the top of the page.
if (config.visible) {
if (this.get('visible')) {
this.show();
this.keyDelegation();
}
@@ -471,6 +471,17 @@ Y.extend(DIALOGUE, Y.Panel, {
*/
responsiveWidth : {
value : 768
},
/**
* Any additional classes to add to the boundingBox.
*
* @attributes extraClasses
* @type Array
* @default []
*/
extraClasses: {
value: []
}
}
});