Merge remote-tracking branch 'upstream/pull/1820'

[rails.git] / app / assets / javascripts / user.js

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 44872a78c6f12c2432df5fa40f268406b0109c30..bdf0443056329df566e07fbc880dd8ea3153b79c 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -28,6 +28,7 @@ $(document).ready(function () {
       .removeClass('leaflet-control-locate leaflet-bar')
       .addClass('control-locate')
       .children("a")
       .removeClass('leaflet-control-locate leaflet-bar')
       .addClass('control-locate')
       .children("a")

+      .attr('href', '#')

       .removeClass('leaflet-bar-part leaflet-bar-part-single')
       .addClass('control-button');
 
       .removeClass('leaflet-bar-part leaflet-bar-part-single')
       .addClass('control-button');
 


@@ -84,6 +85,10 @@ $(document).ready(function () {
 
   $("select#user_auth_provider").on("change", updateAuthUID);
 
 
   $("select#user_auth_provider").on("change", updateAuthUID);
 

+  $("input#user_image").on("change", function () {
+    $("#image_action_new").prop("checked", true);
+  });
+

   function enableAuth() {
     $("#auth_prompt").hide();
     $("#auth_field").show();
   function enableAuth() {
     $("#auth_prompt").hide();
     $("#auth_field").show();