Changeset 752225

Timestamp:

08/06/2013 11:11:15 AM (13 years ago)

Author:

OptimalDevs

Message:

Update to 2.5

Location:

sexy-login/trunk

Files:

• inc/ajax.php (modified) (1 diff)
• js/jquery.blockUI.js (modified) (17 diffs)
• readme.txt (modified) (2 diffs)
• sexy-login-init.php (modified) (1 diff)
• sl-config.php (modified) (1 diff)

sexy-login/trunk/inc/ajax.php

@@ -51 +51 @@
             
         } else {
-            $to_search = array( '?', '¿' );
-            $result['error']    = ( $login->errors ) ? str_replace( $to_search, '', eregi_replace( "<a[^>]*>.*</a>", '', $login->get_error_message() ) ) : '<strong>ERROR</strong>: ' . esc_html__( 'Please enter your username and password to login.', 'sl-domain' );
+        
+            $result['error']    = ( $login->errors ) ? strip_tags( $login->get_error_message() ) : '<strong>ERROR</strong>: ' . esc_html__( 'Please enter your username and password to login.', 'sl-domain' );
             $result['captcha']  = ( $sl_options['enable_captcha'] && $attempts->update_attempts() >= SL_LOGIN_ATTEMPTS ) ? true : false;
         

sexy-login/trunk/js/jquery.blockUI.js

@@ -1 +1 @@
 /*!
  * jQuery blockUI plugin
- * Version 2.53 (01-NOV-2012)
- * @requires jQuery v1.3 or later
+ * Version 2.64.0-2013.07.18
+ * @requires jQuery v1.7 or later
  *
  * Examples at: http://malsup.com/jquery/block/
- * Copyright (c) 2007-2012 M. Alsup
+ * Copyright (c) 2007-2013 M. Alsup
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
@@ -14 +14 @@
 
 ;(function() {
+/*jshint eqeqeq:false curly:false latedef:false */
 "use strict";
 
     function setup($) {
-        if (/^1\.(0|1|2)/.test($.fn.jquery)) {
-            /*global alert:true */
-            alert('blockUI requires jQuery v1.3 or later!  You are using v' + $.fn.jquery);
-            return;
-        }
-
         $.fn._fadeIn = $.fn.fadeIn;
 
@@ -28 +23 @@
 
         // this bit is to ensure we don't call setExpression when we shouldn't (with extra muscle to handle
-        // retarded userAgent strings on Vista)
+        // confusing userAgent strings on Vista)
         var msie = /MSIE/.test(navigator.userAgent);
-        var ie6  = /MSIE 6.0/.test(navigator.userAgent);
+        var ie6  = /MSIE 6.0/.test(navigator.userAgent) && ! /MSIE 8.0/.test(navigator.userAgent);
         var mode = document.documentMode || 0;
-        // var setExpr = msie && (($.browser.version < 8 && !mode) || mode < 8);
         var setExpr = $.isFunction( document.createElement('div').style.setExpression );
 
@@ -45 +39 @@
             if (message) $m.append('<h2>'+message+'</h2>');
             if (timeout === undefined) timeout = 3000;
-            $.blockUI({
-                message: $m, fadeIn: 700, fadeOut: 1000, centerY: false,
-                timeout: timeout, showOverlay: false,
-                onUnblock: onClose,
-                css: $.blockUI.defaults.growlCSS
+
+            // Added by konapun: Set timeout to 30 seconds if this growl is moused over, like normal toast notifications
+            var callBlock = function(opts) {
+                opts = opts || {};
+
+                $.blockUI({
+                    message: $m,
+                    fadeIn : typeof opts.fadeIn  !== 'undefined' ? opts.fadeIn  : 700,
+                    fadeOut: typeof opts.fadeOut !== 'undefined' ? opts.fadeOut : 1000,
+                    timeout: typeof opts.timeout !== 'undefined' ? opts.timeout : timeout,
+                    centerY: false,
+                    showOverlay: false,
+                    onUnblock: onClose,
+                    css: $.blockUI.defaults.growlCSS
+                });
+            };
+
+            callBlock();
+            var nonmousedOpacity = $m.css('opacity');
+            $m.mouseover(function() {
+                callBlock({
+                    fadeIn: 0,
+                    timeout: 30000
+                });
+
+                var displayBlock = $('.blockMsg');
+                displayBlock.stop(); // cancel fadeout if it has started
+                displayBlock.fadeTo(300, 1); // make it easier to read the message by removing transparency
+            }).mouseout(function() {
+                $('.blockMsg').fadeOut(1000);
             });
+            // End konapun additions
         };
 
         // plugin method for blocking element content
         $.fn.block = function(opts) {
+            if ( this[0] === window ) {
+                $.blockUI( opts );
+                return this;
+            }
             var fullOpts = $.extend({}, $.blockUI.defaults, opts || {});
             this.each(function() {
@@ -64 +88 @@
 
             return this.each(function() {
-                if ($.css(this,'position') == 'static')
+                if ($.css(this,'position') == 'static') {
                     this.style.position = 'relative';
+                    $(this).data('blockUI.static', true);
+                }
                 this.style.zoom = 1; // force 'hasLayout' in ie
                 install(this, opts);
@@ -73 +99 @@
         // plugin method for unblocking element content
         $.fn.unblock = function(opts) {
+            if ( this[0] === window ) {
+                $.unblockUI( opts );
+                return this;
+            }
             return this.each(function() {
                 remove(this, opts);
@@ -78 +108 @@
         };
 
-        $.blockUI.version = 2.53; // 2nd generation blocking at no extra cost!
+        $.blockUI.version = 2.60; // 2nd generation blocking at no extra cost!
 
         // override these in your code to change the default behavior and style
@@ -116 +146 @@
             overlayCSS:  {
                 backgroundColor:    '#000',
-                opacity:                0.6,
+                opacity:            0.6,
                 cursor:             'wait'
             },
@@ -183 +213 @@
             focusInput: true,
 
+            // elements that can receive focus
+            focusableElements: ':input:enabled:visible',
+
             // suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity)
             // no longer needed in 2012
@@ -281 +314 @@
                 if ( opts.title ) {
                     s += '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || '&nbsp;')+'</div>';
-                }  
+                }
                 s += '<div class="ui-widget-content ui-dialog-content"></div>';
                 s += '</div>';
@@ -402 +435 @@
             if (full) {
                 pageBlock = lyr3[0];
-                pageBlockEls = $(':input:enabled:visible',pageBlock);
+                pageBlockEls = $(opts.focusableElements,pageBlock);
                 if (opts.focusInput)
                     setTimeout(focus, 20);
@@ -423 +456 @@
         // remove the block
         function remove(el, opts) {
+            var count;
             var full = (el == window);
             var $el = $(el);
@@ -457 +491 @@
 
             if (opts.fadeOut) {
-                els.fadeOut(opts.fadeOut);
-                setTimeout(function() { reset(els,data,opts,el); }, opts.fadeOut);
+                count = els.length;
+                els.stop().fadeOut(opts.fadeOut, function() {
+                    if ( --count === 0)
+                        reset(els,data,opts,el);
+                });
             }
             else
@@ -466 +503 @@
         // move blocking element back into the DOM where it started
         function reset(els,data,opts,el) {
+            var $el = $(el);
+            if ( $el.data('blockUI.isBlocked') )
+                return;
+
             els.each(function(i,o) {
                 // remove via DOM calls so we don't lose event handlers
@@ -477 +518 @@
                 if (data.parent)
                     data.parent.appendChild(data.el);
-                $(el).removeData('blockUI.history');
+                $el.removeData('blockUI.history');
+            }
+
+            if ($el.data('blockUI.static')) {
+                $el.css('position', 'static'); // #22
             }
 
@@ -500 +545 @@
 
             // don't bind events when overlay is not in use or if bindEvents is false
-            if (!opts.bindEvents || (b && !opts.showOverlay))
+            if (!full || !opts.bindEvents || (b && !opts.showOverlay))
                 return;
 
             // bind anchors and inputs for mouse and key events
-            var events = 'mousedown mouseup keydown keypress touchstart touchend touchmove';
+            var events = 'mousedown mouseup keydown keypress keyup touchstart touchend touchmove';
             if (b)
                 $(document).bind(events, opts, handler);
@@ -518 +563 @@
         function handler(e) {
             // allow tab navigation (conditionally)
-            if (e.keyCode && e.keyCode == 9) {
+            if (e.type === 'keydown' && e.keyCode && e.keyCode == 9) {
                 if (pageBlock && e.data.constrainTabKey) {
                     var els = pageBlockEls;

sexy-login/trunk/readme.txt

@@ -4 +4 @@
 Tags: login, register, sexy, ajax, authentication, captcha, sidebar, widget, user, ssl, secury, admin bar, ReCaptcha, cross browser, lost password
 Requires at least: 3.0
-Tested up to: 3.5.1
-Stable tag: 2.4
+Tested up to: 3.6
+Stable tag: 2.5
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -61 +61 @@
 That's one of the problems of cache systems. We can't modify third party plugins.
 
+= I have problems with Captcha.  =
+
+If you are using another plugin that also uses "reCAPTCHA" it is possible that one of the two "reCAPTCHA" doesn't work correctly. The reason is that "reCAPTCHA" only allows one instance on each page.
+
 == Changelog ==
 
+= 2.5 =
+* Now it's compatible with WordPres 3.6.
+* Fixed javascript error: "blockUI requires jQuery v1.3 or later! You are using v1.10.2".
+* Updated blockUI library.
+* Fixed problems when user tries to Log on.
+
 = 2.4 =
-* Fixed javascript error related with style. Now it's compatible with IE8 and lower versions.
+* Fixed javascript error related to the style that produced an error in IE8 and below.
 
 = 2.3 =

sexy-login/trunk/sexy-login-init.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/extend/plugins/sexy-login/
 Description: The sexiest login widget for Wordpress!
-Version: 2.4
+Version: 2.5
 Author: OptimalDevs
 Author URI: http://optimaldevs.com/

sexy-login/trunk/sl-config.php

@@ -7 +7 @@
 define( 'SL_LOGIN_ATTEMPTS_LAPSE', 10 );
 define( 'SL_LOSTPWD_TIME_LAPSE', 10 );
-define( 'SL_VERSION', '2.4' );
+define( 'SL_VERSION', '2.5' );
 define( 'SL_PLUGIN_ROOT_URL', plugin_dir_url( __FILE__ ) );