mirror of
https://github.com/moodle/moodle.git
synced 2025-03-18 22:50:19 +01:00
Merge branch 'm28_MDL-46315' of git://github.com/totara/moodle
This commit is contained in:
commit
49b9144c87
@ -40,7 +40,8 @@ var DIALOGUE_NAME = 'Moodle dialogue',
|
||||
DIALOGUE_HIDDEN_CLASS = DIALOGUE_PREFIX + '-hidden',
|
||||
DIALOGUE_SELECTOR =' [role=dialog]',
|
||||
MENUBAR_SELECTOR = '[role=menubar]',
|
||||
HAS_ZINDEX = '.moodle-has-zindex',
|
||||
DOT = '.',
|
||||
HAS_ZINDEX = 'moodle-has-zindex',
|
||||
CAN_RECEIVE_FOCUS_SELECTOR = 'input:not([type="hidden"]), a[href], button, textarea, select, [tabindex]';
|
||||
|
||||
/**
|
||||
@ -121,6 +122,7 @@ Y.extend(DIALOGUE, Y.Panel, {
|
||||
// Workaround upstream YUI bug http://yuilibrary.com/projects/yui3/ticket/2532507
|
||||
// and allow setting of z-index in theme.
|
||||
bb = this.get('boundingBox');
|
||||
bb.addClass(HAS_ZINDEX);
|
||||
|
||||
// Add any additional classes that were specified.
|
||||
Y.Array.each(this.get('extraClasses'), bb.addClass, bb);
|
||||
@ -162,7 +164,7 @@ Y.extend(DIALOGUE, Y.Panel, {
|
||||
bb.setStyle('zIndex', zindex);
|
||||
} else {
|
||||
// Determine the correct zindex by looking at all existing dialogs and menubars in the page.
|
||||
Y.all(DIALOGUE_SELECTOR+', '+MENUBAR_SELECTOR+', '+HAS_ZINDEX).each(function (node) {
|
||||
Y.all(DIALOGUE_SELECTOR + ', ' + MENUBAR_SELECTOR + ', ' + DOT + HAS_ZINDEX).each(function (node) {
|
||||
var zindex = this.findZIndex(node);
|
||||
if (zindex > highestzindex) {
|
||||
highestzindex = zindex;
|
||||
|
File diff suppressed because one or more lines are too long
@ -40,7 +40,8 @@ var DIALOGUE_NAME = 'Moodle dialogue',
|
||||
DIALOGUE_HIDDEN_CLASS = DIALOGUE_PREFIX + '-hidden',
|
||||
DIALOGUE_SELECTOR =' [role=dialog]',
|
||||
MENUBAR_SELECTOR = '[role=menubar]',
|
||||
HAS_ZINDEX = '.moodle-has-zindex',
|
||||
DOT = '.',
|
||||
HAS_ZINDEX = 'moodle-has-zindex',
|
||||
CAN_RECEIVE_FOCUS_SELECTOR = 'input:not([type="hidden"]), a[href], button, textarea, select, [tabindex]';
|
||||
|
||||
/**
|
||||
@ -121,6 +122,7 @@ Y.extend(DIALOGUE, Y.Panel, {
|
||||
// Workaround upstream YUI bug http://yuilibrary.com/projects/yui3/ticket/2532507
|
||||
// and allow setting of z-index in theme.
|
||||
bb = this.get('boundingBox');
|
||||
bb.addClass(HAS_ZINDEX);
|
||||
|
||||
// Add any additional classes that were specified.
|
||||
Y.Array.each(this.get('extraClasses'), bb.addClass, bb);
|
||||
@ -162,7 +164,7 @@ Y.extend(DIALOGUE, Y.Panel, {
|
||||
bb.setStyle('zIndex', zindex);
|
||||
} else {
|
||||
// Determine the correct zindex by looking at all existing dialogs and menubars in the page.
|
||||
Y.all(DIALOGUE_SELECTOR+', '+MENUBAR_SELECTOR+', '+HAS_ZINDEX).each(function (node) {
|
||||
Y.all(DIALOGUE_SELECTOR + ', ' + MENUBAR_SELECTOR + ', ' + DOT + HAS_ZINDEX).each(function (node) {
|
||||
var zindex = this.findZIndex(node);
|
||||
if (zindex > highestzindex) {
|
||||
highestzindex = zindex;
|
||||
|
6
lib/yui/src/notification/js/dialogue.js
vendored
6
lib/yui/src/notification/js/dialogue.js
vendored
@ -11,7 +11,8 @@ var DIALOGUE_NAME = 'Moodle dialogue',
|
||||
DIALOGUE_HIDDEN_CLASS = DIALOGUE_PREFIX + '-hidden',
|
||||
DIALOGUE_SELECTOR =' [role=dialog]',
|
||||
MENUBAR_SELECTOR = '[role=menubar]',
|
||||
HAS_ZINDEX = '.moodle-has-zindex',
|
||||
DOT = '.',
|
||||
HAS_ZINDEX = 'moodle-has-zindex',
|
||||
CAN_RECEIVE_FOCUS_SELECTOR = 'input:not([type="hidden"]), a[href], button, textarea, select, [tabindex]';
|
||||
|
||||
/**
|
||||
@ -92,6 +93,7 @@ Y.extend(DIALOGUE, Y.Panel, {
|
||||
// Workaround upstream YUI bug http://yuilibrary.com/projects/yui3/ticket/2532507
|
||||
// and allow setting of z-index in theme.
|
||||
bb = this.get('boundingBox');
|
||||
bb.addClass(HAS_ZINDEX);
|
||||
|
||||
// Add any additional classes that were specified.
|
||||
Y.Array.each(this.get('extraClasses'), bb.addClass, bb);
|
||||
@ -133,7 +135,7 @@ Y.extend(DIALOGUE, Y.Panel, {
|
||||
bb.setStyle('zIndex', zindex);
|
||||
} else {
|
||||
// Determine the correct zindex by looking at all existing dialogs and menubars in the page.
|
||||
Y.all(DIALOGUE_SELECTOR+', '+MENUBAR_SELECTOR+', '+HAS_ZINDEX).each(function (node) {
|
||||
Y.all(DIALOGUE_SELECTOR + ', ' + MENUBAR_SELECTOR + ', ' + DOT + HAS_ZINDEX).each(function (node) {
|
||||
var zindex = this.findZIndex(node);
|
||||
if (zindex > highestzindex) {
|
||||
highestzindex = zindex;
|
||||
|
Loading…
x
Reference in New Issue
Block a user