From 2e32b5f467e9bb66e339c56308ad8a82163566e6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 15 Jul 2016 13:20:00 +0200 Subject: upgrade to jquery-3.1 and minor fixes --- view/css/bootstrap-red.css | 1 + view/css/conversation.css | 4 +- view/css/mod_directory.css | 2 +- view/js/jquery-migrate-1.1.1.js | 511 -------------------------------------- view/js/jquery.js | 8 +- view/js/main.js | 9 +- view/php/theme_init.php | 2 +- view/theme/redbasic/css/style.css | 3 - view/tpl/contact_block.tpl | 1 - view/tpl/cover_photo_widget.tpl | 20 +- 10 files changed, 30 insertions(+), 531 deletions(-) delete mode 100644 view/js/jquery-migrate-1.1.1.js diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 20df16446..b68517e25 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -5,6 +5,7 @@ nav .badge { position: relative; top: -49px; + left: 2px; float: left; font-size: 10px; line-height: 20px; diff --git a/view/css/conversation.css b/view/css/conversation.css index b6e316121..68aa8bfbe 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -121,7 +121,7 @@ a.wall-item-name-link { } .wall-item-content { - overflow: auto; + overflow: hidden; } .wall-item-content h1, @@ -316,4 +316,4 @@ code.inline-code { img.smiley.emoji:hover { width: 32px; height: 32px; -} \ No newline at end of file +} diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index 9bfea856d..af89e597d 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -30,5 +30,5 @@ } .directory-collapse { - overflow: auto; + overflow: hidden; } diff --git a/view/js/jquery-migrate-1.1.1.js b/view/js/jquery-migrate-1.1.1.js deleted file mode 100644 index e99f954e6..000000000 --- a/view/js/jquery-migrate-1.1.1.js +++ /dev/null @@ -1,511 +0,0 @@ -/*! - * jQuery Migrate - v1.1.1 - 2013-02-16 - * https://github.com/jquery/jquery-migrate - * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT - */ -(function( jQuery, window, undefined ) { -// See http://bugs.jquery.com/ticket/13335 -// "use strict"; - - -var warnedAbout = {}; - -// List of warnings already given; public read only -jQuery.migrateWarnings = []; - -// Set to true to prevent console output; migrateWarnings still maintained -// jQuery.migrateMute = false; - -// Show a message on the console so devs know we're active -if ( !jQuery.migrateMute && window.console && console.log ) { - console.log("JQMIGRATE: Logging is active"); -} - -// Set to false to disable traces that appear with warnings -if ( jQuery.migrateTrace === undefined ) { - jQuery.migrateTrace = true; -} - -// Forget any warnings we've already given; public -jQuery.migrateReset = function() { - warnedAbout = {}; - jQuery.migrateWarnings.length = 0; -}; - -function migrateWarn( msg) { - if ( !warnedAbout[ msg ] ) { - warnedAbout[ msg ] = true; - jQuery.migrateWarnings.push( msg ); - if ( window.console && console.warn && !jQuery.migrateMute ) { - console.warn( "JQMIGRATE: " + msg ); - if ( jQuery.migrateTrace && console.trace ) { - console.trace(); - } - } - } -} - -function migrateWarnProp( obj, prop, value, msg ) { - if ( Object.defineProperty ) { - // On ES5 browsers (non-oldIE), warn if the code tries to get prop; - // allow property to be overwritten in case some other plugin wants it - try { - Object.defineProperty( obj, prop, { - configurable: true, - enumerable: true, - get: function() { - migrateWarn( msg ); - return value; - }, - set: function( newValue ) { - migrateWarn( msg ); - value = newValue; - } - }); - return; - } catch( err ) { - // IE8 is a dope about Object.defineProperty, can't warn there - } - } - - // Non-ES5 (or broken) browser; just set the property - jQuery._definePropertyBroken = true; - obj[ prop ] = value; -} - -if ( document.compatMode === "BackCompat" ) { - // jQuery has never supported or tested Quirks Mode - migrateWarn( "jQuery is not compatible with Quirks Mode" ); -} - - -var attrFn = jQuery( "", { size: 1 } ).attr("size") && jQuery.attrFn, - oldAttr = jQuery.attr, - valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get || - function() { return null; }, - valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set || - function() { return undefined; }, - rnoType = /^(?:input|button)$/i, - rnoAttrNodeType = /^[238]$/, - rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - ruseDefault = /^(?:checked|selected)$/i; - -// jQuery.attrFn -migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" ); - -jQuery.attr = function( elem, name, value, pass ) { - var lowerName = name.toLowerCase(), - nType = elem && elem.nodeType; - - if ( pass ) { - // Since pass is used internally, we only warn for new jQuery - // versions where there isn't a pass arg in the formal params - if ( oldAttr.length < 4 ) { - migrateWarn("jQuery.fn.attr( props, pass ) is deprecated"); - } - if ( elem && !rnoAttrNodeType.test( nType ) && - (attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) { - return jQuery( elem )[ name ]( value ); - } - } - - // Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking - // for disconnected elements we don't warn on $( "