From cf94f2c773bbed22ac7fc766ecc225200574ab5c Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Tue, 8 Aug 2017 20:30:34 -0400 Subject: [PATCH] Couple UX Fixes for Firefox (#26) --- src/mailer/mailCheck.js | 4 ++-- src/public/js/angularjs/controllers/accounts.js | 14 ++++++++++++-- src/sass/partials/common.sass | 3 +++ src/sass/partials/tLoader.sass | 8 ++++++++ src/views/layout/main.hbs | 10 +++++----- src/views/partials/nav.hbs | 2 +- src/views/plugins.hbs | 2 +- src/views/settings.hbs | 6 +++--- src/views/subviews/profile.hbs | 8 ++++---- 9 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/mailer/mailCheck.js b/src/mailer/mailCheck.js index 0843ee796..1938c04a9 100644 --- a/src/mailer/mailCheck.js +++ b/src/mailer/mailCheck.js @@ -76,7 +76,7 @@ mailCheck.fetchMail = function(DEFAULT_TICKET_TYPE) { openInbox(function(err, box) { if (err) { mailCheck.Imap.end(); - winston.warn(err); + winston.debug(err); //throw err; } @@ -173,7 +173,7 @@ mailCheck.fetchMail = function(DEFAULT_TICKET_TYPE) { }); } ], function(err, type) { - if (err || type == null) return cb(err); + if (err || type === null) return cb(err); var HistoryItem = { action: 'ticket:created', diff --git a/src/public/js/angularjs/controllers/accounts.js b/src/public/js/angularjs/controllers/accounts.js index 0583c4827..7dd8f4e5e 100644 --- a/src/public/js/angularjs/controllers/accounts.js +++ b/src/public/js/angularjs/controllers/accounts.js @@ -198,9 +198,19 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'uikit', 'history' }; $scope.accountEditPic = function() { + throttledAccountPicClick(); + }; + + function throttledAccountPicClick() { $timeout(function() { - $('#profileImageInput').trigger('click'); + var $profileImageInput = $('#profileImageInput'); + $profileImageInput.on('click', function(event) { + //This function is a firefox hack to stop it from spawning 100000 file dialogs + event.stopPropagation(); + }); + + $profileImageInput.trigger('click'); }, 0); - }; + } }); }); \ No newline at end of file diff --git a/src/sass/partials/common.sass b/src/sass/partials/common.sass index d52358e53..e658a88cd 100644 --- a/src/sass/partials/common.sass +++ b/src/sass/partials/common.sass @@ -8,6 +8,9 @@ max-width: 100% float: left +.clear + clear: both + .hide display: none diff --git a/src/sass/partials/tLoader.sass b/src/sass/partials/tLoader.sass index e6451bc5f..9d1f8d8b2 100644 --- a/src/sass/partials/tLoader.sass +++ b/src/sass/partials/tLoader.sass @@ -12,18 +12,24 @@ @keyframes bounceC 0% -webkit-transform: translateY(0%) + -moz-transform: translateY(0%) 50% -webkit-transform: translateY(-700%) + -moz-transform: translateY(-80%) 100% -webkit-transform: translateY(0%) + -moz-transform: translateY(0%) @keyframes bounce 0% -webkit-transform: scaleY(0.6) translateY(50%) + -moz-transform: scaleY(0.6) translateY(50%) 50% -webkit-transform: scaleY(1.02) translateY(-10%) + -moz-transform: scaleY(1.02) translateY(-10%) 100% -webkit-transform: scaleY(0.7) translateY(40%) + -moz-transform: scaleY(0.7) translateY(40%) .t path animation: bounce .7s infinite alternate ease-in-out @@ -55,6 +61,7 @@ left: 30% transform-origin: 0 100% -ms-transform-origin: 0 100% + -moz-transform-origin: 13px 100% -webkit-transform-origin: 13px 100% transform: scale(1.5) // transform: translate(2200px, 6400px) scale(256) @@ -63,6 +70,7 @@ path transform-origin: 50% 100% -ms-transform-origin: 50% 100% + -moz-transform-origin: 50% 100% -webkit-transform-origin: 50% 100% svg path diff --git a/src/views/layout/main.hbs b/src/views/layout/main.hbs index 02cd9a9d5..e1f89184d 100644 --- a/src/views/layout/main.hbs +++ b/src/views/layout/main.hbs @@ -29,18 +29,18 @@ - - + + - +
- - + +
diff --git a/src/views/partials/nav.hbs b/src/views/partials/nav.hbs index 4e8ebdfbc..937798a78 100644 --- a/src/views/partials/nav.hbs +++ b/src/views/partials/nav.hbs @@ -50,7 +50,7 @@