Skip to content

The Unified and Autonomous Development Platform

Simplify are-you-sure

Robin Shen03f0089fe57e
diff --git a/core/src/main/java/io/onedev/server/web/asset/areyousure/AreYouSureResourceReference.java b/core/src/main/java/io/onedev/server/web/asset/areyousure/AreYouSureResourceReference.java
deleted file mode 100644
index 5a6a84fd5d..0000000000
--- a/core/src/main/java/io/onedev/server/web/asset/areyousure/AreYouSureResourceReference.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.onedev.server.web.asset.areyousure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Application;
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
-
-public class AreYouSureResourceReference extends JavaScriptResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public AreYouSureResourceReference() {
- super(AreYouSureResourceReference.class, "jquery.are-you-sure.patched.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = new ArrayList<>();
- dependencies.add(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference()));
- return dependencies;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/asset/areyousure/jquery.are-you-sure.patched.js b/core/src/main/java/io/onedev/server/web/asset/areyousure/jquery.are-you-sure.patched.js
deleted file mode 100644
index 41816cd11e..0000000000
--- a/core/src/main/java/io/onedev/server/web/asset/areyousure/jquery.are-you-sure.patched.js
+++ /dev/null
@@ -1,194 +0,0 @@
-/*!
- * jQuery Plugin: Are-You-Sure (Dirty Form Detection)
- * https://github.com/codedance/jquery.AreYouSure/
- *
- * Copyright (c) 2012-2014, Chris Dance and PaperCut Software http://www.papercut.com/
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Author: [email protected]
- * Version: 1.8.0
- * Date: 22nd June 2014
- */
-(function($) {
-
- $.fn.areYouSure = function(options) {
-
- var settings = $.extend(
- {
- 'message' : 'You have unsaved changes!',
- 'dirtyClass' : 'dirty',
- 'change' : null,
- 'silent' : false,
- 'addRemoveFieldsMarksDirty' : false,
- 'fieldEvents' : 'change keyup propertychange input',
- 'fieldSelector': ":input:not(.no-dirtytrack):not(input[type=submit]):not(input[type=button]):not(button)"
- }, options);
-
- var getValue = function($field) {
- if ($field.hasClass('ays-ignore')
- || $field.hasClass('aysIgnore')
- || $field.attr('data-ays-ignore')
- || $field.attr('name') === undefined) {
- return null;
- }
-
- if ($field.is(':disabled')) {
- return 'ays-disabled';
- }
-
- var val;
- var type = $field.attr('type');
- if ($field.is('select')) {
- type = 'select';
- }
-
- switch (type) {
- case 'checkbox':
- case 'radio':
- val = $field.is(':checked');
- break;
- case 'select':
- if($field.val()) {
- val = $field.val().toString();
- } else if ($field.val() == "") {
- val = "";
- }
- break;
- default:
- val = $field.val();
- }
-
- return val;
- };
-
- var storeOrigValue = function($field) {
- $field.data('ays-orig', getValue($field));
- };
-
- var checkForm = function(evt) {
-
- var isFieldDirty = function($field) {
- var origValue = $field.data('ays-orig');
- if (!($field.is("form")) && undefined === origValue) {
- // Patched by Robin to return true here instead of false, as form fields
- // can often be replaced via Ajax while editing the form and this can
- // cause the stored original value missing
- return true;
- }
- return (getValue($field) != origValue);
- };
-
- var $form = ($(this).is('form'))
- ? $(this)
- : $(this).parents('form');
-
- // Test on the target first as it's the most likely to be dirty
- if (isFieldDirty($(evt.target))) {
- setDirtyStatus($form, true);
- return;
- }
-
- $fields = $form.find(settings.fieldSelector);
-
- if (settings.addRemoveFieldsMarksDirty) {
- // Check if field count has changed
- var origCount = $form.data("ays-orig-field-count");
- if (origCount != $fields.length) {
- setDirtyStatus($form, true);
- return;
- }
- }
-
- // Brute force - check each field
- var isDirty = false;
- $fields.each(function() {
- $field = $(this);
- if (isFieldDirty($field)) {
- isDirty = true;
- return false; // break
- }
- });
-
- setDirtyStatus($form, isDirty);
- };
-
- var initForm = function($form) {
- var fields = $form.find(settings.fieldSelector);
- $(fields).each(function() { storeOrigValue($(this)); });
- $(fields).unbind(settings.fieldEvents, checkForm);
- $(fields).bind(settings.fieldEvents, checkForm);
- $form.data("ays-orig-field-count", $(fields).length);
- setDirtyStatus($form, false);
- };
-
- var setDirtyStatus = function($form, isDirty) {
- var changed = isDirty != $form.hasClass(settings.dirtyClass);
- $form.toggleClass(settings.dirtyClass, isDirty);
-
- // Fire change event if required
- if (changed) {
- if (settings.change) settings.change.call($form, $form);
-
- if (isDirty) $form.trigger('dirty.areYouSure', [$form]);
- if (!isDirty) $form.trigger('clean.areYouSure', [$form]);
- $form.trigger('change.areYouSure', [$form]);
- }
- };
-
- var rescan = function() {
- var $form = $(this);
- var fields = $form.find(settings.fieldSelector);
- $(fields).each(function() {
- var $field = $(this);
- if (!$field.data('ays-orig')) {
- storeOrigValue($field);
- $field.bind(settings.fieldEvents, checkForm);
- }
- });
- // Check for changes while we're here
- $form.trigger('checkform.areYouSure');
- };
-
- var reinitialize = function() {
- initForm($(this));
- }
-
- if (!settings.silent && !window.aysUnloadSet) {
- window.aysUnloadSet = true;
- $(window).bind('beforeunload', function() {
- // added by robin to only ask for confirmation for leave-confirm forms
- $dirtyForms = $("form").filter('.leave-confirm.' + settings.dirtyClass);
- if ($dirtyForms.length == 0) {
- return;
- }
- // Prevent multiple prompts - seen on Chrome and IE
- if (navigator.userAgent.toLowerCase().match(/msie|chrome/)) {
- if (window.aysHasPrompted) {
- return;
- }
- window.aysHasPrompted = true;
- window.setTimeout(function() {window.aysHasPrompted = false;}, 900);
- }
- return settings.message;
- });
- }
-
- return this.each(function(elem) {
- if (!$(this).is('form')) {
- return;
- }
- var $form = $(this);
-
- $form.submit(function() {
- $form.removeClass(settings.dirtyClass);
- });
- $form.bind('reset', function() { setDirtyStatus($form, false); });
- // Add a custom events
- $form.bind('rescan.areYouSure', rescan);
- $form.bind('reinitialize.areYouSure', reinitialize);
- $form.bind('checkform.areYouSure', checkForm);
- initForm($form);
- });
- };
-})(jQuery);
diff --git a/core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java b/core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
index 8769fb4027..3d26e3fc3d 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
@@ -10,7 +10,6 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import de.agilecoders.wicket.core.Bootstrap;
import io.onedev.server.web.asset.align.AlignResourceReference;
-import io.onedev.server.web.asset.areyousure.AreYouSureResourceReference;
import io.onedev.server.web.asset.autosize.AutoSizeResourceReference;
import io.onedev.server.web.asset.cookies.CookiesResourceReference;
import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
@@ -32,7 +31,6 @@ public class BaseResourceReference extends JavaScriptResourceReference {
dependencies.add(JavaScriptHeaderItem.forReference(Bootstrap.getSettings().getJsResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new AlignResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new AutoSizeResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new AreYouSureResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.js
index f6469d0220..c80e2c9232 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -100,42 +100,22 @@ onedev.server = {
onedev.server.form.dirtyChanged($(this));
});
},
- removeDirty: function(triggerId, $forms) {
- $(function() {
- var $trigger = $("#" + triggerId);
-
- var previousClick;
-
- var handlers = $._data($trigger[0], 'events').click;
-
- $.each(handlers, function(i,f) {
- previousClick = f.handler;
- return false;
- });
-
- $trigger.unbind('click');
-
- $trigger.click(function(event){
- onedev.server.form.markClean($forms);
- previousClick(event);
- });
- });
- },
trackDirty: function(form) {
var $form = $(form);
if ($form.find(".dirty-aware").length != 0 || $form.hasClass("leave-confirm")) {
- $form.areYouSure({
- "silent": !$form.hasClass("leave-confirm"),
- "addRemoveFieldsMarksDirty": true,
- change: function() {
- onedev.server.form.dirtyChanged($(this));
- }
+ var fieldSelector = ":input:not(.no-dirtytrack):not(input[type=submit]):not(input[type=button]):not(button)";
+ var events = "change keyup propertychange input";
+ $form.find(fieldSelector).on(events, function() {
+ onedev.server.form.markDirty($form);
});
if ($form.find(".has-error").length != 0) {
$form.addClass("dirty");
}
onedev.server.form.dirtyChanged($form);
}
+ $form.submit(function() {
+ $form.removeClass("dirty");
+ });
},
dirtyChanged: function($form) {
$dirtyAware = $form.find(".dirty-aware");
@@ -160,9 +140,6 @@ onedev.server = {
$forms.each(function() {
onedev.server.form.trackDirty(this);
});
- var $form = $component.closest("form").not($component);
- if ($form.find(".dirty-aware").length != 0 || $form.hasClass("leave-confirm"))
- $form.trigger("checkform.areYouSure");
});
if (Wicket && Wicket.Ajax) {
@@ -182,6 +159,14 @@ onedev.server = {
processAjaxResponse.call(this, data, textStatus, jqXHR, context);
}
}
+
+ $(window).on("beforeunload", function() {
+ $dirtyForms = $("form").filter('.leave-confirm.dirty');
+ if ($dirtyForms.length != 0) {
+ return "There are unsaved changes";
+ }
+ });
+
},
confirmLeave: function(containerId) {
var $container;