Skip to content

Commit

Permalink
ELEMENTS-406: upgrade to Polymer 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@nelsonsilva
nelsonsilva committed Oct 16, 2017
1 parent a1d86a0 commit bf18830
Show file tree
Hide file tree
Showing 68 changed files with 859 additions and 594 deletions.
6 changes: 3 additions & 3 deletions actions/nuxeo-favorites-toggle-button.html
View file
Expand Up @@ -42,9 +42,9 @@
display: inline-block;
}

:host([favorite]) ::content iron-icon {
stroke: var(--nuxeo-action-color-activated, orange);
fill: var(--nuxeo-action-color-activated, orange);
:host([favorite]) {
--iron-icon-fill-color: var(--icon-toggle-outline-color, var(--nuxeo-action-color-activated));
--iron-icon-stroke-color: var(--icon-toggle-pressed-color, var(--nuxeo-action-color-activated));
}
</style>

Expand Down
5 changes: 3 additions & 2 deletions actions/nuxeo-lock-toggle-button.html
View file
Expand Up @@ -44,8 +44,9 @@
display: inline-block;
}

:host([locked]) ::content iron-icon {
fill: var(--icon-toggle-pressed-color, --nuxeo-action-color-activated);
:host([locked]) {
--iron-icon-stroke-color: var(--icon-toggle-outline-color, var(--nuxeo-action-color-activated));
--iron-icon-fill-color: var(--icon-toggle-pressed-color, var(--nuxeo-action-color-activated));
}
</style>

Expand Down
6 changes: 3 additions & 3 deletions actions/nuxeo-notifications-toggle-button.html
View file
Expand Up @@ -44,9 +44,9 @@
display: inline-block;
}

:host([subscribed]) ::content iron-icon {
stroke: var(--icon-toggle-outline-color, --nuxeo-action-color-activated);
fill: var(--icon-toggle-pressed-color, --nuxeo-action-color-activated);
:host([subscribed]) {
--iron-icon-stroke-color: var(--icon-toggle-outline-color, var(--nuxeo-action-color-activated));
--iron-icon-fill-color: var(--icon-toggle-pressed-color, var(--nuxeo-action-color-activated));
}
</style>

Expand Down
42 changes: 30 additions & 12 deletions bower.json
View file
Expand Up @@ -20,26 +20,44 @@
"/test/"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.1.0",
"polymer": "polymer/polymer#^2.0.0",
"video.js": "5.20.1",
"cropperjs": "0.5.6",
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#~1.0.2",
"iron-elements": "PolymerElements/iron-elements#^1.0.0",
"paper-elements": "PolymerElements/paper-elements#^1.0.1",
"nuxeo-elements": "nuxeo/nuxeo-elements#master",
"gold-email-input": "PolymerElements/gold-email-input#^1.0.6",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^2.0.0",
"iron-form": "PolymerElements/iron-form#^2.0.0",
"iron-icon": "PolymerElements/iron-icon#^2.0.0",
"iron-list": "PolymerElements/iron-list#^2.0.0",
"iron-pages": "PolymerElements/iron-pages#^2.0.0",
"paper-button": "PolymerElements/paper-button#^2.0.0",
"paper-card": "PolymerElements/paper-card#^2.0.0",
"paper-dialog-scrollable": "PolymerElements/paper-dialog-scrollable#^2.0.0",
"paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#^2.0.0",
"paper-input": "PolymerElements/paper-input#^2.0.0",
"paper-icon-button": "PolymerElements/paper-icon-button#^2.0.0",
"paper-item": "PolymerElements/paper-item#^2.0.0",
"paper-listbox": "PolymerElements/paper-listbox#^2.0.0",
"paper-progress": "PolymerElements/paper-progress#^2.0.0",
"paper-radio-button": "PolymerElements/paper-radio-button#^2.0.0",
"paper-radio-group": "PolymerElements/paper-radio-group#^2.0.0",
"paper-tooltip": "PolymerElements/paper-tooltip#^2.0.0",
"better-dateinput-polyfill": "2.0.2",
"moment": "2.10.6",
"d3": "3.5.17",
"randomcolor": "0.4.1",
"paper-typeahead": "nuxeo/paper-typeahead#0.4",
"iron-iconset-svg": "^1.0.9",
"select2": "3.5.2",
"iron-form": "PolymerElements/iron-form#1.1.4",
"iron-list": "PolymerElements/iron-list#1.3.9"
"paper-toast": "PolymerElements/paper-toast#^2.0.0",
"iron-scroll-threshold": "PolymerElements/iron-scroll-threshold#^2.0.0",
"paper-spinner": "PolymerElements/paper-spinner#^2.0.0",
"paper-checkbox": "PolymerElements/paper-checkbox#^2.0.0",
"paper-dialog": "PolymerElements/paper-dialog#^2.0.0",
"paper-toggle-button": "PolymerElements/paper-toggle-button#^2.0.0",
"iron-collapse": "PolymerElements/iron-collapse#^2.0.0",
"nuxeo-elements": "nuxeo/nuxeo-elements#polymer-2"
},
"devDependencies": {
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"web-component-tester": "^4.0.0"
"iron-component-page": "PolymerElements/iron-component-page#^2.0.0",
"iron-test-helpers": "^2.0.0",
"web-component-tester": "^6.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
}
}
2 changes: 1 addition & 1 deletion demo/actions/index.html
View file
Expand Up @@ -43,7 +43,7 @@

</head>

<body unresolved>
<body>

<dom-module id="nuxeo-actions-demo">
<template>
Expand Down
30 changes: 17 additions & 13 deletions demo/icons/index.html
View file
Expand Up @@ -35,8 +35,8 @@

.icon {
display: inline-block;
@apply(--layout-vertical);
@apply(--layout-center);
@apply --layout-vertical;
@apply --layout-center;
text-align: center;
width: 170px;
border: 1px solid rgba(0, 0, 0, 0.1);
Expand All @@ -58,27 +58,31 @@
<body unresolved>

<h1>ICONS</h1>
<template is="dom-bind">
<iron-meta type="iconset" list="{{iconsets}}"></iron-meta>
<template is="dom-repeat" items="{{iconsets}}">
<h2>{{item.name}}</h2>
<template is="dom-repeat" items="{{getIconNames(item)}}">
<div class="icon">
<iron-icon icon="{{item}}"></iron-icon>
<label>{{getName(item)}}</label>
</div>
<dom-bind>
<template>
<iron-meta type="iconset"></iron-meta>
<template is="dom-repeat" items="{{iconsets}}">
<h2>{{item.name}}</h2>
<template is="dom-repeat" items="{{getIconNames(item)}}">
<div class="icon">
<iron-icon icon="{{item}}"></iron-icon>
<label>{{getName(item)}}</label>
</div>
</template>
</template>
</template>
</template>
</dom-bind>

<script>
var el = document.querySelector('[is=dom-bind]');
var el = document.querySelector('dom-bind');
el.getIconNames = function(iconset) {
return iconset.getIconNames();
};
el.getName = function(name) {
return name.split(':')[1];
};
var meta = document.querySelector('iron-meta');
el.iconsets = meta.list;
</script>

</body>
Expand Down
55 changes: 31 additions & 24 deletions demo/nuxeo-data-list/index.html
View file
Expand Up @@ -23,10 +23,10 @@
<link rel="import" href="../../../polymer/polymer.html">
<link rel="import" href="../../../nuxeo-elements/nuxeo-page-provider.html">
<link rel="import" href="../../nuxeo-data-list/nuxeo-data-list.html">
<link rel="import" href="../../../iron-flex-layout/iron-flex-layout.html">

<custom-style>
<style>
:host {
}

.content-view {
font-family: 'Open Sans', Arial, sans-serif;
Expand Down Expand Up @@ -66,8 +66,13 @@
border-bottom: 1px solid #ccc;
}

.list-item-title {
.list-item-box {
@apply --layout-vertical;
}

.list-item-info {
@apply --layout-horizontal;
@apply --layout-center;
}

.list-item-detail {
Expand All @@ -88,9 +93,11 @@
}

</style>
</custom-style>
</head>
<body unresolved>
<template is="dom-bind">
<dom-bind>
<template>

<div class="content-view">

Expand All @@ -110,33 +117,34 @@
<nuxeo-data-list id="dataList"
nx-provider="cvProvider"
selection-enabled select-on-tap>
<template>
<div tabindex$="[[tabIndex]]" class$="[[_computedClass(selected)]]">
<div class="list-item-box vertical layout">
<div class="list-item-info horizontal layout center">
<div class="vertical layout center">
<img class="nxicon" src="[[_thumbnail(item)]]">
</div>
<span class="list-item-title">[[item.title]]</span>
</div>
<div class="list-item-detail">
<div class="layout center">
<span class="list-item-property">
[[item.type]]
</span>
</div>
</div>
<template>
<div tabindex$="[[tabIndex]]" class$="[[_computedClass(selected)]]">
<div class="list-item-box">
<div class="list-item-info">
<div>
<img class="nxicon" src="[[_thumbnail(item)]]">
</div>
<span class="list-item-title">[[item.title]]</span>
</div>
<div class="border"></div>
</template>
<div class="list-item-detail">
<div class="layout center">
<span class="list-item-property">
[[item.type]]
</span>
</div>
</div>
</div>
</div>
<div class="border"></div>
</template>
</nuxeo-data-list>
</div>

</template>
</dom-bind>

<script>
var t = document.querySelector('template');
var t = document.querySelector('dom-bind');

t._thumbnail = function(doc) {
if (doc && doc.uid) {
Expand All @@ -149,7 +157,6 @@
}
};


t._computedClass = function(isSelected) {
var classes = 'item';
if (isSelected) {
Expand Down
12 changes: 7 additions & 5 deletions demo/nuxeo-data-table/index.html
View file
Expand Up @@ -31,8 +31,8 @@

<style>
:host {
@apply(--layout-vertical);
@apply(--layout-fit);
@apply --layout-vertical;
@apply --layout-fit;
}

.content-view {
Expand All @@ -47,7 +47,7 @@
width: 100%;
}

.thumbnail {
.thumbnail {
height: 32px;
width: 32px;
border-radius: 20px;
Expand Down Expand Up @@ -88,7 +88,8 @@
</style>
</head>
<body unresolved>
<template is="dom-bind">
<dom-bind>
<template>

<div class="content-view">

Expand Down Expand Up @@ -148,9 +149,10 @@
</div>

</template>
</dom-bind>

<script>
var t = document.querySelector('template');
var t = document.querySelector('dom-bind');
t._formatDate = function(date) {
return date;
};
Expand Down
3 changes: 0 additions & 3 deletions demo/nuxeo-document-distribution-chart/index.html
View file
Expand Up @@ -45,7 +45,6 @@
</style>
</head>
<body unresolved>
<template is="dom-bind">

<nuxeo-connection url="http://webui.demo.nuxeo.com/nuxeo" username="demo" password="demo"></nuxeo-connection>

Expand All @@ -58,7 +57,5 @@ <h2>Nuxeo Document Distribution Chart</h2>
include-deleted>
</nuxeo-document-distribution-chart>

</template>

</body>
</html>

0 comments on commit bf18830

Please sign in to comment.