Ignore:
Timestamp:
05/22/08 12:24:29 (12 years ago)
Author:
ray
Message:

merging new-dialogs and trunk via intermediate branch

Location:
branches/new-dialogs-merge
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/new-dialogs-merge/XinhaCore.js

    r1001 r1006  
    17831783        { 
    17841784          ev = Xinha.is_ie ? window.event : ev; 
    1785           editor.btnClickEvent = ev; 
     1785          editor.btnClickEvent = {clientX : ev.clientX, clientY : ev.clientY}; 
    17861786          if ( obj.enabled ) 
    17871787          { 
     
    21002100  } 
    21012101 
    2102   if ( typeof Xinha.Dialog == 'undefined' &&  !Xinha._loadback( _editor_url + 'modules/Dialogs/inline-dialog.js' , this.generate, this ) ) 
     2102  if ( typeof Xinha.Dialog == 'undefined' &&  !Xinha._loadback( _editor_url + 'modules/Dialogs/XinhaDialog.js' , this.generate, this ) ) 
    21032103  {     
    21042104    return false; 
     
    39443944Xinha.prototype.updateToolbar = function(noStatus) 
    39453945{ 
     3946  if (this.suspendUpdateToolbar) return; 
     3947   
    39463948  var doc = this._doc; 
    39473949  var text = (this._editMode == "textmode"); 
     
    47194721    clearTimeout(editor._timerToolbar); 
    47204722  } 
    4721   editor._timerToolbar = setTimeout( 
    4722     function() 
    4723     { 
    4724       editor.updateToolbar(); 
    4725       editor._timerToolbar = null; 
    4726     }, 
    4727     250); 
     4723  if (!this.suspendUpdateToolbar) 
     4724  { 
     4725    editor._timerToolbar = setTimeout( 
     4726      function() 
     4727      { 
     4728        editor.updateToolbar(); 
     4729        editor._timerToolbar = null; 
     4730      }, 
     4731      250); 
     4732  } 
    47284733}; 
    47294734 
     
    61796184        s += prop + ' = ' + o[prop] + '\n'; 
    61806185      } 
    6181  
    61826186    } 
    61836187    if (s)  
     
    68746878  { 
    68756879     if (!document.getElementById(xinha_editors[i])) continue; 
    6876         Xinha.loadingMessages.push(Xinha.createLoadingMessage(Xinha.getElementById('textarea', xinha_editors[i]))); 
     6880    Xinha.loadingMessages.push(Xinha.createLoadingMessage(Xinha.getElementById('textarea', xinha_editors[i]))); 
    68776881  } 
    68786882}; 
Note: See TracChangeset for help on using the changeset viewer.