Changeset 13272

Show
Ignore:
Timestamp:
04/04/08 18:49:13 (9 months ago)
Author:
BryanForbes
Message:

!strict

  • Moved some files I missed in the merge.
  • Fixed up tests.
Location:
dojox/branches/grid-reorganize
Files:
20 modified
2 moved

Legend:

Unmodified
Added
Removed

  • dojox/branches/grid-reorganize/grid/Grid.js

    r13270 r13272  
    253253}); 
    254254 
    255 dojox.Grid.markupFactory = function(props, node, ctor){ 
     255dojox.grid.Grid.markupFactory = function(props, node, ctor){ 
    256256        // handle setting up a data model for a store if one 
    257257        // isn't provided. There are some caveats: 
    … …  
    353353                // console.debug(dojo.toJson(props.structure, true)); 
    354354        } 
    355         return new dojox.Grid(props, node); 
     355        return new dojox.grid.Grid(props, node); 
    356356} 
    357357 
    358358 
    359 // alias us to the right location 
    360 dojox.grid.Grid = dojox.Grid; 
     359// alias us to the old location 
     360dojox.Grid = dojox.grid.Grid; 

  • dojox/branches/grid-reorganize/grid/resources/VirtualGrid.html

    r13270 r13272  
    11<div class="dojoxGrid" hidefocus="hidefocus" role="wairole:grid"> 
    2         <div class="dojoxGrid-master-header" dojoAttachPoint="viewsHeaderNode"></div> 
     2        <div class="dojoxGrid-master-header" dojoAttachPoint="headerNode"></div> 
    33        <div class="dojoxGrid-master-view" dojoAttachPoint="viewsNode"></div> 
    44        <span dojoAttachPoint="lastFocusNode" tabindex="0"></span> 

  • dojox/branches/grid-reorganize/grid/tests/test_dojo_data_edit.html

    r13270 r13272  
    22<html> 
    33<head> 
    4         <title>Test dojox.Grid Editing with DojoData model</title> 
     4        <title>Test dojox.grid.Grid Editing with DojoData model</title> 
    55        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta> 
    66<style> 
    … …  
    5151                var layoutCountries = [ 
    5252                        // view 0 
    53                         { type: 'dojox.GridRowView', width: '20px' }, 
     53                        { type: 'dojox.grid.GridRowView', width: '20px' }, 
    5454                        // view 1 
    5555                        { cells: [[{ name: "Row", get: getRow, width: 5}]], noscroll: true}, 
    … …  
    8080<body class="tundra"> 
    8181<h2> 
    82         dojox.Grid Basic Editing test 
     82        dojox.grid.Grid Basic Editing test 
    8383</h2> 
    8484<div id="controls"> 
    … …  
    106106          query="{ name : '*' }"> 
    107107</span> 
    108 <div id="grid" jsId="grid" dojoType="dojox.Grid" elasticView="2"  
     108<div id="grid" jsId="grid" dojoType="dojox.grid.Grid" elasticView="2"  
    109109         model="dataModel" structure="layoutCountries"> 
    110110</div> 
    … …  
    115115          query="{ name : '*' }"> 
    116116</span> 
    117 <div id="grid2" dojoType="dojox.Grid" elasticView="2"  
     117<div id="grid2" dojoType="dojox.grid.Grid" elasticView="2"  
    118118         model="dataModel2" structure="layoutCountries"> 
    119119</div> 

  • dojox/branches/grid-reorganize/grid/tests/test_dojo_data_empty.html

    r13270 r13272  
    22<html>  
    33<head>  
    4 <title>dojox.Grid with Dojo.Data via binding</title>  
     4<title>dojox.grid.Grid with Dojo.Data via binding</title>  
    55<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>  
    66        <style type="text/css">  
    … …  
    2727                var layoutCountries = [  
    2828                                                // view 0  
    29                                                 { type: 'dojox.GridRowView', width: '20px' },  
     29                                                { type: 'dojox.grid.GridRowView', width: '20px' },  
    3030                                                // view 1  
    3131                                                { cells: [[{ name: "Row", get: getRow, width: 5}]], noscroll: true},  
    … …  
    4343</head>  
    4444<body class="tundra">  
    45                                 <h5>dojox.Grid using initially-empty Dojo.Data write stores and then adding an item.  Item should show up correctly (no "?"s) when added.</h5>  
     45                                <h5>dojox.grid.Grid using initially-empty Dojo.Data write stores and then adding an item.  Item should show up correctly (no "?"s) when added.</h5>  
    4646                <br>  
    4747                                <span dojoType="dojox.grid.data.DojoData"   
    … …  
    5050                                                                store="jsonStore" count="0">  
    5151                                </span>  
    52                                 <div id="grid" dojoType="dojox.Grid" elasticView="2"   
     52                                <div id="grid" dojoType="dojox.grid.Grid" elasticView="2"   
    5353                                                                model="dataModel" structure="layoutCountries">  
    5454                                </div>  

  • dojox/branches/grid-reorganize/grid/tests/test_dojo_data_model_EmptyResultSet.html

    r13270 r13272  
    22<html> 
    33<head> 
    4         <title>dojox.Grid with Dojo.Data via binding</title> 
     4        <title>dojox.grid.Grid with Dojo.Data via binding</title> 
    55        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta> 
    66        <style type="text/css"> 
    … …  
    2828                var layoutCountries = [ 
    2929                        // view 0 
    30                         { type: 'dojox.GridRowView', width: '20px' }, 
     30                        { type: 'dojox.grid.GridRowView', width: '20px' }, 
    3131                        // view 1 
    3232                        { cells: [[{ name: "Row", get: getRow, width: 5}]], noscroll: true}, 
    … …  
    4040</head> 
    4141<body class="tundra"> 
    42         <h5>dojox.Grid using Dojo.Data stores where a query returns no results.  No errors should be reported in Firebug and the grid should be empty</h5> 
     42        <h5>dojox.grid.Grid using Dojo.Data stores where a query returns no results.  No errors should be reported in Firebug and the grid should be empty</h5> 
    4343    <br> 
    4444        <span dojoType="dojo.data.ItemFileReadStore"  
    … …  
    5151                query="{ noSuchAttr : '*' }"> 
    5252        </span> 
    53         <div id="grid" dojoType="dojox.Grid" elasticView="2"  
     53        <div id="grid" dojoType="dojox.grid.Grid" elasticView="2"  
    5454                model="dataModel" structure="layoutCountries"> 
    5555        </div> 

  • dojox/branches/grid-reorganize/grid/tests/test_edit_canEdit.html

    r13270 r13272  
    33<head> 
    44<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> 
    5 <title>Test dojox.Grid Editing</title> 
     5<title>Test dojox.grid.Grid Editing</title> 
    66<style> 
    77        @import "../resources/Grid.css"; 
    … …  
    4848        <script type="text/javascript" src="../_grid/cell.js"></script> 
    4949        <script type="text/javascript" src="../_grid/layout.js"></script> 
    50         <script type="text/javascript" src="../_grid/rows.js"></script> 
    51         <script type="text/javascript" src="../_grid/focus.js"></script> 
    52         <script type="text/javascript" src="../_grid/selection.js"></script> 
     50        <script type="text/javascript" src="../_Rows.js"></script> 
     51        <script type="text/javascript" src="../_FocusMixin.js"></script> 
     52        <script type="text/javascript" src="../_Selection.js"></script> 
    5353        <script type="text/javascript" src="../_grid/edit.js"></script> 
    54         <script type="text/javascript" src="../_grid/view.js"></script> 
    55         <script type="text/javascript" src="../_grid/views.js"></script> 
     54        <script type="text/javascript" src="../_View.js"></script> 
     55        <script type="text/javascript" src="../_ViewsMixin.js"></script> 
    5656        <script type="text/javascript" src="../_grid/rowbar.js"></script> 
    57         <script type="text/javascript" src="../_grid/publicEvents.js"></script> 
    5857        <script type="text/javascript" src="../VirtualGrid.js"></script> 
    5958        <script type="text/javascript" src="../_data/fields.js"></script> 
    … …  
    9796        statusCell = { field: 2, name: 'Status', styles: 'text-align: center;', editor: dojox.grid.editors.Select, options: [ "new", "read", "replied" ] }; 
    9897        gridLayout = [{ 
    99                 type: 'dojox.GridRowView', width: '20px' 
     98                type: 'dojox.grid.GridRowView', width: '20px' 
    10099        },{ 
    101100                defaultCell: { width: 8, editor: dojox.grid.editors.Input, styles: 'text-align: right;'  }, 
    … …  
    135134<body> 
    136135<h2> 
    137         dojox.Grid Basic Editing test 
     136        dojox.grid.Grid Basic Editing test 
    138137</h2> 
    139138<div id="controls"> 
    140139        <button onclick="grid.refresh()">Refresh</button>&nbsp;&nbsp;&nbsp; 
    141140        <button onclick="grid.edit.focusEditor()">Focus Editor</button> 
    142         <button onclick="grid.focus.next()">Next Focus</button>&nbsp;&nbsp;&nbsp; 
     141        <button onclick="grid.nextFocus()">Next Focus</button>&nbsp;&nbsp;&nbsp; 
    143142        <button onclick="addRow()">Add Row</button> 
    144143        <button onclick="grid.removeSelectedRows()">Remove</button>&nbsp;&nbsp;&nbsp; 
    … …  
    148147</div> 
    149148<br /> 
    150 <div id="grid" dojoType="dojox.Grid"  
     149<div id="grid" dojoType="dojox.grid.Grid"  
    151150        jsId="grid" 
    152151        model="model" structure="gridLayout"></div> 

  • dojox/branches/grid-reorganize/grid/tests/test_grid_dlg.html

    r13270 r13272  
    22<html> 
    33<head> 
    4         <title>Test dojox.Grid Basic</title> 
     4        <title>Test dojox.grid.Grid Basic</title> 
    55        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta> 
    66    <script type="text/javascript" src="../../../dojo/dojo.js" djConfig="isDebug:true, parseOnLoad: true"></script> 
    … …  
    4040        <script type="text/javascript" src="../_grid/cell.js"></script> 
    4141        <script type="text/javascript" src="../_grid/layout.js"></script> 
    42         <script type="text/javascript" src="../_grid/rows.js"></script> 
    43         <script type="text/javascript" src="../_grid/focus.js"></script> 
    44         <script type="text/javascript" src="../_grid/selection.js"></script> 
     42        <script type="text/javascript" src="../_Rows.js"></script> 
     43        <script type="text/javascript" src="../_FocusMixin.js"></script> 
     44        <script type="text/javascript" src="../_Selection.js"></script> 
    4545        <script type="text/javascript" src="../_grid/edit.js"></script> 
    46         <script type="text/javascript" src="../_grid/view.js"></script> 
    47         <script type="text/javascript" src="../_grid/views.js"></script> 
     46        <script type="text/javascript" src="../_View.js"></script> 
     47        <script type="text/javascript" src="../_ViewsMixin.js"></script> 
    4848        <script type="text/javascript" src="../_grid/rowbar.js"></script> 
    49         <script type="text/javascript" src="../_grid/publicEvents.js"></script> 
    5049        <script type="text/javascript" src="../VirtualGrid.js"></script> 
    5150        <script type="text/javascript" src="../_data/fields.js"></script> 
    … …  
    7675</head> 
    7776<body> 
    78 <div class="heading">dojox.Grid Basic Test</div> 
     77<div class="heading">dojox.grid.Grid Basic Test</div> 
    7978<button onclick="openDialog()">open</button> 
    8079<div id="dialog" dojoType="dijit.Dialog" title="First Dialog"> 
    8180    <table> 
    82         <tr><td><div id="grid" dojoType="dojox.Grid" model="model" structure="layout"></div></td></tr> 
     81        <tr><td><div id="grid" dojoType="dojox.grid.Grid" model="model" structure="layout"></div></td></tr> 
    8382        <tr><td><button dojoType="dijit.form.Button" type="submit">close</button></td></tr> 
    8483    </table> 

  • dojox/branches/grid-reorganize/grid/tests/test_grid_headerHeight.html

    r13270 r13272  
    22<html> 
    33<head> 
    4         <title>Test dojox.Grid Basic</title> 
     4        <title>Test dojox.grid.Grid Basic</title> 
    55        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta> 
    66        <style type="text/css"> 
    … …  
    3636        <script type="text/javascript" src="../_grid/cell.js"></script> 
    3737        <script type="text/javascript" src="../_grid/layout.js"></script> 
    38         <script type="text/javascript" src="../_grid/rows.js"></script> 
    39         <script type="text/javascript" src="../_grid/focus.js"></script> 
    40         <script type="text/javascript" src="../_grid/selection.js"></script> 
     38        <script type="text/javascript" src="../_Rows.js"></script> 
     39        <script type="text/javascript" src="../_FocusMixin.js"></script> 
     40        <script type="text/javascript" src="../_Selection.js"></script> 
    4141        <script type="text/javascript" src="../_grid/edit.js"></script> 
    42         <script type="text/javascript" src="../_grid/view.js"></script> 
    43         <script type="text/javascript" src="../_grid/views.js"></script> 
     42        <script type="text/javascript" src="../_View.js"></script> 
     43        <script type="text/javascript" src="../_ViewsMixin.js"></script> 
    4444        <script type="text/javascript" src="../_grid/rowbar.js"></script> 
    45         <script type="text/javascript" src="../_grid/publicEvents.js"></script> 
    4645        <script type="text/javascript" src="../VirtualGrid.js"></script> 
    4746        <script type="text/javascript" src="../_data/fields.js"></script> 
    … …  
    6261                 
    6362                var layout2 = [// array of view objects 
    64                         { type: 'dojox.GridRowView', width: '20px' }, 
     63                        { type: 'dojox.grid.GridRowView', width: '20px' }, 
    6564                        { noscroll: true, cells: [// array of rows, a row is an array of cells 
    6665                                        [{ name: "Alpha", value: '<input type="checkbox"></input>', rowSpan: 2, width: 6, styles: 'text-align:center;' }, { name: "Alpha 2", value: "Alpha2" }],  
    … …  
    7776</head> 
    7877<body> 
    79 <div class="heading">dojox.Grid Basic Test</div> 
    80 <div jsid="grid" id="grid" dojoType="dojox.Grid" model="model" structure="layout"></div> 
     78<div class="heading">dojox.grid.Grid Basic Test</div> 
     79<div jsid="grid" id="grid" dojoType="dojox.grid.Grid" model="model" structure="layout"></div> 
    8180<br /><br /> 
    82 <div jsid="grid2" id="grid2" dojoType="dojox.VirtualGrid" model="model" structure="layout2" rowCount="50"></div> 
     81<div jsid="grid2" id="grid2" dojoType="dojox.grid.VirtualGrid" model="model" structure="layout2" rowCount="50"></div> 
    8382</body> 
    8483</html> 

  • dojox/branches/grid-reorganize/grid/tests/test_grid_layout_borderContainer.html

    r13270 r13272  
    33<html xmlns="http://www.w3.org/1999/xhtml"> 
    44        <head> 
    5                 <title>Test dojox.Grid Editing</title> 
     5                <title>Test dojox.grid.Grid Editing</title> 
    66                <style> 
    77                        @import "../resources/tundraGrid.css"; 
    … …  
    5252                        gridLayout = [ 
    5353                                { 
    54                                         type: 'dojox.GridRowView', width: '20px' 
     54                                        type: 'dojox.grid.GridRowView', width: '20px' 
    5555                                }, 
    5656                                { 
    … …  
    9090 
    9191  <div dojoType="dijit.layout.ContentPane" id="gridContainer1" region="center" splitter="true" style="background: red;" >  
    92             <div jsId="grid" class="myGrid"             dojoType="dojox.Grid" model="model"     structure="gridLayout"></div> 
     92            <div jsId="grid" class="myGrid"             dojoType="dojox.grid.Grid" model="model"        structure="gridLayout"></div> 
    9393  </div> 
    9494 

  • dojox/branches/grid-reorganize/grid/tests/test_grid_layout_LayoutContainer.html

    r13270 r13272  
    33<html> 
    44<head> 
    5         <title>dojox.Grid in Layout Demo</title> 
     5        <title>dojox.grid.Grid in Layout Demo</title> 
    66        <style type="text/css"> 
    77                @import "../resources/Grid.css"; 
    … …  
    8080                </div> 
    8181 
    82                 <div id="grid1" dojoType="dojox.Grid" model="model" layoutAlign="client"></div> 
     82                <div id="grid1" dojoType="dojox.grid.Grid" model="model" layoutAlign="client"></div> 
    8383                                 
    8484                 

  • dojox/branches/grid-reorganize/grid/tests/test_grid_object_model_change.html

    r13270 r13272  
    3838        <script type="text/javascript" src="../_grid/cell.js"></script> 
    3939        <script type="text/javascript" src="../_grid/layout.js"></script> 
    40         <script type="text/javascript" src="../_grid/rows.js"></script> 
    41         <script type="text/javascript" src="../_grid/focus.js"></script> 
    42         <script type="text/javascript" src="../_grid/selection.js"></script> 
     40        <script type="text/javascript" src="../_Rows.js"></script> 
     41        <script type="text/javascript" src="../_FocusMixin.js"></script> 
     42        <script type="text/javascript" src="../_Selection.js"></script> 
    4343        <script type="text/javascript" src="../_grid/edit.js"></script> 
    44         <script type="text/javascript" src="../_grid/view.js"></script> 
    45         <script type="text/javascript" src="../_grid/views.js"></script> 
     44        <script type="text/javascript" src="../_View.js"></script> 
     45        <script type="text/javascript" src="../_ViewsMixin.js"></script> 
    4646        <script type="text/javascript" src="../_grid/rowbar.js"></script> 
    47         <script type="text/javascript" src="../_grid/publicEvents.js"></script> 
    4847        <script type="text/javascript" src="../VirtualGrid.js"></script> 
    4948        <script type="text/javascript" src="../_data/fields.js"></script> 
    … …  
    8180<body> 
    8281<div class="heading">dojox.grid.data.Objects model change</div> 
    83 <div id="grid" dojoType="dojox.Grid" model="model" structure="layout"></div> 
    84 <div id="grid2" dojoType="dojox.Grid" model="model2" structure="layout"></div> 
     82<div id="grid" dojoType="dojox.grid.Grid" model="model" structure="layout"></div> 
     83<div id="grid2" dojoType="dojox.grid.Grid" model="model2" structure="layout"></div> 
    8584</body> 
    8685</html> 

  • dojox/branches/grid-reorganize/grid/tests/test_grid_rtl.html

    r13270 r13272  
    22<html> 
    33<head> 
    4         <title>Test dojox.Grid Basic</title> 
     4        <title>Test dojox.grid.Grid Basic</title> 
    55        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta> 
    66        <style type="text/css"> 
    … …  
    3838        <script type="text/javascript" src="../_grid/cell.js"></script> 
    3939        <script type="text/javascript" src="../_grid/layout.js"></script> 
    40         <script type="text/javascript" src="../_grid/rows.js"></script> 
    41         <script type="text/javascript" src="../_grid/focus.js"></script> 
    42         <script type="text/javascript" src="../_grid/selection.js"></script> 
     40        <script type="text/javascript" src="../_Rows.js"></script> 
     41        <script type="text/javascript" src="../_FocusMixin.js"></script> 
     42        <script type="text/javascript" src="../_Selection.js"></script> 
    4343        <script type="text/javascript" src="../_grid/edit.js"></script> 
    44         <script type="text/javascript" src="../_grid/view.js"></script> 
    45         <script type="text/javascript" src="../_grid/views.js"></script> 
     44        <script type="text/javascript" src="../_View.js"></script> 
     45        <script type="text/javascript" src="../_ViewsMixin.js"></script> 
    4646        <script type="text/javascript" src="../_grid/rowbar.js"></script> 
    47         <script type="text/javascript" src="../_grid/publicEvents.js"></script> 
    4847        <script type="text/javascript" src="../VirtualGrid.js"></script> 
    4948        <script type="text/javascript" src="../_data/fields.js"></script> 
    … …  
    6665</head> 
    6766<body dir="rtl"> 
    68 <div class="heading">dojox.Grid Basic Test</div> 
    69 <div id="grid" dojoType="dojox.Grid" model="model" structure="layout"></div> 
     67<div class="heading">dojox.grid.Grid Basic Test</div> 
     68<div id="grid" dojoType="dojox.grid.Grid" model="model" structure="layout"></div> 
    7069</body> 
    7170</html> 

  • dojox/branches/grid-reorganize/grid/tests/test_grid_themes.html

    r13270 r13272  
    22<html> 
    33<head> 
    4         <title>dojox.Grid themes</title> 
     4        <title>dojox.grid.Grid themes</title> 
    55        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta> 
    66        <style type="text/css"> 
    … …  
    8383                var layoutCountries = [ 
    8484                        // view 0 
    85                         { type: 'dojox.GridRowView', width: '20px' }, 
     85                        { type: 'dojox.grid.GridRowView', width: '20px' }, 
    8686                        // view 1 
    8787                        { 

  • dojox/branches/grid-reorganize/grid/tests/test_keyboard.html

    r13270 r13272  
    3737        <script type="text/javascript" src="../_Selection.js"></script> 
    3838        <script type="text/javascript" src="../_grid/edit.js"></script> 
    39         <script type="text/javascript" src="../_grid/view.js"></script> 
     39        <script type="text/javascript" src="../_View.js"></script> 
    4040        <script type="text/javascript" src="../_ViewsMixin.js"></script> 
    4141        <script type="text/javascript" src="../_grid/rowbar.js"></script> 

  • dojox/branches/grid-reorganize/grid/tests/test_markup.html

    r13270 r13272  
    22<html> 
    33<head> 
    4         <title>dojox.Grid with Dojo.Data via binding</title> 
     4        <title>dojox.grid.Grid with Dojo.Data via binding</title> 
    55        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta> 
    66        <style type="text/css"> 
    … …  
    7878                var layoutCountries = [ 
    7979                        // view 0 
    80                         { type: 'dojox.GridRowView', width: '20px' }, 
     80                        { type: 'dojox.grid.GridRowView', width: '20px' }, 
    8181                        // view 1 
    8282                        { 

  • dojox/branches/grid-reorganize/grid/tests/test_sizing.html

    r13270 r13272  
    3636        <script type="text/javascript" src="../_grid/cell.js"></script> 
    3737        <script type="text/javascript" src="../_grid/layout.js"></script> 
    38         <script type="text/javascript" src="../_grid/rows.js"></script> 
    39         <script type="text/javascript" src="../_grid/focus.js"></script> 
    40         <script type="text/javascript" src="../_grid/selection.js"></script> 
     38        <script type="text/javascript" src="../_Rows.js"></script> 
     39        <script type="text/javascript" src="../_FocusMixin.js"></script> 
     40        <script type="text/javascript" src="../_Selection.js"></script> 
    4141        <script type="text/javascript" src="../_grid/edit.js"></script> 
    42         <script type="text/javascript" src="../_grid/view.js"></script> 
    43         <script type="text/javascript" src="../_grid/views.js"></script> 
     42        <script type="text/javascript" src="../_View.js"></script> 
     43        <script type="text/javascript" src="../_ViewsMixin.js"></script> 
    4444        <script type="text/javascript" src="../_grid/rowbar.js"></script> 
    45         <script type="text/javascript" src="../_grid/publicEvents.js"></script>