witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Work towards iframes-on-demand.

This commit is contained in:
Dan Helfman 2009-01-03 15:52:12 -08:00
parent 30fa88b866
commit c07794377d
3 changed files with 61 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
static/css/style.css
View File

@ -517,7 +517,6 @@ h1 {
margin: 0em; margin: 0em;
padding: 0em; padding: 0em;
overflow: hidden; overflow: hidden;
height: 0em;
width: 100%; width: 100%;
border: 1px solid #999999; border: 1px solid #999999;
margin-bottom: 0.75em; margin-bottom: 0.75em;

88
static/js/Editor.js
View File

@ -120,26 +120,34 @@ Editor.prototype.connect_note_controls = function ( store_control_buttons ) {
Editor.prototype.create_iframe = function ( position_after ) { Editor.prototype.create_iframe = function ( position_after ) {
var iframe_id = "note_" + this.id; var iframe_id = "note_" + this.id;
// if there is already an iframe for this Editor, bail
var iframe = getElement( iframe_id );
if ( iframe )
return;
var self = this; var self = this;
this.iframe = createDOM( "iframe", { this.iframe = createDOM( "iframe",
// iframe src attribute is necessary in IE 6 on an HTTPS site to prevent annoying warnings {
"src": IE6 && "/static/html/blank_note.html" || "", // iframe src attribute is necessary in IE 6 on an HTTPS site to prevent annoying warnings
"frameBorder": "0", "src": "/static/html/blank_note.html",
"scrolling": "no", "frameBorder": "0",
"id": iframe_id, "scrolling": "no",
"name": iframe_id, "id": iframe_id,
"class": "note_frame", "name": iframe_id,
"onresize": function () { setTimeout( function () { self.resize() }, 50 ); }, "class": "note_frame",
"onload": function () { setTimeout( function () { self.resize(); if ( !this.init_highlight ) scroll( 0, 0 ); }, 250 ); } "onresize": function () { setTimeout( function () { self.resize() }, 50 ); },
} ); "onload": function () { setTimeout( function () { self.resize(); if ( !this.init_highlight ) scroll( 0, 0 ); }, 250 ); }
}
);
this.iframe.editor = this; this.iframe.editor = this;
// if there is already a static note open for this editor, replace its div with the new iframe // if there is already a static note open for this editor, replace its div with the new iframe
// and note controls
if ( getElement( "static_note_" + this.id ) ) { if ( getElement( "static_note_" + this.id ) ) {
var note_holder = getElement( "note_holder_" + this.id ); var note_holder = getElement( "note_holder_" + this.id );
this.note_controls = getElement( "note_controls_" + this.id ); this.note_controls = getElement( "note_controls_" + this.id );
this.connect_note_controls( true ); this.connect_note_controls( true );
this.div = null;
replaceChildNodes( note_holder, this.iframe ); replaceChildNodes( note_holder, this.iframe );
insertSiblingNodesBefore( this.iframe, this.note_controls ); insertSiblingNodesBefore( this.iframe, this.note_controls );
@ -162,32 +170,50 @@ Editor.prototype.create_iframe = function ( position_after ) {
} }
Editor.prototype.create_div = function ( position_after ) { Editor.prototype.create_div = function ( position_after ) {
var self = this;
// if there is already a static note div for this Editor, connect up the note controls and bail // if there is already a static note div for this Editor, connect up the note controls and bail
var static_note_div = getElement( "static_note_" + this.id ); var static_note_div = getElement( "static_note_" + this.id );
if ( static_note_div ) { if ( static_note_div ) {
this.note_controls = getElement( "note_controls_" + this.id ); this.note_controls = getElement( "note_controls_" + this.id );
this.connect_note_controls( true ); this.connect_note_controls( true );
this.div = static_note_div; this.div = static_note_div;
this.scrape_title();
connect( this.div, "onclick", function ( event ) { self.focused( event ); } );
return; return;
} }
this.div = createDOM( this.div = createDOM(
"div", { "class": "static_note_div", "id": "static_note_" + this.id }, "div", { "class": "static_note_div", "id": "static_note_" + this.id }
this.initial_text
); );
this.create_note_controls(); this.div.innerHTML = this.initial_text;
this.connect_note_controls();
var note_holder = createDOM( "div", { "id": "note_holder_" + this.id }, // if there is already an iframe open for this editor, replace it with the new static note div
this.note_controls, if ( getElement( "note_" + this.id ) ) {
this.div var note_holder = getElement( "note_holder_" + this.id );
); this.iframe = null;
this.document = null;
if ( position_after && position_after.parentNode ) replaceChildNodes( note_holder, this.div );
insertSiblingNodesAfter( position_after, note_holder ); insertSiblingNodesBefore( this.div, this.note_controls );
else } else {
appendChildNodes( "notes", note_holder ); this.create_note_controls();
this.connect_note_controls();
var note_holder = createDOM( "div", { "id": "note_holder_" + this.id },
this.note_controls,
this.div
);
if ( position_after && position_after.parentNode )
insertSiblingNodesAfter( position_after, note_holder );
else
appendChildNodes( "notes", note_holder );
}
this.scrape_title();
connect( this.div, "onclick", function ( event ) { self.focused( event ); } );
signal( self, "init_complete" ); signal( self, "init_complete" );
} }
@ -240,6 +266,7 @@ Editor.prototype.finish_init = function () {
connect( this.document, "onkeydown", function ( event ) { self.key_pressed( event ); } ); connect( this.document, "onkeydown", function ( event ) { self.key_pressed( event ); } );
connect( this.document, "onkeyup", function ( event ) { self.key_released( event ); } ); connect( this.document, "onkeyup", function ( event ) { self.key_released( event ); } );
} }
connect( this.iframe, "onblur", function ( event ) { self.blurred( event ); } );
connect( this.document, "onblur", function ( event ) { self.blurred( event ); } ); connect( this.document, "onblur", function ( event ) { self.blurred( event ); } );
connect( this.document, "onfocus", function ( event ) { self.focused( event ); } ); connect( this.document, "onfocus", function ( event ) { self.focused( event ); } );
connect( this.document.body, "onblur", function ( event ) { self.blurred( event ); } ); connect( this.document.body, "onblur", function ( event ) { self.blurred( event ); } );
@ -593,7 +620,7 @@ Editor.prototype.mouse_dragged = function ( event ) {
Editor.prototype.scrape_title = function () { Editor.prototype.scrape_title = function () {
// scrape the note title out of the editor // scrape the note title out of the editor
var heading = getFirstElementByTagAndClassName( "h3", null, this.document ); var heading = getFirstElementByTagAndClassName( "h3", null, this.document || this.div );
if ( heading ) if ( heading )
var title = scrapeText( heading ); var title = scrapeText( heading );
else else
@ -611,6 +638,8 @@ Editor.prototype.focused = function () {
Editor.prototype.blurred = function () { Editor.prototype.blurred = function () {
this.scrape_title(); this.scrape_title();
this.create_div();
} }
Editor.title_placeholder_char = "\u200b"; Editor.title_placeholder_char = "\u200b";
@ -707,7 +736,7 @@ Editor.prototype.end_link = function () {
} }
Editor.prototype.find_link_at_cursor = function () { Editor.prototype.find_link_at_cursor = function () {
if ( this.iframe.contentWindow && this.iframe.contentWindow.getSelection ) { // browsers such as Firefox if ( this.iframe && this.iframe.contentWindow && this.iframe.contentWindow.getSelection ) { // browsers such as Firefox
var selection = this.iframe.contentWindow.getSelection(); var selection = this.iframe.contentWindow.getSelection();
var link = selection.anchorNode; var link = selection.anchorNode;
if ( !link ) return null; if ( !link ) return null;
@ -736,7 +765,7 @@ Editor.prototype.find_link_at_cursor = function () {
if ( link != this.link_started ) if ( link != this.link_started )
this.link_started = null; this.link_started = null;
return link; return link;
} else if ( this.document.selection ) { // browsers such as IE } else if ( this.document && this.document.selection ) { // browsers such as IE
var range = this.document.selection.createRange(); var range = this.document.selection.createRange();
var link = range.parentElement(); var link = range.parentElement();
@ -793,7 +822,7 @@ Editor.prototype.state_enabled = function ( state_name, node_names ) {
Editor.prototype.current_node_names = function () { Editor.prototype.current_node_names = function () {
var node_names = new Array(); var node_names = new Array();
if ( !this.edit_enabled ) if ( !this.edit_enabled || !this.iframe )
return node_names; return node_names;
// to determine whether the specified state is enabled, see whether the current selection is // to determine whether the specified state is enabled, see whether the current selection is
@ -919,6 +948,9 @@ function normalize_html( html ) {
} }
Editor.prototype.dirty = function () { Editor.prototype.dirty = function () {
if ( !this.iframe || !this.document )
return false;
var original_html = normalize_html( this.initial_text ) var original_html = normalize_html( this.initial_text )
var current_html = normalize_html( this.document.body.innerHTML ) var current_html = normalize_html( this.document.body.innerHTML )

2
static/js/Wiki.js
View File

@ -1010,7 +1010,7 @@ Wiki.prototype.editor_focused = function ( editor, synchronous ) {
addElementClass( editor.iframe, "focused_note_frame" ); addElementClass( editor.iframe, "focused_note_frame" );
} }
if ( this.focused_editor && this.focused_editor != editor ) { if ( this.focused_editor && this.focused_editor != editor && this.focused_editor.iframe ) {
this.clear_pulldowns(); this.clear_pulldowns();
removeElementClass( this.focused_editor.iframe, "focused_note_frame" ); removeElementClass( this.focused_editor.iframe, "focused_note_frame" );