diff --git a/dashboard-ui/scripts/forgotpassword.js b/dashboard-ui/scripts/forgotpassword.js
index a62115c9d9..e21abcc990 100644
--- a/dashboard-ui/scripts/forgotpassword.js
+++ b/dashboard-ui/scripts/forgotpassword.js
@@ -63,7 +63,9 @@
$(document).on('pageinitdepends', '#forgotPasswordPage', function () {
- $('.forgotPasswordForm').off('submit', onSubmit).on('submit', onSubmit);
+
+ var page = this;
+ $('.forgotPasswordForm', page).off('submit', onSubmit).on('submit', onSubmit);
});
})(window);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index 8406451f02..47e3ef4d75 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -78,8 +78,9 @@
var playerInfo = MediaController.getPlayerInfo();
var html = '';
-
html += '
';
@@ -124,84 +123,78 @@
var promise = MediaController.getTargets();
- var html = '
';
+ var html = '';
$(document.body).append(html);
require(['jqmicons']);
- setTimeout(function () {
+ var elem = $('#playerSelectionPanel').panel({}).trigger('create').panel("open").on("panelclose", function () {
- var elem = document.getElementById('playerSelectionPanel');
- elem.open();
+ $(this).off("panelclose").remove();
+ });
- promise.done(function (targets) {
+ promise.done(function (targets) {
- $('.players', elem).html(getTargetsHtml(targets)).trigger('create');
+ $('.players', elem).html(getTargetsHtml(targets)).trigger('create');
- $('.chkEnableMirrorMode', elem).on('change', function () {
- setMirrorModeEnabled(this.checked);
+ $('.chkEnableMirrorMode', elem).on('change', function () {
+ setMirrorModeEnabled(this.checked);
- if (this.checked && currentDisplayInfo) {
+ if (this.checked && currentDisplayInfo) {
- mirrorItem(currentDisplayInfo);
+ mirrorItem(currentDisplayInfo);
- }
+ }
- });
+ });
- $('.radioSelectPlayerTarget', elem).off('change').on('change', function () {
+ $('.radioSelectPlayerTarget', elem).off('change').on('change', function () {
- var supportsMirror = this.getAttribute('data-mirror') == 'true';
+ var supportsMirror = this.getAttribute('data-mirror') == 'true';
- if (supportsMirror) {
- $('.fldMirrorMode', elem).show();
- } else {
- $('.fldMirrorMode', elem).hide();
- }
-
- var playerName = this.getAttribute('data-playername');
- var targetId = this.getAttribute('data-targetid');
- var targetName = this.getAttribute('data-targetname');
- var deviceName = this.getAttribute('data-deviceName');
- var playableMediaTypes = this.getAttribute('data-mediatypes').split(',');
- var supportedCommands = this.getAttribute('data-commands').split(',');
-
- MediaController.trySetActivePlayer(playerName, {
- id: targetId,
- name: targetName,
- playableMediaTypes: playableMediaTypes,
- supportedCommands: supportedCommands,
- deviceName: deviceName
-
- });
-
- if (currentDisplayInfo) {
-
- mirrorIfEnabled(currentDisplayInfo);
- }
-
- });
-
- if ($('.radioSelectPlayerTarget:checked', elem)[0].getAttribute('data-mirror') == 'true') {
+ if (supportsMirror) {
$('.fldMirrorMode', elem).show();
} else {
$('.fldMirrorMode', elem).hide();
}
- });
- }, 350);
+ var playerName = this.getAttribute('data-playername');
+ var targetId = this.getAttribute('data-targetid');
+ var targetName = this.getAttribute('data-targetname');
+ var deviceName = this.getAttribute('data-deviceName');
+ var playableMediaTypes = this.getAttribute('data-mediatypes').split(',');
+ var supportedCommands = this.getAttribute('data-commands').split(',');
+
+ MediaController.trySetActivePlayer(playerName, {
+ id: targetId,
+ name: targetName,
+ playableMediaTypes: playableMediaTypes,
+ supportedCommands: supportedCommands,
+ deviceName: deviceName
+
+ });
+
+ if (currentDisplayInfo) {
+
+ mirrorIfEnabled(currentDisplayInfo);
+ }
+
+ });
+
+ if ($('.radioSelectPlayerTarget:checked', elem)[0].getAttribute('data-mirror') == 'true') {
+ $('.fldMirrorMode', elem).show();
+ } else {
+ $('.fldMirrorMode', elem).hide();
+ }
+ });
}
function bindKeys(controller) {
diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html
index 4bba1732bd..128a5c3fdb 100644
--- a/dashboard-ui/vulcanize-out.html
+++ b/dashboard-ui/vulcanize-out.html
@@ -6716,6 +6716,8 @@ this.fire('dom-change');
'space:keyup': '_spaceKeyUpHandler',
},
+ _mouseEventRe: /^mouse/,
+
_tapHandler: function() {
if (this.toggles) {
// a tap is needed to toggle the active state
@@ -6736,7 +6738,33 @@ this.fire('dom-change');
this.fire('change');
},
- _downHandler: function() {
+ _eventSourceIsPrimaryInput: function(event) {
+ event = event.detail.sourceEvent || event;
+
+ // Always true for non-mouse events....
+ if (!this._mouseEventRe.test(event.type)) {
+ return true;
+ }
+
+ // http://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons
+ if ('buttons' in event) {
+ return event.buttons === 1;
+ }
+
+ // http://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/which
+ if (typeof event.which === 'number') {
+ return event.which < 2;
+ }
+
+ // http://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button
+ return event.button < 1;
+ },
+
+ _downHandler: function(event) {
+ if (!this._eventSourceIsPrimaryInput(event)) {
+ return;
+ }
+
this._setPointerDown(true);
this._setPressed(true);
this._setReceivedFocusFromKeyboard(false);
@@ -12315,6 +12343,10 @@ is separate from validation, and `allowed-pattern` does not affect how the input
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+