witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Indication of current font now works in WebKit (Safari/Chrome).

This commit is contained in:
Dan Helfman 2008-12-22 19:25:09 -08:00
parent 7254dc6972
commit f68d571e68
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/Editor.js
View File

@ -362,8 +362,6 @@ Editor.prototype.cleanup_html = function ( key_code ) {
continue;
var replacement = withDocument( this.document, function () {
if ( style == undefined )
return createDOM( "span" );
// font-size is set when ending title mode
if ( style.indexOf( "font-size: " ) != -1 )
return null;

6
static/js/Wiki.js
View File

@ -4245,6 +4245,10 @@ function Font_pulldown( wiki, notebook_id, invoker, anchor, editor ) {
];
var self = this;
var current_font_family = editor.query_command_value( "fontname" );
if ( WEBKIT )
current_font_family = current_font_family.replace( /'/g, "" ).replace( /-webkit-/, "" );
for ( var i in fonts ) {
var font = fonts[ i ];
var font_name = font[ 0 ];
@ -4255,7 +4259,7 @@ function Font_pulldown( wiki, notebook_id, invoker, anchor, editor ) {
);
var selected_mark_char = document.createTextNode( "\u25cf" );
if ( editor.query_command_value( "fontname" ) == font_family ) {
if ( font_family.search( current_font_family ) == 0 ) {
var selected_mark = createDOM( "span", {}, selected_mark_char );
this.initial_selected_mark = selected_mark;
} else {