Changeset 784


Ignore:
Timestamp:
03/15/07 10:17:53 (12 years ago)
Author:
ray
Message:

upated branch

Location:
branches/ray
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/ray/XinhaCore.js

    r783 r784  
    15531553  } 
    15541554 
    1555   url = _editor_url + 'modules/Dialogs/inline-dialog.js'; 
     1555  url = _editor_url + 'modules/Dialogs/XinhaDialog.js'; 
    15561556  if ( typeof Xinha.Dialog == 'undefined' && !document.getElementById(url) ) 
    15571557  { 
  • branches/ray/examples/testbed.html

    r782 r784  
    6464       [ 
    6565         'CharacterMap',  
    66          'Linker' 
     66         'Linker', 
     67         'Stylist' 
    6768       ]; 
    6869             // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :) 
     
    8788          
    8889      xinha_config.CharacterMap.mode = 'panel'; 
     90//xinha_config.stylistLoadStylesheet(document.location.href.replace(/[^\/]*\.html/, 'stylist.css')); 
    8991 
    9092/* 
  • branches/ray/plugins/Stylist/stylist.js

    r783 r784  
    765765Stylist.prototype.onGenerateOnce = function() 
    766766{ 
     767  var cfg = this.editor.config; 
     768  if(typeof cfg.css_style != 'undefined' && Xinha.objectProperties(cfg.css_style).length != 0) 
     769  { 
     770    this._prepareDialog(); 
     771  } 
     772 
     773}; 
     774Stylist.prototype._prepareDialog = function() 
     775{ 
    767776  var editor = this.editor; 
    768777  var stylist = this; 
    769   if(typeof editor.config.css_style != 'undefined' && Xinha.objectProperties(editor.config.css_style).length != 0) 
    770   { 
     778   
    771779    editor._stylist = null; // This needs to be changes to be Stylist::_stylist sometime 
    772780    editor._stylist = editor.addPanel('right'); 
     
    832840      } 
    833841    ); 
    834   } 
    835  
    836 }; 
     842} 
    837843Stylist.prototype.resize = function() 
    838844{ 
Note: See TracChangeset for help on using the changeset viewer.