Warn user if he leaves profile editing page #6520
closes #7473 closes #6589
This commit is contained in:
parent
0d232f1d1b
commit
df1139234f
6 changed files with 13 additions and 2 deletions
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
* Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455)
|
* Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455)
|
||||||
|
* Warn users if they leave the profile editing page with unsaved changes [#7473](https://github.com/diaspora/diaspora/pull/7473)
|
||||||
|
|
||||||
# 0.6.6.0
|
# 0.6.6.0
|
||||||
|
|
||||||
|
|
|
||||||
1
Gemfile
1
Gemfile
|
|
@ -112,6 +112,7 @@ source "https://rails-assets.org" do
|
||||||
|
|
||||||
gem "rails-assets-autosize", "3.0.20"
|
gem "rails-assets-autosize", "3.0.20"
|
||||||
gem "rails-assets-blueimp-gallery", "2.25.0"
|
gem "rails-assets-blueimp-gallery", "2.25.0"
|
||||||
|
gem "rails-assets-jquery.are-you-sure", "1.9.0"
|
||||||
gem "rails-assets-jquery-placeholder", "2.3.1"
|
gem "rails-assets-jquery-placeholder", "2.3.1"
|
||||||
gem "rails-assets-jquery-textchange", "0.2.3"
|
gem "rails-assets-jquery-textchange", "0.2.3"
|
||||||
gem "rails-assets-perfect-scrollbar", "0.6.16"
|
gem "rails-assets-perfect-scrollbar", "0.6.16"
|
||||||
|
|
|
||||||
|
|
@ -529,6 +529,8 @@ GEM
|
||||||
rails-assets-jquery (>= 1.6)
|
rails-assets-jquery (>= 1.6)
|
||||||
rails-assets-jquery-textchange (0.2.3)
|
rails-assets-jquery-textchange (0.2.3)
|
||||||
rails-assets-jquery
|
rails-assets-jquery
|
||||||
|
rails-assets-jquery.are-you-sure (1.9.0)
|
||||||
|
rails-assets-jquery (>= 1.4.2)
|
||||||
rails-assets-jquery.slimscroll (1.3.8)
|
rails-assets-jquery.slimscroll (1.3.8)
|
||||||
rails-assets-jquery.ui (1.11.4)
|
rails-assets-jquery.ui (1.11.4)
|
||||||
rails-assets-jquery (>= 1.6)
|
rails-assets-jquery (>= 1.6)
|
||||||
|
|
@ -847,6 +849,7 @@ DEPENDENCIES
|
||||||
rails-assets-jquery (= 2.2.4)!
|
rails-assets-jquery (= 2.2.4)!
|
||||||
rails-assets-jquery-placeholder (= 2.3.1)!
|
rails-assets-jquery-placeholder (= 2.3.1)!
|
||||||
rails-assets-jquery-textchange (= 0.2.3)!
|
rails-assets-jquery-textchange (= 0.2.3)!
|
||||||
|
rails-assets-jquery.are-you-sure (= 1.9.0)!
|
||||||
rails-assets-markdown-it (= 8.3.0)!
|
rails-assets-markdown-it (= 8.3.0)!
|
||||||
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
|
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
|
||||||
rails-assets-markdown-it-diaspora-mention (= 1.1.1)!
|
rails-assets-markdown-it-diaspora-mention (= 1.1.1)!
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ app.pages.Settings = Backbone.View.extend({
|
||||||
el: $(".aspect_dropdown"),
|
el: $(".aspect_dropdown"),
|
||||||
form: $("#post-default-aspects")
|
form: $("#post-default-aspects")
|
||||||
});
|
});
|
||||||
|
$("#update_profile_form").areYouSure();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// @license-end
|
// @license-end
|
||||||
|
|
|
||||||
|
|
@ -41,5 +41,6 @@
|
||||||
//= require blueimp-gallery/blueimp-gallery-indicator
|
//= require blueimp-gallery/blueimp-gallery-indicator
|
||||||
//= require leaflet
|
//= require leaflet
|
||||||
//= require api/authorization_page
|
//= require api/authorization_page
|
||||||
// = require bootstrap-markdown/bootstrap-markdown
|
//= require bootstrap-markdown/bootstrap-markdown
|
||||||
// = require helpers/markdown_editor
|
//= require helpers/markdown_editor
|
||||||
|
//= require jquery.are-you-sure
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,10 @@ Feature: editing your profile
|
||||||
And I should see "#starwars" within "ul#as-selections-tags"
|
And I should see "#starwars" within "ul#as-selections-tags"
|
||||||
And the "#profile_public_details" bootstrap-switch should be off
|
And the "#profile_public_details" bootstrap-switch should be off
|
||||||
|
|
||||||
|
When I fill in "profile_bio" with "This is a new awesome bio"
|
||||||
|
And I reject the alert after I follow "My activity"
|
||||||
|
Then I should be on my edit profile page
|
||||||
|
|
||||||
When I fill in "profile[tag_string]" with "#kamino"
|
When I fill in "profile[tag_string]" with "#kamino"
|
||||||
And I press the first ".as-result-item" within ".as-results"
|
And I press the first ".as-result-item" within ".as-results"
|
||||||
And I toggle the "#profile_public_details" bootstrap-switch
|
And I toggle the "#profile_public_details" bootstrap-switch
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue