From 1448539857705193422a6f47b709b264e9f74be1 Mon Sep 17 00:00:00 2001 From: Argo-MacBookPro Date: Thu, 2 Aug 2018 16:58:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0tooltip=E7=BB=84=E4=BB=B6dispose=E4=BB=A3=E6=9B=BFdest?= =?UTF-8?q?roy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.Admin/wwwroot/js/Longbow.Common.js | 10 +- Bootstrap.Admin/wwwroot/js/Settings.js | 2 +- .../wwwroot/js/longbow.validate.js | 514 +++++++++--------- 3 files changed, 263 insertions(+), 263 deletions(-) diff --git a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js index 4501ef12..68d5abbb 100644 --- a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js +++ b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js @@ -326,9 +326,9 @@ return ($(op.header).outerHeight() + $(op.content).outerHeight() + this.outerHeight() > $(window).height()) ? this.removeClass('fixed') : this.addClass('fixed'); }, lgbTooltip: function (options) { - if (/show|hide|destroy/.test(options)) { + if (/show|hide|dispose/.test(options)) { this.tooltip(options); - if (options === 'destroy') this.removeAttr('data-original-title'); + if (options === 'dispose') this.removeAttr('data-original-title'); } else { this.tooltip($.extend({ delay: { "show": 100, "hide": 100 } }, options)); @@ -336,9 +336,9 @@ return this; }, lgbPopover: function (options) { - if (/show|hide|destroy/.test(options)) { + if (/show|hide|dispose/.test(options)) { this.popover(options); - if (options === 'destroy') this.removeAttr('data-original-title'); + if (options === 'dispose') this.removeAttr('data-original-title'); } else { this.popover($.extend({ placement: 'auto' }, options)); @@ -369,7 +369,7 @@ $(element).parents('.form-group').addClass(errorClass).removeClass(validClass); }, unhighlight: function (element, errorClass, validClass) { - $(element).lgbTooltip('destroy').parents('.form-group').removeClass(errorClass).addClass(validClass); + $(element).lgbTooltip('dispose').parents('.form-group').removeClass(errorClass).addClass(validClass); }, errorPlacement: function (label, element) { var $ele = $(element); diff --git a/Bootstrap.Admin/wwwroot/js/Settings.js b/Bootstrap.Admin/wwwroot/js/Settings.js index 90cecfc9..8ee01b36 100644 --- a/Bootstrap.Admin/wwwroot/js/Settings.js +++ b/Bootstrap.Admin/wwwroot/js/Settings.js @@ -148,7 +148,7 @@ listCacheUrl(options); }).last().trigger('click'); $sortable.on('click', '.btn', function () { - $(this).lgbTooltip('destroy'); + $(this).lgbTooltip('dispose'); listCache({ url: $(this).attr('data-url') }); listCacheUrl(); }); diff --git a/Bootstrap.Admin/wwwroot/js/longbow.validate.js b/Bootstrap.Admin/wwwroot/js/longbow.validate.js index 97e52074..14cd9686 100644 --- a/Bootstrap.Admin/wwwroot/js/longbow.validate.js +++ b/Bootstrap.Admin/wwwroot/js/longbow.validate.js @@ -1,261 +1,261 @@ -(function ($) { - 'use strict'; - - var Validate = function (element, options) { - var that = this; - this.$element = $(element) - this.options = $.extend({ - pendingRequest: 0, - pending: {}, - successList: [], - optional: function () { return false; }, - invalid: {}, - getLength: function (value, element) { - switch (element.nodeName.toLowerCase()) { - case "select": - return $("option:selected", element).length; - case "input": - if (this.checkable(element)) { - return this.findByName(element.name).filter(":checked").length; - } - } - return value.length; - }, - checkable: function (element) { - return (/radio|checkbox/i).test(element.type); - }, - depend: function (param, element) { - return this.dependTypes[typeof param] ? this.dependTypes[typeof param](param, element) : true; - }, - dependTypes: { - "boolean": function (param) { - return param; - }, - "string": function (param, element) { - return !!$(param, element.form).length; - }, - "function": function (param, element) { - return param(element); - } - }, - findByName: function (name) { - return $('body').find("[name='" + this.escapeCssMeta(name) + "']"); - }, - escapeCssMeta: function (string) { - return string.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g, "\\$1"); - }, - previousValue: function (element, method) { - method = typeof method === "string" && method || "remote"; - return $.data(element, "previousValue") || $.data(element, "previousValue", { - old: null, - valid: true, - message: "请修正本字段" - }); - }, - startRequest: function (element) { - if (!this.pending[element.name]) { - this.pendingRequest++; - $(element).addClass(this.settings.pendingClass); - this.pending[element.name] = true; - } - }, - stopRequest: function (element, valid) { - this.pendingRequest--; - - // Sometimes synchronization fails, make sure pendingRequest is never < 0 - if (this.pendingRequest < 0) { - this.pendingRequest = 0; - } - delete this.pending[element.name]; - $(element).removeClass(this.settings.pendingClass); - }, - showErrors: function (errors) { - for (var name in errors) { - var element = document.getElementById(name); - var $element = $(element); +(function ($) { + 'use strict'; + + var Validate = function (element, options) { + var that = this; + this.$element = $(element) + this.options = $.extend({ + pendingRequest: 0, + pending: {}, + successList: [], + optional: function () { return false; }, + invalid: {}, + getLength: function (value, element) { + switch (element.nodeName.toLowerCase()) { + case "select": + return $("option:selected", element).length; + case "input": + if (this.checkable(element)) { + return this.findByName(element.name).filter(":checked").length; + } + } + return value.length; + }, + checkable: function (element) { + return (/radio|checkbox/i).test(element.type); + }, + depend: function (param, element) { + return this.dependTypes[typeof param] ? this.dependTypes[typeof param](param, element) : true; + }, + dependTypes: { + "boolean": function (param) { + return param; + }, + "string": function (param, element) { + return !!$(param, element.form).length; + }, + "function": function (param, element) { + return param(element); + } + }, + findByName: function (name) { + return $('body').find("[name='" + this.escapeCssMeta(name) + "']"); + }, + escapeCssMeta: function (string) { + return string.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g, "\\$1"); + }, + previousValue: function (element, method) { + method = typeof method === "string" && method || "remote"; + return $.data(element, "previousValue") || $.data(element, "previousValue", { + old: null, + valid: true, + message: "请修正本字段" + }); + }, + startRequest: function (element) { + if (!this.pending[element.name]) { + this.pendingRequest++; + $(element).addClass(this.settings.pendingClass); + this.pending[element.name] = true; + } + }, + stopRequest: function (element, valid) { + this.pendingRequest--; + + // Sometimes synchronization fails, make sure pendingRequest is never < 0 + if (this.pendingRequest < 0) { + this.pendingRequest = 0; + } + delete this.pending[element.name]; + $(element).removeClass(this.settings.pendingClass); + }, + showErrors: function (errors) { + for (var name in errors) { + var element = document.getElementById(name); + var $element = $(element); that.tooltip.call(that, element, false); $element.lgbTooltip('show'); - } - }, - defaultMessage: function (element, rule) { - return that.defaultMessage(element, rule); - }, - resetInternals: function () { }, - errorsFor: function (element) { + } + }, + defaultMessage: function (element, rule) { + return that.defaultMessage(element, rule); + }, + resetInternals: function () { }, + errorsFor: function (element) { that.tooltip.call(that, element, true); - }, - settings: $.validator.defaults - }, this.defaults(), options) - this.$element.on('input.lgb.validate', this.options.childClass, function () { - if (!that.validElement(this)) $(this).lgbTooltip('show'); - }).on('inserted.bs.tooltip', this.options.childClass, function () { - $('#' + $(this).attr('aria-describedby')).addClass(that.options.errorClass); - }); - if (!this.options.validButtons) return; - this.$element.find(this.options.validButtons).on('click.lgb.validate', function (e) { - var valid = that.valid(); - $(this).attr(Validate.DEFAULTS.validResult, valid); - if (!valid) { - e.preventDefault(); - e.stopImmediatePropagation(); - } - }); - }; - - Validate.VERSION = '1.0'; - - Validate.DEFAULTS = { - validClass: 'has-success', - errorClass: 'has-error', - childClass: '[data-valid="true"]', - validResult: 'data-valid-result' - }; - - Validate.prototype.defaults = function () { - return $.extend({ container: this.$element }, Validate.DEFAULTS, { - validClass: this.$element.attr('data-validclass'), - errorClass: this.$element.attr('data-errorclass'), - validButtons: this.$element.attr('data-valid-button'), - container: this.$element.attr('data-container') - }); - }; - - Validate.prototype.reset = function () { - var css = this.options.validClass + ' ' + this.options.errorClass; - this.$element.find(this.options.childClass).each(function () { - var $this = $(this); - $this.lgbTooltip('destroy'); - $this.parent().removeClass(css); - }); - }; - - Validate.prototype.valid = function () { - var that = this; - var op = this.options; - var $firstElement = null; - - this.$element.find(this.options.childClass + ':visible').each(function () { - if (!that.validElement(this) && $firstElement == null) $firstElement = $(this); - }); - if ($firstElement) $firstElement.tooltip('show'); - return $firstElement == null; - }; - - Validate.prototype.validElement = function (element) { - var result = this.check(element); - this.tooltip(element, result); - return result - }; - - Validate.prototype.tooltip = function (element, valid) { - if (valid == "pending") return; - - var op = this.options; - var $this = $(element); - var $parent = $this.parent(); - try { - if (valid) $this.lgbTooltip('destroy'); - else { - if (!$parent.hasClass('has-error')) $this.lgbTooltip({ container: $(window).width() > 768 ? op.container : (this.$element.find('.modal-body') || this.$element.find('.panel-body') || op.container) }); - } - } - catch (e) { - - } - if (!valid) { - $parent.removeClass(op.validClass).addClass(op.errorClass); - } - else { - $parent.removeClass(op.errorClass).addClass(op.validClass); - } - }; - - Validate.prototype.check = function (element) { - var result = true; - var $this = $(element); - - var methods = this.rules(element); - for (var rule in methods) { - if ($.isFunction($.validator.methods[rule])) { - result = $.validator.methods[rule].call(this.options, $this.val(), element, methods[rule]); - if (!result || result === "pending") { - $this.attr('data-original-title', this.defaultMessage(element, { method: rule, parameters: methods[rule] })); - break; - } - } - else { - console.log('没有匹配的方法 ' + rule); - } - } - return result; - }; - - Validate.prototype.defaultMessage = function (element, rule) { - var message = $(element).attr('data-' + rule.method + '-msg') || (rule.method == 'required' && $(element).attr('placeholder')) || $.validator.messages[rule.method]; - var theregex = /\$?\{(\d+)\}/g; - if (typeof message === "function") { - message = message.call(this, rule.parameters, element); - } else if (theregex.test(message)) { - message = $.validator.format(message.replace(theregex, "{$1}"), rule.parameters); - } - return message; - }; - - Validate.prototype.attributeRules = function (element) { - var rules = {}, $element = $(element), value; - - $.each(["radioGroup"], function () { - value = element.getAttribute(this); - if (value === "") value = true; - value = !!value; - rules[this] = value; - if (value) { - rules["required"] = false; - $(element).on('change', ':radio', function () { - $(this).trigger('input.lgb.validate'); - }); - } - }); - $.each(["remote"], function () { - if (element.getAttribute(this)) { - if (element.name === "") element.name = element.id; - var para = $(element).attr(this); - rules[this] = $.formatUrl(para); - } - }); - return rules; - }; - - Validate.prototype.rules = function (element) { - var $this = $(element); - var rules = $this.data('lgb.Validate.Rules'); - if (!rules) $this.data('lgb.Validate.Rules', (rules = $.validator.normalizeRules($.extend({ required: true }, $.validator.classRules(element), $.validator.attributeRules(element), this.attributeRules(element))))); - return rules; - }; - - function Plugin(option) { - return this.each(function () { - var $this = $(this); - var data = $this.data('lgb.Validate'); - var options = typeof option == 'object' && option; - - if (!data && /valid|defaults/.test(option)) return - if (!data) $this.data('lgb.Validate', (data = new Validate(this, options))); - if (typeof option == 'string') data[option](); - }) - }; - - $.fn.lgbValidate = Plugin; - $.fn.lgbValidate.Constructor = Validate; - $.fn.lgbValidator = function () { - return this.data('lgb.Validate'); - }; - $.fn.lgbValid = function () { - var $this = this; - return $this.attr(Validate.DEFAULTS.validResult) == 'true'; - }; - - $(function () { - $('[data-toggle="LgbValidate"]').lgbValidate(); - }); + }, + settings: $.validator.defaults + }, this.defaults(), options) + this.$element.on('input.lgb.validate', this.options.childClass, function () { + if (!that.validElement(this)) $(this).lgbTooltip('show'); + }).on('inserted.bs.tooltip', this.options.childClass, function () { + $('#' + $(this).attr('aria-describedby')).addClass(that.options.errorClass); + }); + if (!this.options.validButtons) return; + this.$element.find(this.options.validButtons).on('click.lgb.validate', function (e) { + var valid = that.valid(); + $(this).attr(Validate.DEFAULTS.validResult, valid); + if (!valid) { + e.preventDefault(); + e.stopImmediatePropagation(); + } + }); + }; + + Validate.VERSION = '1.0'; + + Validate.DEFAULTS = { + validClass: 'has-success', + errorClass: 'has-error', + childClass: '[data-valid="true"]', + validResult: 'data-valid-result' + }; + + Validate.prototype.defaults = function () { + return $.extend({ container: this.$element }, Validate.DEFAULTS, { + validClass: this.$element.attr('data-validclass'), + errorClass: this.$element.attr('data-errorclass'), + validButtons: this.$element.attr('data-valid-button'), + container: this.$element.attr('data-container') + }); + }; + + Validate.prototype.reset = function () { + var css = this.options.validClass + ' ' + this.options.errorClass; + this.$element.find(this.options.childClass).each(function () { + var $this = $(this); + $this.lgbTooltip('dispose'); + $this.parent().removeClass(css); + }); + }; + + Validate.prototype.valid = function () { + var that = this; + var op = this.options; + var $firstElement = null; + + this.$element.find(this.options.childClass + ':visible').each(function () { + if (!that.validElement(this) && $firstElement == null) $firstElement = $(this); + }); + if ($firstElement) $firstElement.tooltip('show'); + return $firstElement == null; + }; + + Validate.prototype.validElement = function (element) { + var result = this.check(element); + this.tooltip(element, result); + return result + }; + + Validate.prototype.tooltip = function (element, valid) { + if (valid == "pending") return; + + var op = this.options; + var $this = $(element); + var $parent = $this.parent(); + try { + if (valid) $this.lgbTooltip('dispose'); + else { + if (!$parent.hasClass('has-error')) $this.lgbTooltip({ container: $(window).width() > 768 ? op.container : (this.$element.find('.modal-body') || this.$element.find('.panel-body') || op.container) }); + } + } + catch (e) { + + } + if (!valid) { + $parent.removeClass(op.validClass).addClass(op.errorClass); + } + else { + $parent.removeClass(op.errorClass).addClass(op.validClass); + } + }; + + Validate.prototype.check = function (element) { + var result = true; + var $this = $(element); + + var methods = this.rules(element); + for (var rule in methods) { + if ($.isFunction($.validator.methods[rule])) { + result = $.validator.methods[rule].call(this.options, $this.val(), element, methods[rule]); + if (!result || result === "pending") { + $this.attr('data-original-title', this.defaultMessage(element, { method: rule, parameters: methods[rule] })); + break; + } + } + else { + console.log('没有匹配的方法 ' + rule); + } + } + return result; + }; + + Validate.prototype.defaultMessage = function (element, rule) { + var message = $(element).attr('data-' + rule.method + '-msg') || (rule.method == 'required' && $(element).attr('placeholder')) || $.validator.messages[rule.method]; + var theregex = /\$?\{(\d+)\}/g; + if (typeof message === "function") { + message = message.call(this, rule.parameters, element); + } else if (theregex.test(message)) { + message = $.validator.format(message.replace(theregex, "{$1}"), rule.parameters); + } + return message; + }; + + Validate.prototype.attributeRules = function (element) { + var rules = {}, $element = $(element), value; + + $.each(["radioGroup"], function () { + value = element.getAttribute(this); + if (value === "") value = true; + value = !!value; + rules[this] = value; + if (value) { + rules["required"] = false; + $(element).on('change', ':radio', function () { + $(this).trigger('input.lgb.validate'); + }); + } + }); + $.each(["remote"], function () { + if (element.getAttribute(this)) { + if (element.name === "") element.name = element.id; + var para = $(element).attr(this); + rules[this] = $.formatUrl(para); + } + }); + return rules; + }; + + Validate.prototype.rules = function (element) { + var $this = $(element); + var rules = $this.data('lgb.Validate.Rules'); + if (!rules) $this.data('lgb.Validate.Rules', (rules = $.validator.normalizeRules($.extend({ required: true }, $.validator.classRules(element), $.validator.attributeRules(element), this.attributeRules(element))))); + return rules; + }; + + function Plugin(option) { + return this.each(function () { + var $this = $(this); + var data = $this.data('lgb.Validate'); + var options = typeof option == 'object' && option; + + if (!data && /valid|defaults/.test(option)) return + if (!data) $this.data('lgb.Validate', (data = new Validate(this, options))); + if (typeof option == 'string') data[option](); + }) + }; + + $.fn.lgbValidate = Plugin; + $.fn.lgbValidate.Constructor = Validate; + $.fn.lgbValidator = function () { + return this.data('lgb.Validate'); + }; + $.fn.lgbValid = function () { + var $this = this; + return $this.attr(Validate.DEFAULTS.validResult) == 'true'; + }; + + $(function () { + $('[data-toggle="LgbValidate"]').lgbValidate(); + }); })(jQuery); \ No newline at end of file