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

Merge branch 'MDL-43234-master' of git://github.com/andrewnicols/moodle

Browse Source 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
This commit is contained in:
Sam Hemelryk
2013-12-18 09:53:02 +13:00
parent 5be3d8d329 4246e5c7cc
commit bf6529bbd4
4 changed files with 10 additions and 7 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
+3 -2
View File
@@ -48,12 +48,13 @@ var DIALOGUE_NAME = 'Moodle dialogue',
/**
* A re-usable dialogue box with Moodle classes applied.
*
* @param {Object} config Object literal specifying the dialogue configuration properties.
* @param {Object} c Object literal specifying the dialogue configuration properties.
* @constructor
* @class M.core.dialogue
* @extends Y.Panel
*/
DIALOGUE = function(config) {
DIALOGUE = function(c) {
var config = Y.clone(c);
COUNT++;
var id = 'moodle-dialogue-'+COUNT;
config.notificationBase =
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
+3 -2
View File
@@ -48,12 +48,13 @@ var DIALOGUE_NAME = 'Moodle dialogue',
/**
* A re-usable dialogue box with Moodle classes applied.
*
* @param {Object} config Object literal specifying the dialogue configuration properties.
* @param {Object} c Object literal specifying the dialogue configuration properties.
* @constructor
* @class M.core.dialogue
* @extends Y.Panel
*/
DIALOGUE = function(config) {
DIALOGUE = function(c) {
var config = Y.clone(c);
COUNT++;
var id = 'moodle-dialogue-'+COUNT;
config.notificationBase =
lib/yui/src/notification/js/dialogue.js
Vendored
+3 -2
View File
@@ -17,12 +17,13 @@ var DIALOGUE_NAME = 'Moodle dialogue',
/**
* A re-usable dialogue box with Moodle classes applied.
*
* @param {Object} config Object literal specifying the dialogue configuration properties.
* @param {Object} c Object literal specifying the dialogue configuration properties.
* @constructor
* @class M.core.dialogue
* @extends Y.Panel
*/
DIALOGUE = function(config) {
DIALOGUE = function(c) {
var config = Y.clone(c);
COUNT++;
var id = 'moodle-dialogue-'+COUNT;
config.notificationBase =