diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index 2f654d71c6..157225ee71 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 diff --git a/dashboard-ui/components/paperdialoghelper.js b/dashboard-ui/components/paperdialoghelper.js index 5d7b0816bf..514729587b 100644 --- a/dashboard-ui/components/paperdialoghelper.js +++ b/dashboard-ui/components/paperdialoghelper.js @@ -131,15 +131,17 @@ } }; - dlg.classList.add('popupEditor'); + if (options.size != 'auto') { + dlg.classList.add('popupEditor'); - if (options.size == 'small') { - dlg.classList.add('small-paper-dialog'); - } - else if (options.size == 'medium') { - dlg.classList.add('medium-paper-dialog'); - } else { - dlg.classList.add('fullscreen-paper-dialog'); + if (options.size == 'small') { + dlg.classList.add('small-paper-dialog'); + } + else if (options.size == 'medium') { + dlg.classList.add('medium-paper-dialog'); + } else { + dlg.classList.add('fullscreen-paper-dialog'); + } } var theme = options.theme || 'b'; diff --git a/dashboard-ui/scripts/actionsheet.js b/dashboard-ui/scripts/actionsheet.js index 09a49b2c93..3e23ec2108 100644 --- a/dashboard-ui/scripts/actionsheet.js +++ b/dashboard-ui/scripts/actionsheet.js @@ -105,8 +105,8 @@ } document.body.appendChild(dlg); - // The animations flicker in IE and Firefox (probably wherever the polyfill is used) - if (browserInfo.animate) { + // The animations flicker in IE + if (!browserInfo.msie) { dlg.animationConfig = { // scale up 'entry': { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 3c72d2378c..c1eb6d6f46 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -2831,31 +2831,12 @@ require(['components/paperdialoghelper', 'paper-dialog', 'paper-radio-button', 'paper-radio-group', 'scale-up-animation', 'fade-in-animation', 'fade-out-animation'], function (paperDialogHelper) { - var dlg = document.createElement('paper-dialog'); - - dlg.setAttribute('with-backdrop', 'with-backdrop'); - dlg.setAttribute('role', 'alertdialog'); - - dlg.entryAnimation = 'fade-in-animation'; - dlg.exitAnimation = 'fade-out-animation'; - - // The animations flicker in IE and Firefox (probably wherever the polyfill is used) - if (browserInfo.animate) { - dlg.animationConfig = { - // scale up - 'entry': { - name: 'scale-up-animation', - node: dlg, - timing: { duration: 160, easing: 'ease-out' } - }, - // fade out - 'exit': { - name: 'fade-out-animation', - node: dlg, - timing: { duration: 200, easing: 'ease-in' } - } - }; - } + var dlg = paperDialogHelper.createDialog({ + removeOnClose: true, + theme: 'a', + size: 'auto', + modal: false + }); var html = ''; @@ -2902,11 +2883,14 @@ dlg.innerHTML = html; document.body.appendChild(dlg); - dlg.addEventListener('iron-overlay-closed', function () { - dlg.parentNode.removeChild(dlg); - }); + var fireCallbackOnClose = false; - paperDialogHelper.open(dlg); + paperDialogHelper.open(dlg).then(function() { + + if (options.callback && fireCallbackOnClose) { + options.callback(); + } + }); $('.groupSortBy', dlg).on('iron-select', function () { @@ -2917,7 +2901,7 @@ options.query.StartIndex = 0; if (options.callback && changed) { - options.callback(); + fireCallbackOnClose = true; } }); @@ -2930,7 +2914,7 @@ options.query.StartIndex = 0; if (options.callback && changed) { - options.callback(); + fireCallbackOnClose = true; } }); });