Skip to content

Commit

Permalink
re organize cell editors
Browse files Browse the repository at this point in the history
  • Loading branch information
@stevewirts
stevewirts committed Dec 5, 2014
1 parent 4ec8fd8 commit 2b72ab2
Show file tree
Hide file tree
Showing 23 changed files with 504 additions and 3,004 deletions.
414 changes: 413 additions & 1 deletion build.html
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions fin-hypergrid-cell-editor-base.html → ...itors/fin-hypergrid-cell-editor-base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
@element fin-hypergrid-cell-editor-base
@homepage http://github.com/openfin/fin-hypergrid
-->
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../fin-rectangle/fin-rectangle.html">

<polymer-element name="fin-hypergrid-cell-editor-base">
<template>
</template>
Expand Down
30 changes: 20 additions & 10 deletions fin-hypergrid-cell-editor-choice.html → ...ors/fin-hypergrid-cell-editor-choice.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
@element fin-hypergrid-cell-editor-choice
@homepage http://github.com/openfin/fin-hypergrid
-->
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../fin-rectangle/fin-rectangle.html">
<link rel="import" href="fin-hypergrid-cell-editor-simple.html">
<polymer-element name="fin-hypergrid-cell-editor-choice" extends="fin-hypergrid-cell-editor-simple">
<template>
Expand All @@ -27,20 +25,32 @@
alias: 'choice',
collection: [
{
id: 'saab',
description: 'Saab'
id: 'moe',
description: 'Moe'
},
{
id: 'volvo',
description: 'Volvo'
id: 'larry',
description: 'Larry'
},
{
id: 'jaguar',
description: 'Jaguar'
id: 'curly',
description: 'Curly'
},
{
id: 'honda',
description: 'Honda'
id: 'groucho',
description: 'Groucho'
},
{
id: 'harpo',
description: 'Harpo'
},
{
id: 'zeppo',
description: 'Zeppo'
},
{
id: 'chico',
description: 'Chico'
},
],
});
Expand Down
2 changes: 1 addition & 1 deletion fin-hypergrid-cell-editor-color.html → ...tors/fin-hypergrid-cell-editor-color.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@element fin-hypergrid-cell-editor-color
@homepage http://github.com/openfin/fin-hypergrid
-->
<link rel="import" href="../polymer/polymer.html">

<link rel="import" href="fin-hypergrid-cell-editor-simple.html">
<polymer-element name="fin-hypergrid-cell-editor-color" extends="fin-hypergrid-cell-editor-simple">
<template>
Expand Down
2 changes: 1 addition & 1 deletion fin-hypergrid-cell-editor-date.html → ...itors/fin-hypergrid-cell-editor-date.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@element fin-hypergrid-cell-editor-date
@homepage http://github.com/openfin/fin-hypergrid
-->
<link rel="import" href="../polymer/polymer.html">

<link rel="import" href="fin-hypergrid-cell-editor-simple.html">
<polymer-element name="fin-hypergrid-cell-editor-date" extends="fin-hypergrid-cell-editor-simple">
<template>
Expand Down
3 changes: 1 addition & 2 deletions fin-hypergrid-cell-editor-simple.html → ...ors/fin-hypergrid-cell-editor-simple.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
@element fin-hypergrid-cell-editor-textfield
@homepage http://github.com/openfin/fin-hypergrid
-->
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../fin-rectangle/fin-rectangle.html">

<link rel="import" href="fin-hypergrid-cell-editor-base.html">
<polymer-element name="fin-hypergrid-cell-editor-simple" extends="fin-hypergrid-cell-editor-base">
<template>
Expand Down
3 changes: 2 additions & 1 deletion fin-hypergrid-cell-editor-slider.html → ...ors/fin-hypergrid-cell-editor-slider.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
@element fin-hypergrid-cell-editor-textfield
@homepage http://github.com/openfin/fin-hypergrid
-->
<link rel="import" href="../polymer/polymer.html">


<link rel="import" href="fin-hypergrid-cell-editor-simple.html">
<polymer-element name="fin-hypergrid-cell-editor-slider" extends="fin-hypergrid-cell-editor-simple">
<template>
Expand Down
3 changes: 2 additions & 1 deletion fin-hypergrid-cell-editor-spinner.html → ...rs/fin-hypergrid-cell-editor-spinner.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
@element fin-hypergrid-cell-editor-spinner
@homepage http://github.com/openfin/fin-hypergrid
-->
<link rel="import" href="../polymer/polymer.html">


<link rel="import" href="fin-hypergrid-cell-editor-simple.html">
<polymer-element name="fin-hypergrid-cell-editor-spinner" extends="fin-hypergrid-cell-editor-simple">
<template>
Expand Down
2 changes: 1 addition & 1 deletion fin-hypergrid-cell-editor-textfield.html → .../fin-hypergrid-cell-editor-textfield.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@element fin-hypergrid-cell-editor-textfield
@homepage http://github.com/openfin/fin-hypergrid
-->
<link rel="import" href="../polymer/polymer.html">

<link rel="import" href="fin-hypergrid-cell-editor-simple.html">
<polymer-element name="fin-hypergrid-cell-editor-textfield" extends="fin-hypergrid-cell-editor-simple">
<template>
Expand Down
17 changes: 0 additions & 17 deletions demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
<title>fin-hypergrid Demo</title>

<script src="../webcomponentsjs/webcomponents.js"></script>
<link rel="import" href="fin-hypergrid-behavior-default.html">
<link rel="import" href="fin-hypergrid-behavior-in-memory.html">
<link rel="import" href="fin-hypergrid-behavior-q.html">
<link rel="import" href="fin-hypergrid-excel.html">
<link rel="import" href="fin-hypergrid-cell-editor-textfield.html">
<link rel="import" href="fin-hypergrid-cell-editor-choice.html">
<link rel="import" href="fin-hypergrid-cell-editor-color.html">
<link rel="import" href="fin-hypergrid-cell-editor-date.html">
<link rel="import" href="fin-hypergrid-cell-editor-slider.html">
<link rel="import" href="fin-hypergrid-cell-editor-spinner.html">
<link rel="import" href="fin-hypergrid.html">
<style>
fin-hypergrid {
Expand All @@ -31,13 +21,6 @@
<!-- <fin-hypergrid-behavior-default></fin-hypergrid-behavior-default> -->
<fin-hypergrid-behavior-in-memory></fin-hypergrid-behavior-in-memory>
<!-- <fin-hypergrid-behavior-q url="ws://localhost:5000/"></fin-hypergrid-behavior-q> -->
<fin-hypergrid-excel></fin-hypergrid-excel>
<fin-hypergrid-cell-editor-textfield></fin-hypergrid-cell-editor-textfield>
<fin-hypergrid-cell-editor-choice></fin-hypergrid-cell-editor-choice>
<fin-hypergrid-cell-editor-color></fin-hypergrid-cell-editor-color>
<fin-hypergrid-cell-editor-date></fin-hypergrid-cell-editor-date>
<fin-hypergrid-cell-editor-slider></fin-hypergrid-cell-editor-slider>
<fin-hypergrid-cell-editor-spinner></fin-hypergrid-cell-editor-spinner>
</fin-hypergrid>
</body>
</html>
32 changes: 31 additions & 1 deletion fin-hypergrid.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
<link rel="import" href="../fin-vampire-bar/fin-vampire-bar.html">
<link rel="import" href="fin-hypergrid-renderer.html">
<link rel="import" href="fin-hypergrid-selection-model.html">
<link rel="import" href="fin-hypergrid-behavior-default.html">
<link rel="import" href="fin-hypergrid-behavior-in-memory.html">
<link rel="import" href="fin-hypergrid-behavior-q.html">

<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-textfield.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-choice.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-color.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-date.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-slider.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-spinner.html">
<link rel="import" href="fin-hypergrid-excel.html">

<polymer-element name="fin-hypergrid" attributes="">
<template>
<style>
Expand Down Expand Up @@ -67,6 +79,17 @@
z-index: 1000;
}
</style>

<fin-plugins>
<fin-hypergrid-cell-editor-textfield></fin-hypergrid-cell-editor-textfield>
<fin-hypergrid-cell-editor-choice></fin-hypergrid-cell-editor-choice>
<fin-hypergrid-cell-editor-color></fin-hypergrid-cell-editor-color>
<fin-hypergrid-cell-editor-date></fin-hypergrid-cell-editor-date>
<fin-hypergrid-cell-editor-slider></fin-hypergrid-cell-editor-slider>
<fin-hypergrid-cell-editor-spinner></fin-hypergrid-cell-editor-spinner>
<fin-hypergrid-excel></fin-hypergrid-excel>
</fin-plugins>

<fin-canvas>
<fin-hypergrid-renderer></fin-hypergrid-renderer>
</fin-canvas>
Expand Down Expand Up @@ -327,7 +350,14 @@

},
pluginsDo: function(func) {
var plugins = this.children;
var userPlugins = this.children.array();
var pluginsTag = this.shadowRoot.querySelector('fin-plugins');

var plugins = userPlugins;
if (pluginsTag) {
var systemPlugins = pluginsTag.children.array();
plugins = systemPlugins.concat(plugins);
}

for (var i = 0; i < plugins.length; i++) {
var plugin = plugins[i];
Expand Down
9 changes: 8 additions & 1 deletion fin-hypergrid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,14 @@

},
pluginsDo: function(func) {
var plugins = this.children;
var userPlugins = this.children.array();
var pluginsTag = this.shadowRoot.querySelector('fin-plugins');

var plugins = userPlugins;
if (pluginsTag) {
var systemPlugins = pluginsTag.children.array();
plugins = systemPlugins.concat(plugins);
}

for (var i = 0; i < plugins.length; i++) {
var plugin = plugins[i];
Expand Down
23 changes: 23 additions & 0 deletions fin-hypergrid.pre.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
<link rel="import" href="../fin-vampire-bar/fin-vampire-bar.html">
<link rel="import" href="fin-hypergrid-renderer.html">
<link rel="import" href="fin-hypergrid-selection-model.html">
<link rel="import" href="fin-hypergrid-behavior-default.html">
<link rel="import" href="fin-hypergrid-behavior-in-memory.html">
<link rel="import" href="fin-hypergrid-behavior-q.html">

<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-textfield.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-choice.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-color.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-date.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-slider.html">
<link rel="import" href="cell-editors/fin-hypergrid-cell-editor-spinner.html">
<link rel="import" href="fin-hypergrid-excel.html">

<polymer-element name="fin-hypergrid" attributes="">
<template>
<style>
Expand Down Expand Up @@ -67,6 +79,17 @@
z-index: 1000;
}
</style>

<fin-plugins>
<fin-hypergrid-cell-editor-textfield></fin-hypergrid-cell-editor-textfield>
<fin-hypergrid-cell-editor-choice></fin-hypergrid-cell-editor-choice>
<fin-hypergrid-cell-editor-color></fin-hypergrid-cell-editor-color>
<fin-hypergrid-cell-editor-date></fin-hypergrid-cell-editor-date>
<fin-hypergrid-cell-editor-slider></fin-hypergrid-cell-editor-slider>
<fin-hypergrid-cell-editor-spinner></fin-hypergrid-cell-editor-spinner>
<fin-hypergrid-excel></fin-hypergrid-excel>
</fin-plugins>

<fin-canvas>
<fin-hypergrid-renderer></fin-hypergrid-renderer>
</fin-canvas>
Expand Down
12 changes: 0 additions & 12 deletions js/.jshintrc
View file

This file was deleted.

Loading

0 comments on commit 2b72ab2

Please sign in to comment.