Changeset 2741

Timestamp:

01/09/06 21:00:59 (3 years ago)

Author:

bill

Message:

rename BasicPane? to ContentPane?

Location:

trunk

Files:

• demos/widget/Mail.html (modified) (2 diffs)
• demos/widget/Panes.html (modified) (4 diffs)
• src/widget/ContentPane.js (moved) (moved from trunk/src/widget/BasicPane.js) (1 diff)
• src/widget/FloatingPane.js (modified) (5 diffs)
• src/widget/html/ContentPane.js (moved) (moved from trunk/src/widget/html/BasicPane.js) (1 diff)
• src/widget/TabSet.js (modified) (1 diff)
• tests/widget/test_Layout.html (modified) (3 diffs)
• tests/widget/test_LayoutPane.html (modified) (2 diffs)
• tests/widget/test_LayoutPaneHref.html (modified) (2 diffs)
• tests/widget/test_SplitPane.html (modified) (3 diffs)
• tests/widget/test_SplitPane_2.html (modified) (4 diffs)
• tests/widget/test_TabSet.html (modified) (3 diffs)

trunk/demos/widget/Mail.html

@@ -12 +12 @@
         dojo.require("dojo.widget.LayoutPane");
         dojo.require("dojo.widget.FloatingLayoutPane");
-        dojo.require("dojo.widget.BasicPane");
+        dojo.require("dojo.widget.ContentPane");
         dojo.require("dojo.widget.SplitPane");
         dojo.require("dojo.widget.ColorPalette");
@@ -33 +33 @@
         id="main"
 >
-        <div id="topMenu" dojoType="BasicPane" layoutAlign="top" class="header"
+        <div id="topMenu" dojoType="ContentPane" layoutAlign="top" class="header"
          style="padding-bottom: 5px;">
                 <div style="float: left; margin-right: 10px;">

trunk/demos/widget/Panes.html

@@ -14 +14 @@
 
         dojo.require("dojo.widget.FloatingLayoutPane");
-        dojo.require("dojo.widget.BasicPane");
+        dojo.require("dojo.widget.ContentPane");
         dojo.require("dojo.widget.LayoutPane");
         dojo.require("dojo.widget.SplitPane");
@@ -98 +98 @@
                 >
 
-                        <div dojoType="BasicPane" sizeMin="30" sizeShare="30">
+                        <div dojoType="ContentPane" sizeMin="30" sizeShare="30">
 
                                 message list here
@@ -109 +109 @@
                         >
 
-                                <div dojoType="BasicPane" layoutAlign="top" style="background-color: #b39b86; padding: 8px;">
+                                <div dojoType="ContentPane" layoutAlign="top" style="background-color: #b39b86; padding: 8px;">
                                         message headers<br />go here
                                 </div>
 
-                                <div dojoType="BasicPane" layoutAlign="client" style="background-color: #f5ffbf; padding: 10px;">
+                                <div dojoType="ContentPane" layoutAlign="client" style="background-color: #f5ffbf; padding: 10px;">
                                         main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
                                 </div>
@@ -123 +123 @@
         <div dojoType="LayoutPane" layoutAlign="bottom" class="statusBar">
 
-                <div dojoType="BasicPane" layoutAlign="left" class="statusPanel">
+                <div dojoType="ContentPane" layoutAlign="left" class="statusPanel">
                         panel 1
                 </div>
-                <div dojoType="BasicPane" layoutAlign="left" class="statusPanel">
+                <div dojoType="ContentPane" layoutAlign="left" class="statusPanel">
                         panel 2
                 </div>
-                <div dojoType="BasicPane" layoutAlign="client" class="statusPanel" style="padding-right: 0px; z-index: 1;" minWidth="100">
+                <div dojoType="ContentPane" layoutAlign="client" class="statusPanel" style="padding-right: 0px; z-index: 1;" minWidth="100">
                         panel 3
                 </div>

trunk/src/widget/ContentPane.js

@@ -3 +3 @@
 // But note that those classes can contain any widget as a child.
 
-dojo.provide("dojo.widget.BasicPane");
-dojo.requireAfterIf("html", "dojo.widget.html.BasicPane");
+dojo.provide("dojo.widget.ContentPane");
+dojo.requireAfterIf("html", "dojo.widget.html.ContentPane");

trunk/src/widget/FloatingPane.js

@@ -11 +11 @@
 dojo.require("dojo.style");
 dojo.require("dojo.dom");
-dojo.require("dojo.widget.BasicPane");
+dojo.require("dojo.widget.ContentPane");
 dojo.require("dojo.widget.LayoutPane");
 dojo.require("dojo.dnd.HtmlDragMove");
@@ -63 +63 @@
 
         _makeClientPane: function(node){
-                return this.createPane("BasicPane", node, {layoutAlign: "client", id:this.widgetId+"_client"});
+                return this.createPane("ContentPane", node, {layoutAlign: "client", id:this.widgetId+"_client"});
         },
 
@@ -98 +98 @@
                                 img.src = this.titleBarBackground;
                                 dojo.html.addClass(img, 'dojoFloatingPaneDragbarBackground');
-                                var backgroundPane = dojo.widget.createWidget("BasicPane", {layoutAlign:"flood", id:this.widgetId+"_titleBackground"}, img);
+                                var backgroundPane = dojo.widget.createWidget("ContentPane", {layoutAlign:"flood", id:this.widgetId+"_titleBackground"}, img);
                                 this.dragBar.addChild(backgroundPane);
                         }
@@ -186 +186 @@
                         dojo.html.disableSelection(resizeDiv);
                         var rh = dojo.widget.createWidget("ResizeHandle", {targetElmId: this.widgetId, id:this.widgetId+"_resize"});
-                        this.resizePane = this.createPane("BasicPane", resizeDiv, {layoutAlign: "bottom"});
+                        this.resizePane = this.createPane("ContentPane", resizeDiv, {layoutAlign: "bottom"});
                         this.resizePane.addChild(rh);
                 }
@@ -204 +204 @@
                 var backgroundDiv = document.createElement('div');
                 dojo.html.addClass(backgroundDiv, 'dojoFloatingPaneBackground');
-                this.background = this.createPane("BasicPane", backgroundDiv, {layoutAlign: 'flood', id:this.widgetId+"_background"});
+                this.background = this.createPane("ContentPane", backgroundDiv, {layoutAlign: 'flood', id:this.widgetId+"_background"});
 
                 dojo.event.connect(this.domNode, 'onmousedown', this, 'onMouseDown');

trunk/src/widget/html/ContentPane.js

@@ -1 @@
-dojo.provide("dojo.widget.html.BasicPane");
+dojo.provide("dojo.widget.html.ContentPane");
 
 dojo.require("dojo.widget.*");
 dojo.require("dojo.widget.Container");
-dojo.require("dojo.widget.BasicPane");
+dojo.require("dojo.widget.ContentPane");
 
-dojo.widget.html.BasicPane = function(){
+dojo.widget.html.ContentPane = function(){
         dojo.widget.html.Container.call(this);
 }
-dojo.inherits(dojo.widget.html.BasicPane, dojo.widget.html.Container);
+dojo.inherits(dojo.widget.html.ContentPane, dojo.widget.html.Container);
 
-dojo.lang.extend(dojo.widget.html.BasicPane, {
-        widgetType: "BasicPane"
+dojo.lang.extend(dojo.widget.html.ContentPane, {
+        widgetType: "ContentPane"
 });
 
-dojo.widget.tags.addParseTreeHandler("dojo:BasicPane");
+dojo.widget.tags.addParseTreeHandler("dojo:ContentPane");

trunk/src/widget/TabSet.js

@@ -131 +131 @@
 
 // Deprecated class.  Tabset can take any widget as input.
-// Use BasicPane, LayoutPane, etc.
+// Use ContentPane, LayoutPane, etc.
 dojo.widget.html.Tab = function() {
         dojo.widget.html.LayoutPane.call(this);

trunk/tests/widget/test_Layout.html

@@ -11 +11 @@
 <script language="JavaScript" type="text/javascript">
         dojo.require("dojo.widget.LayoutPane");
-        dojo.require("dojo.widget.BasicPane");
+        dojo.require("dojo.widget.ContentPane");
         dojo.require("dojo.widget.RemotePane");
         dojo.require("dojo.widget.SplitPane");
@@ -33 +33 @@
         layoutChildPriority='top-bottom'
         style="width: 100%; height: 100%;">
-        <div dojoType="BasicPane" layoutAlign="top" style="background-color: #274383; color: white;">
+        <div dojoType="ContentPane" layoutAlign="top" style="background-color: #274383; color: white;">
                 top bar
         </div>
-        <div dojoType="BasicPane" layoutAlign="bottom" style="background-color: #274383; color: white;">
+        <div dojoType="ContentPane" layoutAlign="bottom" style="background-color: #274383; color: white;">
                 bottom bar
         </div>
@@ -75 +75 @@
                                 <a id="tab2" dojoType="RemotePane" href="tab2.html">Tab 2</a>
                         </div>
-                        <div dojoType="BasicPane" sizeMin="20" sizeShare="30">
+                        <div dojoType="ContentPane" sizeMin="20" sizeShare="30">
                                 This is just a test of the various containers nested inside each other.
                         </div>

trunk/tests/widget/test_LayoutPane.html

@@ -11 +11 @@
 <script type="text/javascript" src="../../dojo.js"></script>
 <script language="JavaScript" type="text/javascript">
-        dojo.require("dojo.widget.BasicPane");
+        dojo.require("dojo.widget.ContentPane");
         dojo.require("dojo.widget.LayoutPane");
         dojo.require("dojo.widget.HtmlWidget");
@@ -28 +28 @@
         style="border: 2px solid black; width: 90%; height: 500px; padding: 10px;"
 >
-        <div dojoType="BasicPane" layoutAlign="top" style="background-color: #b39b86; ">
+        <div dojoType="ContentPane" layoutAlign="top" style="background-color: #b39b86; ">
                 top bar
         </div>
-        <div dojoType="BasicPane" layoutAlign="bottom" style="background-color: #b39b86;">
+        <div dojoType="ContentPane" layoutAlign="bottom" style="background-color: #b39b86;">
                 bottom bar
         </div>
-        <div dojoType="BasicPane" layoutAlign="left" style="background-color: #acb386; width: 100px;">
+        <div dojoType="ContentPane" layoutAlign="left" style="background-color: #acb386; width: 100px;">
                 left
         </div>
-        <div dojoType="BasicPane" layoutAlign="right" style="background-color: #acb386;">
+        <div dojoType="ContentPane" layoutAlign="right" style="background-color: #acb386;">
                 right
         </div>
-        <div dojoType="BasicPane" layoutAlign="client" style="background-color: #f5ffbf; padding: 10px;">
+        <div dojoType="ContentPane" layoutAlign="client" style="background-color: #f5ffbf; padding: 10px;">
                 main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
                 (to check we're copying children around properly).<br />

trunk/tests/widget/test_LayoutPaneHref.html

@@ -13 +13 @@
         dojo.require("dojo.widget.LayoutPane");
         dojo.require("dojo.widget.RemotePane");
-        dojo.require("dojo.widget.BasicPane");
+        dojo.require("dojo.widget.ContentPane");
         dojo.require("dojo.widget.ComboBox");
         dojo.require("dojo.widget.Tree");
@@ -45 +45 @@
         style="border: 2px solid black; width: 90%; height: 500px; padding: 10px;"
 >
-        <div dojoType="BasicPane" layoutAlign="top" style="background-color: #b39b86; ">
+        <div dojoType="ContentPane" layoutAlign="top" style="background-color: #b39b86; ">
                 top bar
         </div>
-        <div dojoType="BasicPane" layoutAlign="bottom" style="background-color: #b39b86;">
+        <div dojoType="ContentPane" layoutAlign="bottom" style="background-color: #b39b86;">
                 bottom bar
         </div>
         <a dojoType="RemotePane" layoutAlign="left" style="width: 200px; background-color: #acb386;" href="tree.html"></a>
-        <div dojoType="BasicPane" layoutAlign="right" style="background-color: #acb386;">
+        <div dojoType="ContentPane" layoutAlign="right" style="background-color: #acb386;">
                 right
         </div>

trunk/tests/widget/test_SplitPane.html

@@ -11 +11 @@
 <script language="JavaScript" type="text/javascript">
         dojo.require("dojo.widget.SplitPane");
-        dojo.require("dojo.widget.BasicPane");
+        dojo.require("dojo.widget.ContentPane");
 </script>
 </head>
@@ -26 +26 @@
         style="border: 2px solid black; float: left; margin-right: 30px;  width: 400px; height: 300px;"
 >
-        <div dojoType="BasicPane" sizeMin="10" sizeShare="50">
+        <div dojoType="ContentPane" sizeMin="10" sizeShare="50">
                 this box has three split panes
         </div>
-        <div dojoType="BasicPane" sizeMin="20" sizeShare="50" style="background-color: yellow; border: 3px solid purple;">
+        <div dojoType="ContentPane" sizeMin="20" sizeShare="50" style="background-color: yellow; border: 3px solid purple;">
                 in vertical mode
         </div>
-        <div dojoType="BasicPane" sizeMin="10" sizeShare="50">
+        <div dojoType="ContentPane" sizeMin="10" sizeShare="50">
                 without active resizing
         </div>
@@ -43 +43 @@
         style="border: 2px solid black; float: left; width: 400px; height: 300px;"
 >
-        <div dojoType="BasicPane" sizeMin="20" sizeShare="20">
+        <div dojoType="ContentPane" sizeMin="20" sizeShare="20">
                 this box has two horizontal panes
         </div>
-        <div dojoType="BasicPane" sizeMin="50" sizeShare="50">
+        <div dojoType="ContentPane" sizeMin="50" sizeShare="50">
                 with active resizing, a smaller sizer, different starting sizes and minimum sizes
         </div>

trunk/tests/widget/test_SplitPane_2.html

@@ -12 +12 @@
         dojo.require("dojo.widget.LayoutPane");
         dojo.require("dojo.widget.SplitPane");
-        dojo.require("dojo.widget.BasicPane");
+        dojo.require("dojo.widget.ContentPane");
 </script>
 </head>
@@ -27 +27 @@
         style="border: 2px solid black; width: 700px; height: 400px;">
 
-        <div dojoType="BasicPane" sizeMin="60" sizeShare="1">
+        <div dojoType="ContentPane" sizeMin="60" sizeShare="1">
                 woo
         </div>
@@ -41 +41 @@
                 <div dojoType="LayoutPane" sizeMin="100" sizeShare="80">
 
-                        <div dojoType="BasicPane" layoutAlign="right" style="background-color: #b39b86; padding: 8px;">
+                        <div dojoType="ContentPane" layoutAlign="right" style="background-color: #b39b86; padding: 8px;">
                                 right<br />bar
                         </div>
 
-                        <div dojoType="BasicPane" layoutAlign="client" style="background-color: #f5ffbf; padding: 10px;">
+                        <div dojoType="ContentPane" layoutAlign="client" style="background-color: #f5ffbf; padding: 10px;">
                                 main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
                         </div>
@@ -51 +51 @@
                 </div>
 
-                <div dojoType="BasicPane" sizeMin="60" sizeShare="20">
+                <div dojoType="ContentPane" sizeMin="60" sizeShare="20">
                         yay
                 </div>

trunk/tests/widget/test_TabSet.html

@@ -17 +17 @@
         dojo.require("dojo.widget.TabSet");
         dojo.require("dojo.widget.RemotePane");
-        dojo.require("dojo.widget.BasicPane");
+        dojo.require("dojo.widget.ContentPane");
 </script>
 
@@ -44 +44 @@
                 <a id="tab2" dojoType="RemotePane" href="tab2.html">Tab 2</a>
                 
-                <div dojoType="BasicPane" label="Tab 3">
+                <div dojoType="ContentPane" label="Tab 3">
                         <h1>I am tab 3</h1>
                         <p>And I was already part of the page! That's cool, no?</p>
@@ -51 +51 @@
                 <div dojoType="RemotePane" label="Handler tab" handler="boo"></div>
 
-                <div dojoType="BasicPane" label="Another Tab">
+                <div dojoType="ContentPane" label="Another Tab">
                         <h1>I love local content</h1>
                         <p>And I'm not ashamed to admit it.</p>