Squash-merge PR #13

Author: amiramix

.babelrc

@@ -1,4 +1,4 @@
-jspm_packages/
-node_modules/
-npm-debug.log
-react-starter/dist/
+# dependencies
+/node_modules
+.history
+/dist

react-starter/.editorconfig .editorconfig

@@ -2,7 +2,7 @@ Usage
 
 git clone https://github.com/yoonka/unigrid.git
 cd unigrid
-cd react-starter
+
 npm install
 
 Then to view the examples:

.gitignore

@@ -25,14 +25,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 import React from 'react';
-// import tableData from './json/tableResp1.json!';
+import { tableData } from './data/Resp1';
 import {
   Unigrid,
   UnigridEmptyCell,
   UnigridTextCell,
   isDefined,
   idMaker
-} from 'src/index';
+} from '../unigrid';
 
 export class UnigridExample1 extends React.Component {
   handleClick() {
@@ -48,6 +48,7 @@ export class UnigridExample1 extends React.Component {
   }
 
   render() {
+
     const idCounter = idMaker();
     const mkKey = () => idCounter.next().value;
 
@@ -62,10 +63,10 @@ export class UnigridExample1 extends React.Component {
             $do: [
               {
                 cells: [
-                  {show: 'hAgent', as: UnigridTextCell},
+                  { show: 'hAgent', as: UnigridTextCell },
                   'hDate',
                   'hStreet',
-                  {show: 'hName', as: 'string', className: 'name-header-cell'},
+                  { show: 'hName', as: 'string', className: 'name-header-cell' },
                   'hNumber'
                 ],
                 rowAs: 'header'
@@ -80,29 +81,29 @@ export class UnigridExample1 extends React.Component {
                 className: 'unigrid-segment',
                 $do: [
                   {
-                    condition: {ifDoes: 'exist', property: 'list'},
+                    condition: { ifDoes: 'exist', property: 'list' },
                     fromProperty: 'list',
                     select: 0,
                     $do: [
                       {
                         cells: [
                           'hCategory',
-                          {as: 'empty', colSpan: 1},
-                          {show: this.showFun},
+                          { as: 'empty', colSpan: 1 },
+                          { show: this.showFun },
                           this.showFun2,
                           'hNumber'],
                         rowAs: 'header'
                       }
                     ]
                   },
                   {
-                    condition: {ifDoes: 'exist', property: 'list'},
+                    condition: { ifDoes: 'exist', property: 'list' },
                     fromProperty: 'list',
                     $do: [
                       {
                         cells: [
-                          {cell: 'category2'},
-                          {as: 'empty', colSpan: 3},
+                          { cell: 'category2' },
+                          { as: 'empty', colSpan: 3 },
                           'hNumber'],
                         rowAs: 'header'
                       }
@@ -112,20 +113,21 @@ export class UnigridExample1 extends React.Component {
                     className: 'some-row-class',
                     cells: [
                       'agent', 'date', 'street', 'name',
-                      {show: 'number',
-                       as: 'string',
-                       className: 'number-cell',
-                       onClick: this.handleClick,
-                       bindToCell: 'onClick'
+                      {
+                        show: 'number',
+                        as: 'string',
+                        className: 'number-cell',
+                        onClick: this.handleClick,
+                        bindToCell: 'onClick'
                       }]
                   },
                   {
-                    condition: {ifDoes: 'exist', property: 'list'},
+                    condition: { ifDoes: 'exist', property: 'list' },
                     fromProperty: 'list',
                     select: 'all',
                     $do: [
                       {
-                        cells: [{as: 'empty', colSpan: 3}, 'name', 'number'],
+                        cells: [{ as: 'empty', colSpan: 3 }, 'name', 'number'],
                         mixIn: {
                           onClick: this.handleClick,
                           bindToCell: 'onClick'
@@ -144,8 +146,8 @@ export class UnigridExample1 extends React.Component {
               {
                 select: 0,
                 $do: [
-                  {cells: [null, null, null, 'fSum', 'fTotal']},
-                  {cells: [null, null, null, 'sum', 'total']}
+                  { cells: [null, null, null, 'fSum', 'fTotal'] },
+                  { cells: [null, null, null, 'sum', 'total'] }
                 ]
               }
             ]

LICENSE

@@ -25,7 +25,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 import React from 'react';
-import tableData from './json/tableResp6.json!';
+import { tableData } from './data/Resp6';
 import {
   Unigrid,
   UnigridHeader,
@@ -34,7 +34,7 @@ import {
   UnigridTextCell,
   getSorter,
   sort
-} from 'src/index';
+} from '../unigrid';
 
 export class UnigridExample10 extends React.Component {
   clickHandler(field) {
@@ -44,32 +44,32 @@ export class UnigridExample10 extends React.Component {
   render() {
     return (
       <div>
-      <p>Example 10 : Sorting with null, undefined and empty values</p>
-      <Unigrid
-        box={{column: 'a', order: 'asc'}}
-        data={tableData}
-        ref={ref => {this.unigrid = ref;}}
-      >
-        <UnigridHeader>
-          <UnigridRow rowAs={'header'}>
-            <UnigridTextCell cell="A" onClick={this.clickHandler('a')} />
-            <UnigridTextCell cell="B" onClick={this.clickHandler('b')} />
-            <UnigridTextCell cell="C" onClick={this.clickHandler('c')} />
-            <UnigridTextCell cell="D" onClick={this.clickHandler('d')} />
-          </UnigridRow>
-        </UnigridHeader>
-        <UnigridSegment
-          process={getSorter()}
-          select={'all'}
+        <p>Example 10 : Sorting with null, undefined and empty values</p>
+        <Unigrid
+          box={{ column: 'a', order: 'asc' }}
+          data={tableData}
+          ref={ref => { this.unigrid = ref; }}
         >
-          <UnigridRow>
-            <UnigridTextCell show="a" />
-            <UnigridTextCell show="b" />
-            <UnigridTextCell show="c" />
-            <UnigridTextCell show="d" />
-          </UnigridRow>
-        </UnigridSegment>
-      </Unigrid>
+          <UnigridHeader>
+            <UnigridRow rowAs={'header'}>
+              <UnigridTextCell cell="A" onClick={this.clickHandler('a')} />
+              <UnigridTextCell cell="B" onClick={this.clickHandler('b')} />
+              <UnigridTextCell cell="C" onClick={this.clickHandler('c')} />
+              <UnigridTextCell cell="D" onClick={this.clickHandler('d')} />
+            </UnigridRow>
+          </UnigridHeader>
+          <UnigridSegment
+            process={getSorter()}
+            select={'all'}
+          >
+            <UnigridRow>
+              <UnigridTextCell show="a" />
+              <UnigridTextCell show="b" />
+              <UnigridTextCell show="c" />
+              <UnigridTextCell show="d" />
+            </UnigridRow>
+          </UnigridSegment>
+        </Unigrid>
       </div>
     );
   }