Skip to content

Commit

Permalink
Revert "emojione v3, v1.0.0 and loads of bug fixes"
Browse files Browse the repository at this point in the history
This reverts commit 427b0f5.
  • Loading branch information
Puranjay Jain committed Jun 12, 2017
1 parent 427b0f5 commit 5df6488
Show file tree
Hide file tree
Showing 5 changed files with 486 additions and 465 deletions.
22 changes: 17 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"yarn.lock"
],
"dependencies": {
"emojione": "ranks/emojione#^3.0.3",
"polymer": "Polymer/polymer#^1.9.1 || ^2.0.0",
"polymer": "Polymer/polymer#^2.0.0",
"iron-image": "PolymerElements/iron-image#^2.1.1",
"iron-ajax": "PolymerElements/iron-ajax#^2.0.2",
"iron-list": "PolymerElements/iron-list#^2.0.0",
Expand All @@ -36,20 +35,33 @@
"iron-selector": "PolymerElements/iron-selector#^2.0.0",
"paper-styles": "PolymerElements/paper-styles#^2.0.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^2.0.0",
"emojione": "ranks/emojione#^3.0.3",
"neon-animation": "PolymerElements/neon-animation#^2.0.0",
"web-animations-js": "web-animations/web-animations-js#^2.2.5",
"iron-icon": "PolymerElements/iron-icon#^2.0.0",
"iron-collapse": "PolymerElements/iron-collapse#^2.0.0",
"iron-a11y-keys": "PolymerElements/iron-a11y-keys#^2.0.0",
"paper-chip": "ThomasCybulski/paper-chip#^2.0.3",
"iron-meta": "PolymerElements/iron-meta#^2.0.0",
"iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#^2.0.0",
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^2.0.0",
"lodash": "lodash/lodash#^4.17.4",
"paper-input-autocomplete-chips": "WebPaperElements/paper-input-autocomplete-chips#^0.30.4"
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^2.0.0"
},
"devDependencies": {
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0",
"web-component-tester": "Polymer/web-component-tester#^6.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
},
"resolutions": {
"polymer": "^2.0.0",
"webcomponentsjs": "^v1.0.0",
"lodash": "^4.17.4",
"iron-flex-layout": "^2.0.0",
"iron-selector": "^2.0.0",
"paper-icon-button": "^2.0.0",
"paper-material": "^2.0.0",
"paper-styles": "^2.0.0",
"paper-ripple": "^2.0.0",
"iron-meta": "^2.0.0",
"iron-a11y-keys-behavior": "^2.0.0"
}
}
58 changes: 35 additions & 23 deletions emojione-badge.html
Original file line number Diff line number Diff line change
@@ -1,41 +1,53 @@
<link rel="import" href="../iron-fit-behavior/iron-fit-behavior.html">

<dom-module id="emojione-badge">
<template strip-whitespace>
<style is="custom-style">
:host {
position: absolute;
pointer-events: none;
padding: 8px;
border-radius: 4px;
background-color: rgba(0, 0, 0, .8);
color: #fff;
text-align: center;
z-index: 1;
}
<custom-style>
<style>
:host {
position: absolute;
pointer-events: none;
padding: 8px;
border-radius: 4px;
background-color: rgba(0, 0, 0, .8);
color: #fff;
text-align: center;
z-index: 1;
}

</style>
</style>
</custom-style>

<slot></slot>
</template>
<script>
Polymer({
class EmojioneBadge extends Polymer.Element {

is: 'emojione-badge',
static get is() {
return 'emojione-badge';
}

properties: {
position: {
type: Object
}
},

observers: ['onPositionChange(position)'],
static get properties() {
return {
position: {
type: Object
}
};
}

onPositionChange: function (position) {
static get observers() {
return ['onPositionChange(position)'];
}

onPositionChange(position) {
if (position) {
for (var i in position) {
this.style[i] = position[i] + 'px';
}
}
}
});
}

window.customElements.define(EmojioneBadge.is, EmojioneBadge);
</script>
</dom-module>
50 changes: 27 additions & 23 deletions emojione-emoji.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,47 @@

<dom-module id="emojione-emoji">
<template strip-whitespace>
<style is="custom-style">
:host {
position: relative;
outline: none;
height: 48px;
width: 48px;
padding: 8px;
box-sizing: border-box;
border-radius: 3px;
cursor: pointer;
@apply --emojione-emoji-container;
}
paper-ripple {
color: var(--paper-grey-400);
@apply --emojione-emoji-ripple;
}
<custom-style>
<style>
:host {
position: relative;
outline: none;
height: 48px;
width: 48px;
padding: 8px;
box-sizing: border-box;
border-radius: 3px;
cursor: pointer;
@apply --emojione-emoji-container;
}
paper-ripple {
color: var(--paper-grey-400);
@apply --emojione-emoji-ripple;
}

</style>
</style>
</custom-style>

<slot></slot>
</template>
<script>
Polymer({

is: 'emojione-emoji',
class EmojioneEmoji extends Polymer.mixinBehaviors([Polymer.PaperInkyFocusBehavior], Polymer.Element) {

behaviors: [Polymer.PaperInkyFocusBehavior],
static get is() {
return 'emojione-emoji';
}

/**
* @override the createRipple function in paper ripple
* https://github.com/PolymerElements/paper-behaviors/blob/master/paper-inky-focus-behavior.html
*/
_createRipple: function () {
_createRipple() {
const ripple = Polymer.PaperRippleBehavior._createRipple();
ripple.id = 'ink';
return ripple;
}
});
}

window.customElements.define(EmojioneEmoji.is, EmojioneEmoji);
</script>
</dom-module>
Loading

0 comments on commit 5df6488

Please sign in to comment.