mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 08:26:37 +02:00
navigation-dock MDL-22560 Fixed bug to automatically set the fill color of the rotated svg when drawing
This commit is contained in:
parent
81f92309f3
commit
10a995c14e
1 changed files with 14 additions and 9 deletions
|
@ -344,7 +344,7 @@ M.core_dock.delayEvent = function(event, options, target) {
|
||||||
* btt : Title is rotated counterclockwise so the first letter is at the bottom.
|
* btt : Title is rotated counterclockwise so the first letter is at the bottom.
|
||||||
* @param {string} title
|
* @param {string} title
|
||||||
*/
|
*/
|
||||||
M.core_dock.fixTitleOrientation = function(title, text) {
|
M.core_dock.fixTitleOrientation = function(item, title, text) {
|
||||||
var Y = this.Y;
|
var Y = this.Y;
|
||||||
|
|
||||||
var title = Y.one(title);
|
var title = Y.one(title);
|
||||||
|
@ -401,6 +401,11 @@ M.core_dock.fixTitleOrientation = function(title, text) {
|
||||||
svg.appendChild(txt);
|
svg.appendChild(txt);
|
||||||
|
|
||||||
title.append(svg)
|
title.append(svg)
|
||||||
|
|
||||||
|
item.on('dockeditem:drawcomplete', function(txt, title){
|
||||||
|
txt.setAttribute('fill', Y.one(title).getStyle('color'));
|
||||||
|
}, item, txt, title);
|
||||||
|
|
||||||
return title;
|
return title;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -778,13 +783,20 @@ M.core_dock.genericblock.prototype = {
|
||||||
*/
|
*/
|
||||||
M.core_dock.item = function(Y, uid, title, contents, commands, blockclass){
|
M.core_dock.item = function(Y, uid, title, contents, commands, blockclass){
|
||||||
this.Y = Y;
|
this.Y = Y;
|
||||||
|
this.publish('dockeditem:drawstart', {prefix:'dockeditem'});
|
||||||
|
this.publish('dockeditem:drawcomplete', {prefix:'dockeditem'});
|
||||||
|
this.publish('dockeditem:showstart', {prefix:'dockeditem'});
|
||||||
|
this.publish('dockeditem:showcomplete', {prefix:'dockeditem'});
|
||||||
|
this.publish('dockeditem:hidestart', {prefix:'dockeditem'});
|
||||||
|
this.publish('dockeditem:hidecomplete', {prefix:'dockeditem'});
|
||||||
|
this.publish('dockeditem:itemremoved', {prefix:'dockeditem'});
|
||||||
if (uid && this.id==null) {
|
if (uid && this.id==null) {
|
||||||
this.id = uid;
|
this.id = uid;
|
||||||
}
|
}
|
||||||
if (title && this.title==null) {
|
if (title && this.title==null) {
|
||||||
this.titlestring = title.cloneNode(true);
|
this.titlestring = title.cloneNode(true);
|
||||||
this.title = document.createElement(title.nodeName);
|
this.title = document.createElement(title.nodeName);
|
||||||
var fixedtitle = M.core_dock.fixTitleOrientation(this.title, this.titlestring.firstChild.nodeValue);
|
M.core_dock.fixTitleOrientation(this, this.title, this.titlestring.firstChild.nodeValue);
|
||||||
}
|
}
|
||||||
if (contents && this.contents==null) {
|
if (contents && this.contents==null) {
|
||||||
this.contents = contents;
|
this.contents = contents;
|
||||||
|
@ -798,13 +810,6 @@ M.core_dock.item = function(Y, uid, title, contents, commands, blockclass){
|
||||||
this.nodes = (function(){
|
this.nodes = (function(){
|
||||||
return {docktitle : null, dockitem : null, container: null}
|
return {docktitle : null, dockitem : null, container: null}
|
||||||
})();
|
})();
|
||||||
this.publish('dockeditem:drawstart', {prefix:'dockeditem'});
|
|
||||||
this.publish('dockeditem:drawcomplete', {prefix:'dockeditem'});
|
|
||||||
this.publish('dockeditem:showstart', {prefix:'dockeditem'});
|
|
||||||
this.publish('dockeditem:showcomplete', {prefix:'dockeditem'});
|
|
||||||
this.publish('dockeditem:hidestart', {prefix:'dockeditem'});
|
|
||||||
this.publish('dockeditem:hidecomplete', {prefix:'dockeditem'});
|
|
||||||
this.publish('dockeditem:itemremoved', {prefix:'dockeditem'});
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue