Changeset 8629 for trunk/src/widget

Timestamp:

05/16/07 07:45:46 (20 months ago)

Author:

liucougar

Message:

added an API to make the Editor2Toolbar widget more decoupled with Editor2

Location:

trunk/src/widget

Files:

• Editor2Plugin/DropDownList.js (modified) (5 diffs)
• Editor2Toolbar.js (modified) (7 diffs)

trunk/src/widget/Editor2Plugin/DropDownList.js

@@ -42 +42 @@
 
 dojo.declare("dojo.widget.Editor2ToolbarComboItem", dojo.widget.Editor2ToolbarDropDownButton,{
-        // summary: dojo.widget.Editor2ToolbarComboItem provides an external loaded dropdown list
+        // summary: dojo.widget.Editor2ToolbarComboItem provides a realonly combobox in the toolbar
 
         onMouseOver: function(e){
@@ -68 +68 @@
                 if(this._parentToolbar.checkAvailability()){
                         var name = e.currentTarget.getAttribute("dropDownItemName");
-                        var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+                        var curInst = this.getMainComponent();
                         if(curInst){
                                 var _command = curInst.getCommand(this._name);
@@ -143 +143 @@
                 dojo.widget.Editor2ToolbarFormatBlockSelect.superclass.refreshState.call(this);
                 if(this._lastState != dojo.widget.Editor2Manager.commandState.Disabled){
-                        var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+                        var curInst = this.getMainComponent();
                         if(curInst){
                                 var _command = curInst.getCommand(this._name);
@@ -213 +213 @@
                 dojo.widget.Editor2ToolbarFontSizeSelect.superclass.refreshState.call(this);
                 if(this._lastState != dojo.widget.Editor2Manager.commandState.Disabled){
-                        var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+                        var curInst = this.getMainComponent();
                         if(curInst){
                                 var _command = curInst.getCommand(this._name);
@@ -338 +338 @@
         onChange: function(e){
                 if(this._parentToolbar.checkAvailability()){
-                        var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+                        var curInst = this.getMainComponent();
                         curInst.execCommand('inserthtml',e.target.getAttribute('dojoETDropDownItem'),'inserthtml');//'specialchar'
                 }

trunk/src/widget/Editor2Toolbar.js

@@ -138 +138 @@
                 }
         },
+        getMainComponent: function(){
+                return dojo.widget.Editor2Manager.getCurrentInstance();
+        },
         onMouseOver: function(){
-                var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+                var curInst = this.getMainComponent();
                 if(curInst){
                         var _command = curInst.getCommand(this._name);
@@ -160 +163 @@
                         e.preventDefault();
                         e.stopPropagation();
-                        var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+                        var curInst = this.getMainComponent();
                         if(curInst){
                                 var _command = curInst.getCommand(this._name);
@@ -171 +174 @@
         refreshState: function(){
                 // summary: update the state of the toolbar item
-                var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+                var curInst = this.getMainComponent();
                 var em = dojo.widget.Editor2Manager;
                 if(curInst){
@@ -250 +253 @@
                 if(this._parentToolbar.checkAvailability()){
                         var sv = this._domNode.value.toLowerCase();
-                        var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+                        var curInst = this.getMainComponent();
                         if(curInst){
                                 var _command = curInst.getCommand(this._name);
@@ -263 +266 @@
                 if(this._domNode){
                         dojo.widget.Editor2ToolbarFormatBlockPlainSelect.superclass.refreshState.call(this);
-                        var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+                        var curInst = this.getMainComponent();
                         if(curInst){
                                 var _command = curInst.getCommand(this._name);
@@ -298 +301 @@
 
 //              itemNodeType: 'span', //all the items (with attribute dojoETItemName set) defined in the toolbar should be a of this type
-
+                itemManager: dojo.widget.Editor2ToolbarItemManager,
                 postCreate: function(){
                         var i=0,node,nodes = dojo.html.getElementsByClass("dojoEditorToolbarItem", this.domNode/*, this.itemNodeType*/);
@@ -306 +309 @@
                                 var itemname = node.getAttribute("dojoETItemName");
                                 if(itemname){
-                                        var item = dojo.widget.Editor2ToolbarItemManager.getToolbarItem(itemname);
+                                        var item = this.itemManager.getToolbarItem(itemname);
                                         if(item){
                                                 item.create(node, this);