Merge pull request #313 from jpmorganchase/viewer-refactor-2

Further refactored PerspectiveViewer
finos · Nov 15, 2018 · 881f62a · 881f62a
2 parents 09206d8 + e5c7ab7
commit 881f62a
Show file tree

Hide file tree

Showing 27 changed files with 1,259 additions and 1,272 deletions.
diff --git a/packages/perspective-viewer/package.json b/packages/perspective-viewer/package.json
@@ -2,7 +2,7 @@
     "name": "@jpmorganchase/perspective-viewer",
     "version": "0.2.7",
     "description": "Perspective.js",
-    "main": "src/js/view.js",
+    "main": "src/js/viewer.js",
     "files": [
         "build/**/*",
         "src/**/*",

diff --git a/packages/perspective-viewer/src/config/view.config.js b/packages/perspective-viewer/src/config/view.config.js
@@ -2,10 +2,9 @@ const path = require("path");
 const common = require("@jpmorganchase/perspective/src/config/common.config.js");
 
 module.exports = Object.assign({}, common(), {
-    entry: "./src/js/view.js",
+    entry: "./src/js/viewer.js",
     output: {
         filename: "perspective.view.js",
-        library: "perspective-view",
         libraryTarget: "umd",
         path: path.resolve(__dirname, "../../build")
     }

diff --git a/...ges/perspective-viewer/src/html/view.html → ...s/perspective-viewer/src/html/viewer.html b/...ges/perspective-viewer/src/html/view.html → ...s/perspective-viewer/src/html/viewer.html
diff --git a/packages/perspective-viewer/src/js/computed_column.js b/packages/perspective-viewer/src/js/computed_column.js
@@ -7,19 +7,15 @@
  *
  */
 
-import {polyfill} from "mobile-drag-drop";
-
 import {bindTemplate} from "./utils.js";
-import State from "./computed_column/State.js";
-import Computation from "./computed_column/Computation.js";
+import State from "./computed_column/state.js";
+import Computation from "./computed_column/computation.js";
 
 import template from "../html/computed_column.html";
 
 import style from "../less/computed_column.less";
 
-import {disallow_drop} from "./dragdrop.js";
-
-polyfill({});
+import {disallow_drop} from "./viewer/dragdrop.js";
 
 // Computations
 const hour_of_day = function(val) {

diff --git a/...wer/src/js/computed_column/Computation.js → ...wer/src/js/computed_column/computation.js b/...wer/src/js/computed_column/Computation.js → ...wer/src/js/computed_column/computation.js
diff --git a/...ve-viewer/src/js/computed_column/State.js → ...ve-viewer/src/js/computed_column/state.js b/...ve-viewer/src/js/computed_column/State.js → ...ve-viewer/src/js/computed_column/state.js
diff --git a/packages/perspective-viewer/src/js/utils.js b/packages/perspective-viewer/src/js/utils.js
@@ -125,9 +125,10 @@ export function registerElement(templateString, styleString, proto) {
     window.customElements.define(name, _perspective_element);
 }
 
-export function bindTemplate(template, styleString) {
+export function bindTemplate(template, ...styleStrings) {
+    const style = styleStrings.map(x => x.toString()).join("\n");
     return function(cls) {
-        return registerElement(template, styleString, cls);
+        return registerElement(template, {toString: () => style}, cls);
     };
 }