From: Jan-Christoph Borchardt Date: Tue, 6 May 2014 10:30:43 +0000 (+0200) Subject: infield label removal: remove JS file and references to it X-Git-Tag: v7.0.0alpha2~130^2~8 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4ca665ac10978216be91b58f395b0dd00f4b9540;p=nextcloud-server.git infield label removal: remove JS file and references to it --- diff --git a/core/js/core.json b/core/js/core.json index f1e0ba883d0..4815116c338 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -4,7 +4,6 @@ "jquery-migrate-1.2.1.min.js", "jquery-ui-1.10.0.custom.js", "jquery-showpassword.js", - "jquery.infieldlabel.js", "jquery.placeholder.js", "jquery-tipsy.js", "underscore.js" diff --git a/core/js/jquery.infieldlabel.js b/core/js/jquery.infieldlabel.js deleted file mode 100644 index fad15102bcb..00000000000 --- a/core/js/jquery.infieldlabel.js +++ /dev/null @@ -1,177 +0,0 @@ -/* - * jquery.infieldlabel - * A simple jQuery plugin for adding labels that sit over a form field and fade away when the fields are populated. - * - * Copyright (c) 2009 - 2013 Doug Neiner (http://code.dougneiner.com) - * Source: https://github.com/dcneiner/In-Field-Labels-jQuery-Plugin - * Dual licensed MIT or GPL - * MIT (http://www.opensource.org/licenses/mit-license) - * GPL (http://www.opensource.org/licenses/gpl-license) - * - * @version 0.1.3 - */ -(function ($) { - - $.InFieldLabels = function (label, field, options) { - // To avoid scope issues, use 'base' instead of 'this' - // to reference this class from internal events and functions. - var base = this; - - // Access to jQuery and DOM versions of each element - base.$label = $(label); - base.label = label; - - base.$field = $(field); - base.field = field; - - base.$label.data("InFieldLabels", base); - base.showing = true; - - base.init = function () { - var initialSet; - - // Merge supplied options with default options - base.options = $.extend({}, $.InFieldLabels.defaultOptions, options); - - // Check if the field is already filled in - // add a short delay to handle autocomplete - setTimeout(function() { - if (base.$field.val() !== "") { - base.$label.hide(); - base.showing = false; - } else { - base.$label.show(); - base.showing = true; - } - }, 200); - - base.$field.focus(function () { - base.fadeOnFocus(); - }).blur(function () { - base.checkForEmpty(true); - }).bind('keydown.infieldlabel', function (e) { - // Use of a namespace (.infieldlabel) allows us to - // unbind just this method later - base.hideOnChange(e); - }).bind('paste', function () { - // Since you can not paste an empty string we can assume - // that the fieldis not empty and the label can be cleared. - base.setOpacity(0.0); - }).change(function () { - base.checkForEmpty(); - }).bind('onPropertyChange', function () { - base.checkForEmpty(); - }).bind('keyup.infieldlabel', function () { - base.checkForEmpty(); - }); - - if ( base.options.pollDuration > 0 ) { - initialSet = setInterval( function () { - if (base.$field.val() !== "") { - base.$label.hide(); - base.showing = false; - clearInterval( initialSet ); - } - }, base.options.pollDuration ); - - } - }; - - // If the label is currently showing - // then fade it down to the amount - // specified in the settings - base.fadeOnFocus = function () { - if (base.showing) { - base.setOpacity(base.options.fadeOpacity); - } - }; - - base.setOpacity = function (opacity) { - base.$label.stop().animate({ opacity: opacity }, base.options.fadeDuration); - base.showing = (opacity > 0.0); - }; - - // Checks for empty as a fail safe - // set blur to true when passing from - // the blur event - base.checkForEmpty = function (blur) { - if (base.$field.val() === "") { - base.prepForShow(); - base.setOpacity(blur ? 1.0 : base.options.fadeOpacity); - } else { - base.setOpacity(0.0); - } - }; - - base.prepForShow = function () { - if (!base.showing) { - // Prepare for a animate in... - base.$label.css({opacity: 0.0}).show(); - - // Reattach the keydown event - base.$field.bind('keydown.infieldlabel', function (e) { - base.hideOnChange(e); - }); - } - }; - - base.hideOnChange = function (e) { - if ( - (e.keyCode === 16) || // Skip Shift - (e.keyCode === 9) // Skip Tab - ) { - return; - } - - if (base.showing) { - base.$label.hide(); - base.showing = false; - } - - // Remove keydown event to save on CPU processing - base.$field.unbind('keydown.infieldlabel'); - }; - - // Run the initialization method - base.init(); - }; - - $.InFieldLabels.defaultOptions = { - fadeOpacity: 0.5, // Once a field has focus, how transparent should the label be - fadeDuration: 300, // How long should it take to animate from 1.0 opacity to the fadeOpacity - pollDuration: 0, // If set to a number greater than zero, this will poll until content is detected in a field - enabledInputTypes: [ "text", "search", "tel", "url", "email", "password", "number", "textarea" ] - }; - - - $.fn.inFieldLabels = function (options) { - var allowed_types = options && options.enabledInputTypes || $.InFieldLabels.defaultOptions.enabledInputTypes; - - return this.each(function () { - // Find input or textarea based on for= attribute - // The for attribute on the label must contain the ID - // of the input or textarea element - var for_attr = $(this).attr('for'), field, restrict_type; - if (!for_attr) { - return; // Nothing to attach, since the for field wasn't used - } - - // Find the referenced input or textarea element - field = document.getElementById( for_attr ); - if ( !field ) { - return; // No element found - } - - // Restrict input type - restrict_type = $.inArray( field.type, allowed_types ); - - if ( restrict_type === -1 && field.nodeName !== "TEXTAREA" ) { - return; // Again, nothing to attach - } - - // Only create object for matched input types and textarea - (new $.InFieldLabels(this, field, options)); - }); - }; - -}(jQuery)); diff --git a/core/js/js.js b/core/js/js.js index 1c4fb98c60c..834916b2e3f 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1039,11 +1039,6 @@ function initCore() { setShowPassword($('#pass2'), $('label[for=personal-show]')); setShowPassword($('#dbpass'), $('label[for=dbpassword]')); - //use infield labels - $("label.infield").inFieldLabels({ - pollDuration: 100 - }); - var checkShowCredentials = function() { var empty = false; $('input#user, input#password').each(function() {