зеркало из https://github.com/mozilla/pjs.git
Safe UI changes: fixed window title bug, 28921; fixed page colors dialog bug 27905; increased size of colorpicker buttons. r=slamm
This commit is contained in:
Родитель
447ae38111
Коммит
aa56163870
|
@ -865,7 +865,8 @@ function EditorImageMap()
|
|||
|
||||
function EditorInsertHTML()
|
||||
{
|
||||
window.openDialog("chrome://editor/content/EdInsSrc.xul","_blank", "chrome,close,titlebar,modal", "");
|
||||
// Resizing doesn't work!
|
||||
window.openDialog("chrome://editor/content/EdInsSrc.xul","_blank", "chrome,close,titlebar,modal,resizeable=yes");
|
||||
contentWindow.focus();
|
||||
}
|
||||
|
||||
|
@ -1482,13 +1483,13 @@ function getColorAndSetColorWell(ColorPickerID, ColorWellID)
|
|||
var color = colorPicker.getAttribute('color');
|
||||
dump("setColor to: "+color+"\n");
|
||||
|
||||
if (colorWell)
|
||||
if (colorWell && color)
|
||||
{
|
||||
// Use setAttribute so colorwell can be a XUL element, such as titledbutton
|
||||
colorWell.setAttribute("style", "background-color: " + color);
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: Trigger UI update to get color from the current caret/selection
|
||||
return color;
|
||||
}
|
||||
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
onload="EditorOnLoad()"
|
||||
onunload="EditorShutdown()"
|
||||
onclose="return EditorCanClose()"
|
||||
contenttitlesettting="true"
|
||||
titlemodifier="&editorWindow.titlemodifier;"
|
||||
titlemenuseparator="&editorWindow.titlemodifiermenuseparator;"
|
||||
windowtype="composer:html"
|
||||
|
|
Загрузка…
Ссылка в новой задаче