From eb82bee4baf1ffe791661ad3ea7216df5f83f739 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 30 Jan 2016 16:35:16 -0500
Subject: [PATCH] merge from dev

---
 .../bower_components/emby-webcomponents/.bower.json       | 8 ++++----
 .../paperdialoghelper/paperdialoghelper.js                | 4 ++--
 dashboard-ui/bower_components/iron-selector/.bower.json   | 4 ++--
 dashboard-ui/bower_components/paper-ripple/.bower.json    | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index 5e498326de..228d4c4f52 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -15,12 +15,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.0.39",
-  "_release": "1.0.39",
+  "version": "1.0.40",
+  "_release": "1.0.40",
   "_resolution": {
     "type": "version",
-    "tag": "1.0.39",
-    "commit": "6986f948cb7f54ac18ede654a2f1e1e2d933bd2d"
+    "tag": "1.0.40",
+    "commit": "483fcf8659bb829dd12ec41c629c7ab7c380bbd8"
   },
   "_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "~1.0.0",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js b/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js
index 21cc312424..4de8810516 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js
@@ -115,13 +115,13 @@
         dlg.animationConfig = {
             // scale up
             'entry': {
-                name: options.entryAnimation || 'scale-up-animation',
+                name: dlg.entryAnimation,
                 node: dlg,
                 timing: { duration: entryAnimationDuration, easing: 'ease-out' }
             },
             // fade out
             'exit': {
-                name: 'fade-out-animation',
+                name: dlg.exitAnimation,
                 node: dlg,
                 timing: { duration: options.exitAnimationDuration || 400, easing: 'ease-in' }
             }
diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json
index aa1f383231..d583d34022 100644
--- a/dashboard-ui/bower_components/iron-selector/.bower.json
+++ b/dashboard-ui/bower_components/iron-selector/.bower.json
@@ -36,7 +36,7 @@
     "tag": "v1.1.0",
     "commit": "abd9ee7c29f0aae7b583abfe0af9db7f2555eabf"
   },
-  "_source": "git://github.com/polymerelements/iron-selector.git",
+  "_source": "git://github.com/PolymerElements/iron-selector.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-selector"
+  "_originalSource": "PolymerElements/iron-selector"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json
index 157225ee71..2f654d71c6 100644
--- a/dashboard-ui/bower_components/paper-ripple/.bower.json
+++ b/dashboard-ui/bower_components/paper-ripple/.bower.json
@@ -32,14 +32,14 @@
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
   },
   "ignore": [],
-  "homepage": "https://github.com/PolymerElements/paper-ripple",
+  "homepage": "https://github.com/polymerelements/paper-ripple",
   "_release": "1.0.5",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.5",
     "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
   },
-  "_source": "git://github.com/PolymerElements/paper-ripple.git",
+  "_source": "git://github.com/polymerelements/paper-ripple.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/paper-ripple"
+  "_originalSource": "polymerelements/paper-ripple"
 }
\ No newline at end of file