facebook login fixed

DemocracyEarth · Oct 30, 2017 · de8d0f2 · de8d0f2
1 parent 7d8b1d0
commit de8d0f2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/imports/ui/modules/popup.js b/imports/ui/modules/popup.js
@@ -149,6 +149,7 @@ 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,12 +75,6 @@ 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">
-              <label htmlFor="name" className="login-label login-label-form">TESTING, TO REMOVE</label>
-              <img src="/images/mail-closed.png" className="login-icon" alt="mail-closed" />
-              <input id="recovery-email" type="text" placeholder="TESING, TO REMOVE" className="w-input login-input" />
-              {warning}
-            </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/layout/navigation/navigation.js b/imports/ui/templates/layout/navigation/navigation.js
@@ -62,7 +62,7 @@ function hideBar() {
 * @summary verifies if current screen should have back button on navbar
 */
 function displayBackButton() {
-  return (Meteor.Device.isPhone() && (Router.current().url.search('/vote') >= 0 || Router.current().url.search('/peer') >= 0));
+  return (Meteor.Device.isPhone() && (Router.current().url.search('/idea/') >= 0 || Router.current().url.search('/peer/') >= 0));
 }
 
 /**

diff --git a/imports/ui/templates/widgets/popup/popup.js b/imports/ui/templates/widgets/popup/popup.js
@@ -12,7 +12,7 @@ function autoPosition(height) {
   console.log('TEST - autoPosition()');
   const screenH = $(window).height();
   let pos = parseInt(((screenH - height) / 2) - 10, 10);
-  if (pos <= 70) { 
+  if (pos <= 70) {
     console.log('TEST - pos <=70');
     pos = 70;
   }
@@ -72,6 +72,9 @@ Template.popup.events({
     }
   },
   'click .modal'(event) {
+    console.log('click');
+    console.log(event.target.id);
+    console.log(this.id);
     event.stopPropagation();
     if (event.target.id === this.id) {
       animatePopup(false, this.id);