Permalink
Browse files

Merge branch 'w50_MDL-36475_m24_zindexesgrrr' of git://github.com/sko…

…dak/moodle into MOODLE_24_STABLE
  • Loading branch information...
2 parents 8a35efa + 524e1ce commit 730271af49dd0129d35a3cecb78612278eb504c0 Sam Hemelryk committed Dec 17, 2012
@@ -6,6 +6,7 @@ List of changes:
* Workaround for error() function collisions.
* Modified config file to use moodle $CFG.
* Moved static files to /tinymce/ subfolder.
+* MDL-25736 - French spellchecker fixes.
Commits:
https://github.com/moodle/custom-tinymce_spellchecker_php/commits/MOODLE_22_2.0.6b
@@ -19,9 +19,8 @@ Upgrade procedure:
Changes:
- * zIndex 300000 and 200000 changed to 3000 and 2000 - this prevents collision with YUI,
+1/ zIndex 300000 and 200000 changed to 5003 and 5002 - this prevents collision with YUI,
see MDL-35771
- * MDL-25736 - French spellchecker fixes.
TODO:
* create some new automated script that sends other languages from upstream into AMOS

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -86,7 +86,7 @@
n = DOM.add(DOM.doc.body, 'div', {
id : 'mce_fullscreen_container',
- style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:2000;'});
+ style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:5002;'});
DOM.add(n, 'div', {id : 'mce_fullscreen'});
tinymce.each(ed.settings, function(v, n) {

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -36,7 +36,7 @@
var t = this;
t.parent(ed);
- t.zIndex = 3000;
+ t.zIndex = 5003;
t.count = 0;
t.windows = {};
},

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -11750,7 +11750,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
renderNode : function() {
var t = this, s = t.settings, n, tb, co, w;
- w = DOM.create('div', {role: 'listbox', id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:2000;outline:0'});
+ w = DOM.create('div', {role: 'listbox', id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:5002;outline:0'});
if (t.settings.parent) {
DOM.setAttrib(w, 'aria-parent', 'menu_' + t.settings.parent.id);
}
@@ -12569,7 +12569,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
DOM.setStyles(t.id + '_menu', {
left : p2.x,
top : p2.y + e.firstChild.clientHeight,
- zIndex : 2000
+ zIndex : 5002
});
e = 0;
View
@@ -107,7 +107,7 @@ M.form_filemanager.init = function(Y, options) {
this.selectnode.generateID();
this.selectui = new Y.Panel({
srcNode : this.selectnode,
- zIndex : 6000,
+ zIndex : 7600,
centered : true,
modal : true,
close : true,
View
@@ -1281,7 +1281,7 @@ M.core_filepicker.init = function(Y, options) {
this.mainui = new Y.Panel({
srcNode : this.fpnode,
headerContent: M.str.repository.filepicker,
- zIndex : 5000,
+ zIndex : 7500,
centered : true,
modal : true,
visible : false,
@@ -1302,7 +1302,7 @@ M.core_filepicker.init = function(Y, options) {
set('id', 'filepicker-select-'+client_id);
this.selectui = new Y.Panel({
srcNode : this.selectnode,
- zIndex : 6000,
+ zIndex : 7600,
centered : true,
modal : true,
close : true,

0 comments on commit 730271a

Please sign in to comment.