Merge branch 'remember-me' of OAuth3/issuer.html into v1.2
This commit is contained in:
		
						commit
						87820b3d24
					
				@ -69,7 +69,7 @@
 | 
				
			|||||||
            <img src="./img/pressed-check.png" class="check js-remember-status">
 | 
					            <img src="./img/pressed-check.png" class="check js-remember-status">
 | 
				
			||||||
            <!-- <span class="fa fa-2x fa-purple fa-square-o dap-remember-margin js-remember-status"></span> -->
 | 
					            <!-- <span class="fa fa-2x fa-purple fa-square-o dap-remember-margin js-remember-status"></span> -->
 | 
				
			||||||
            <span class="dap-remember-me noselect">Remember this device.</span>
 | 
					            <span class="dap-remember-me noselect">Remember this device.</span>
 | 
				
			||||||
            <input class="js-remember-checkbox hidden" type="checkbox"></input>
 | 
					            <input class="js-remember-checkbox hidden" type="checkbox" checked></input>
 | 
				
			||||||
          </label>
 | 
					          </label>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <button type="submit" class="btn btn-primary submit-btn dap-full-button-green js-submit-code-btn" disabled>Submit</button>
 | 
					        <button type="submit" class="btn btn-primary submit-btn dap-full-button-green js-submit-code-btn" disabled>Submit</button>
 | 
				
			||||||
 | 
				
			|||||||
@ -362,7 +362,13 @@ $(function () {
 | 
				
			|||||||
  function handleAuthorizationDialog() {
 | 
					  function handleAuthorizationDialog() {
 | 
				
			||||||
    return getSession(CONFIG.host).then(function (session) {
 | 
					    return getSession(CONFIG.host).then(function (session) {
 | 
				
			||||||
      return getGrants(session);
 | 
					      return getGrants(session);
 | 
				
			||||||
    }).catch(function () {
 | 
					    }).catch(function (e) {
 | 
				
			||||||
 | 
					      if(e) {
 | 
				
			||||||
 | 
					        console.error(
 | 
				
			||||||
 | 
					            "Error authing current session. Requiring re-login. Message: "
 | 
				
			||||||
 | 
					            , e.message
 | 
				
			||||||
 | 
					        );
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
      // TODO select the providers the client wants to show
 | 
					      // TODO select the providers the client wants to show
 | 
				
			||||||
      // providers=daplie.com,facebook.com,google.com // etc
 | 
					      // providers=daplie.com,facebook.com,google.com // etc
 | 
				
			||||||
      // TODO let the client specify switch_user
 | 
					      // TODO let the client specify switch_user
 | 
				
			||||||
 | 
				
			|||||||
@ -40,21 +40,18 @@ $('body').on('click', '.js-remember-label', function (ev) {
 | 
				
			|||||||
  var $this = $(this);
 | 
					  var $this = $(this);
 | 
				
			||||||
  if ($this.find('.js-remember-checkbox').is(':checked') === true) {
 | 
					  if ($this.find('.js-remember-checkbox').is(':checked') === true) {
 | 
				
			||||||
    $this.find('.js-remember-checkbox').prop( "checked", false );
 | 
					    $this.find('.js-remember-checkbox').prop( "checked", false );
 | 
				
			||||||
 | 
					    $this.find('.js-remember-status').attr("src", "./img/unpressed-check.png");
 | 
				
			||||||
  } else {
 | 
					  } else {
 | 
				
			||||||
    $this.find('.js-remember-checkbox').prop( "checked", true );
 | 
					    $this.find('.js-remember-checkbox').prop( "checked", true );
 | 
				
			||||||
 | 
					    $this.find('.js-remember-status').attr("src", "./img/pressed-check.png");
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$('body').on('click', '.check', function () {
 | 
					 | 
				
			||||||
  'use strict';
 | 
					 | 
				
			||||||
});
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
$('body').on('click', '.js-auth-li-enabled', function (ev) {
 | 
					$('body').on('click', '.js-auth-li-enabled', function (ev) {
 | 
				
			||||||
  'use strict';
 | 
					  'use strict';
 | 
				
			||||||
  ev.preventDefault();
 | 
					  ev.preventDefault();
 | 
				
			||||||
  ev.stopPropagation();
 | 
					  ev.stopPropagation();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
  var $this = $(this);
 | 
					  var $this = $(this);
 | 
				
			||||||
  var $hiddenCheckbox = $this.find('.js-auth-checkbox');
 | 
					  var $hiddenCheckbox = $this.find('.js-auth-checkbox');
 | 
				
			||||||
  var $img = $this.find('.check');
 | 
					  var $img = $this.find('.check');
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user