twingle/twingle/content/workspace editorbindings.xml,1.1,1.2 genericviewer.xml,1.1,1.2 midasbindings.xml,1.3,1.4

[email protected] Sun, 9 Mar 2003 15:50:55 -0700 (MST)
Newsgroups gmane.comp.cms.oscom.twingle.cvs
Message-ID <[email protected]>
Update of /cvs/root/twingle/twingle/content/workspace
In directory alpha.oscom.org:/tmp/cvs-serv21543

Modified Files:
	editorbindings.xml genericviewer.xml midasbindings.xml 
Log Message:
- got rid of one tab row.
- new tab "Source"
- genericsourceeditor as new widget


Index: editorbindings.xml
===================================================================
RCS file: /cvs/root/twingle/twingle/content/workspace/editorbindings.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editorbindings.xml	9 Mar 2003 18:58:38 -0000	1.1
--- editorbindings.xml	9 Mar 2003 22:50:53 -0000	1.2
***************
*** 10,14 ****
              <xul:tabbox flex="1">
                  <xul:tabs>
!                     <xul:tab label="Contents"/>
                      <xul:tab label="Preview" oncommand="
                          var articleviewer = document.getAnonymousNodes(this)[0].parentNode.parentNode.parentNode.parentNode;
--- 10,15 ----
              <xul:tabbox flex="1">
                  <xul:tabs>
!                     <xul:tab label="Contents" oncommand="document.getBindingParent(this).onCommandStart('articleeditor');"/>
!                     <xul:tab label="Source" oncommand="document.getBindingParent(this).onCommandStart('sourceeditor');" />
                      <xul:tab label="Preview" oncommand="
                          var articleviewer = document.getAnonymousNodes(this)[0].parentNode.parentNode.parentNode.parentNode;
***************
*** 28,34 ****
                  <xul:tabpanels>
                      <xul:tabpanel flex="1">
! <!--                        <xul:articleeditor flex="1" id="bla"/> -->
! <xul:midaseditor flex="1" id="bla"/>
                      </xul:tabpanel>
                      <xul:tabpanel>
                          <xul:iframe id="iframe" flex="1" src=""/>
--- 29,38 ----
                  <xul:tabpanels>
                      <xul:tabpanel flex="1">
!                         <xul:midaseditor flex="1" />
!                     </xul:tabpanel>
!                     <xul:tabpanel flex="1">
!                         <xul:sourceeditor flex="1" />
                      </xul:tabpanel>
+ 
                      <xul:tabpanel>
                          <xul:iframe id="iframe" flex="1" src=""/>
***************
*** 47,59 ****
              <![CDATA[
  dump("\narticleviewer constructor start");
!                 var articleeditor = document.getAnonymousNodes(this)[0].getElementsByTagNameNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul","midaseditor")[0];
  dump("\narticleviewer constructor end");                
                  ]]>
               </constructor>
  
! <!--            <field name="resourcetitle"/>
!             <field name="sourceurl"></field>
!     -->    </implementation>
!         
      </binding>
      
--- 51,71 ----
              <![CDATA[
  dump("\narticleviewer constructor start");
!                 this.articleeditor = document.getAnonymousNodes(this)[0].getElementsByTagNameNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul","midaseditor")[0];
!                 this.sourceeditor = document.getAnonymousNodes(this)[0].getElementsByTagNameNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul","sourceeditor")[0];
!                 this.oldTab = 'articleeditor';
! 
  dump("\narticleviewer constructor end");                
                  ]]>
               </constructor>
+             
  
!             <method name="onCommandStart">
!                 <parameter name="prop"/>
!                 <body>
!                     eval("this."+ prop + ".data = this." + this.oldTab + ".data");
!                     this.oldTab = prop;
!                 </body>
!             </method>
! </implementation>
      </binding>
      

Index: genericviewer.xml
===================================================================
RCS file: /cvs/root/twingle/twingle/content/workspace/genericviewer.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** genericviewer.xml	9 Mar 2003 18:58:38 -0000	1.1
--- genericviewer.xml	9 Mar 2003 22:50:53 -0000	1.2
***************
*** 11,14 ****
--- 11,16 ----
                  <xul:tabs>
                      <xul:tab label="Contents"/>
+                     <xul:tab label="Source"/>
+                     
                      <xul:tab label="Preview"/>
                      <xul:tab label="Properties"/>
***************
*** 20,23 ****
--- 22,29 ----
                      </xul:tabpanel>
                      <xul:tabpanel>
+                         <xul:sourceditor/>
+                     </xul:tabpanel>
+                     
+                     <xul:tabpanel>
                          <xul:iframe flex="1" src=""/>
                      </xul:tabpanel>
***************
*** 38,43 ****
              <constructor>
                  
                  var folderviewer = document.getAnonymousNodes(this)[0].parentNode;
! 
                  var parent = folderviewer.parentNode.parentNode;
                  var tabs = parent.getElementsByTagName("tabs")[0];
--- 44,50 ----
              <constructor>
                  
+                 
                  var folderviewer = document.getAnonymousNodes(this)[0].parentNode;
!                 
                  var parent = folderviewer.parentNode.parentNode;
                  var tabs = parent.getElementsByTagName("tabs")[0];
***************
*** 52,54 ****
--- 59,91 ----
          </implementation>
      </binding>
+     
+     
+     <binding id="genericsourceeditor">
+         <content>
+             <xul:vbox flex="1">
+                 <xul:textbox name="sourceedit" height="300px" flex="1"/>
+             </xul:vbox>
+         </content>
+         
+         <implementation>
+             <constructor>
+                 this.sourceFrame = document.getAnonymousNodes(this)[0].getElementsByAttribute('name','sourceedit')[0];
+             </constructor> 
+             
+             <property name="data">
+                 <getter>
+                     return(this.sourceFrame.value);
+                 </getter>
+                 <setter>
+                     this.sourceFrame.value = val;
+                 </setter>
+             </property>
+             
+         </implementation>
+         
+         
+     </binding>
+     
  </bindings>
+ 
+ 

Index: midasbindings.xml
===================================================================
RCS file: /cvs/root/twingle/twingle/content/workspace/midasbindings.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** midasbindings.xml	9 Mar 2003 20:48:32 -0000	1.3
--- midasbindings.xml	9 Mar 2003 22:50:53 -0000	1.4
***************
*** 10,20 ****
          <content>
              <xul:tabbox flex="1">
-                 <xul:tabs>
-                     <xul:tab label="Midas" oncommand="document.getBindingParent(this).onCommandStart('midasValue');"
-                     />
-                     <xul:tab label="Source" oncommand="document.getBindingParent(this).onCommandStart('sourceValue');"/>
-                 </xul:tabs>
-                 <xul:tabpanels>
-                     <xul:tabpanel>
                      <xul:vbox flex="1">
                          <xul:hbox>
--- 10,13 ----
***************
*** 24,32 ****
                          <xul:iframe src="" height="300px" flex="1"/>
                          </xul:vbox> 
-                     </xul:tabpanel>
-                     <xul:tabpanel>
-                            <xul:textbox name="sourceedit" height="300px" flex="1"/>
-                     </xul:tabpanel>
-                 </xul:tabpanels>
              </xul:tabbox>
          </content>
--- 17,20 ----
***************
*** 34,55 ****
              <constructor>
                  this.loadHTML();    
-                 this.oldTab = 'midasValue';
              </constructor>
              
              <fields name="editFrame"/>
-             <fields name="sourceFrame"/>
- 
-             <fields name="oldTab"/>            
  
!             <property name="sourceValue">
!                 <getter>
!                     return(this.sourceFrame.value);
!                 </getter>
!                 <setter>
!                     this.sourceFrame.value = val;
!                 </setter>
!             </property>
! 
!             <property name="midasValue">
                  <getter>
                       var ser = new XMLSerializer();
--- 22,30 ----
              <constructor>
                  this.loadHTML();    
              </constructor>
              
              <fields name="editFrame"/>
  
!             <property name="data">
                  <getter>
                       var ser = new XMLSerializer();
***************
*** 60,67 ****
                      }
                       return out;
-                      /* 
-                      This would be another solution, but it isn't well-formed then...
-                     return this.editFrame.contentDocument.body.innerHTML;            
-                     */         
                  </getter>
                  <setter>
--- 35,38 ----
***************
*** 70,88 ****
              </property>
  
-             <method name="onCommandStart">
-                 <parameter name="prop"/>
-                 <body>
-                     eval("this."+ prop + " = this." + this.oldTab);
-                     this.oldTab = prop;
-                 </body>
-             </method>
              <method name="setEditFrame">
                  <body>
                      <![CDATA[ 
                this.editFrame = document.getAnonymousNodes(this)[0].getElementsByTagNameNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul","iframe")[0];
-               this.sourceFrame = document.getAnonymousNodes(this)[0].getElementsByAttribute('name','sourceedit')[0];
              ]]>              
                  </body>
              </method>
              <method name="enableDesignMode">
                  <parameter name="event"/>
--- 41,53 ----
              </property>
  
              <method name="setEditFrame">
                  <body>
                      <![CDATA[ 
                this.editFrame = document.getAnonymousNodes(this)[0].getElementsByTagNameNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul","iframe")[0];
              ]]>              
                  </body>
              </method>
+             
+             
              <method name="enableDesignMode">
                  <parameter name="event"/>