quick fix on popup animation ghost

DemocracyEarth · Oct 31, 2017 · dd852b4 · dd852b4 · medied · Oct 31, 2017
1 parent de8d0f2
commit dd852b4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
@@ -461,5 +461,6 @@
   "you": "You",
   "all-members": "Other Members",
   "your-delegations": "Your Delegations",
-  "unlogged-cant-vote": "You need to be logged in to vote."
+  "unlogged-cant-vote": "You need to be logged in to vote.",
+  "email-recovery-instructions": "Password reset instructions will be sent to the Email used to register an account."
 }
diff --git a/imports/ui/modules/popup.js b/imports/ui/modules/popup.js
@@ -149,7 +149,6 @@ const _animate = (display, id) => {
     $(divId).css('opacity', '0');
     $(divId).velocity({ opacity: 1 }, { duration: (animationSettings.duration / 2) });
   } else {
-    console.log('HIDE IT');
     $(divId).css('opacity', '1');
     $(divId).velocity({ opacity: 0 }, {
       duration: (animationSettings.duration / 2),

diff --git a/imports/ui/templates/components/identity/login/ForgotPassword.jsx b/imports/ui/templates/components/identity/login/ForgotPassword.jsx
@@ -75,6 +75,9 @@ export default class ForgotPassword extends Component {
               <input id="recovery-email" type="text" placeholder={TAPi18n.__('email-sample')} className="w-input login-input" />
               {warning}
             </div>
+            <div className="w-clearfix login-field">
+              {TAPi18n.__('email-recovery-instructions')}
+            </div>
             <div type="submit" id="recovery-button" className="button login-button" onClick={this.handleSubmit}>
               <div>{TAPi18n.__('continue-password-recovery')}</div>
             </div>

diff --git a/imports/ui/templates/widgets/popup/popup.js b/imports/ui/templates/widgets/popup/popup.js
@@ -9,29 +9,22 @@ import { animationSettings } from '/imports/ui/modules/animation';
 import './popup.html';
 
 function autoPosition(height) {
-  console.log('TEST - autoPosition()');
   const screenH = $(window).height();
   let pos = parseInt(((screenH - height) / 2) - 10, 10);
   if (pos <= 70) {
-    console.log('TEST - pos <=70');
     pos = 70;
   }
-  console.log('TEST - pos: ', pos);
   return pos;
 }
 
 Template.popup.onRendered(() => {
-  console.log('TEST - onRendered()');
   $(`#card-${Template.instance().data.id}`).attr('legacyheight', $(`#card-${Template.instance().data.id}`)[0].getBoundingClientRect().height);
   $(`#card-${Template.instance().data.id}`).resize(function () {
     if (Meteor.Device.isPhone()) {
       const divId = `#${this.id}`;
-      console.log('TEST - divId: ', divId);
-      if (!$(divId).is('.velocity-animating')) {
-        console.log('TEST - invoke autoPosition from onRendered');
+      if (!$(divId).is('.velocity-animating') && divId !== '#login-null') {
         const newMargin = autoPosition($(divId)[0].getBoundingClientRect().height);
         const newHeight = $(divId)[0].getBoundingClientRect().height;
-        // $(divId).css('height', $(divId).attr('legacyheight'));
         $(divId).velocity({ marginTop: newMargin }, { duration: animationSettings.duration, easing: 'ease-out' });
         Meteor.setTimeout(function () {
           $(divId).velocity('stop');
@@ -53,11 +46,7 @@ Template.popup.helpers({
     return Meteor.Device.isPhone();
   },
   modalPosition() {
-    console.log('TEST - modalPosition()');
     if (Session.get(this.id).position.height) {
-      console.log('TEST - true IF in modalPosition()');
-      console.log('TEST - this.id ', this.id);
-      console.log('TEST - invoke autoPosition from modalPosition');
       return `margin-top: ${autoPosition($(`#card-${this.id}`)[0].getBoundingClientRect().height)}px;`;
     }
     return '';
@@ -71,10 +60,7 @@ Template.popup.events({
       animatePopup(false, this.id);
     }
   },
-  'click .modal'(event) {
-    console.log('click');
-    console.log(event.target.id);
-    console.log(this.id);
+  'mousedown .modal'(event) {
     event.stopPropagation();
     if (event.target.id === this.id) {
       animatePopup(false, this.id);