Changeset 11373

Timestamp:

01/04/2017 08:45:50 PM (9 years ago)

Author:

slaffik

Message:

Messages: Upgrade jquery bgiframe.

WordPress 4.2 (our minimal version we support) has jQuery 1.11.2. jquery.bgiframe v3.0.1 (current latest) says it needs jQuery >= 1.2.6.

Props wpdennis.
Fixes #7339.

Location:

trunk/src/bp-messages/js/autocomplete

Files:

• jquery.bgiframe.js (modified) (1 diff)
• license.bgiframe.txt (modified) (2 diffs)

trunk/src/bp-messages/js/autocomplete/jquery.bgiframe.js

@@ -1 @@
-/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
- * Licensed under the MIT License (license.bgiframe.txt).
+/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
+ * Licensed under the MIT License (LICENSE.txt).
  *
- * Version 2.1.2
+ * Version 3.0.1
+ *
+ * Requires jQuery >= 1.2.6
  */
 
-(function($){
+(function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS style for Browserify
+        module.exports = factory;
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
+    $.fn.bgiframe = function(s) {
+        s = $.extend({
+            top         : 'auto', // auto == borderTopWidth
+            left        : 'auto', // auto == borderLeftWidth
+            width       : 'auto', // auto == offsetWidth
+            height      : 'auto', // auto == offsetHeight
+            opacity     : true,
+            src         : 'javascript:false;',
+            conditional : /MSIE 6\.0/.test(navigator.userAgent) // expresion or function. return false to prevent iframe insertion
+        }, s);
 
-$.fn.bgiframe = ($.browser.msie && /msie 6\.0/i.test(navigator.userAgent) ? function(s) {
-    s = $.extend({
-        top     : 'auto', // auto == .currentStyle.borderTopWidth
-        left    : 'auto', // auto == .currentStyle.borderLeftWidth
-        width   : 'auto', // auto == offsetWidth
-        height  : 'auto', // auto == offsetHeight
-        opacity : true,
-        src     : 'javascript:false;'
-    }, s);
-    var html = '<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+
-                   'style="display:block;position:absolute;z-index:-1;'+
-                       (s.opacity !== false?'filter:Alpha(Opacity=\'0\');':'')+
-                       'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+
-                       'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+
-                       'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+
-                       'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+
-                '"/>';
-    return this.each(function() {
-        if ( $(this).children('iframe.bgiframe').length === 0 )
-            this.insertBefore( document.createElement(html), this.firstChild );
-    });
-} : function() { return this; });
+        // wrap conditional in a function if it isn't already
+        if (!$.isFunction(s.conditional)) {
+            var condition = s.conditional;
+            s.conditional = function() { return condition; };
+        }
 
-// old alias
-$.fn.bgIframe = $.fn.bgiframe;
+        var $iframe = $('<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+
+                           'style="display:block;position:absolute;z-index:-1;"/>');
 
-function prop(n) {
-    return n && n.constructor === Number ? n + 'px' : n;
-}
+        return this.each(function() {
+            var $this = $(this);
+            if ( s.conditional(this) === false ) { return; }
+            var existing = $this.children('iframe.bgiframe');
+            var $el = existing.length === 0 ? $iframe.clone() : existing;
+            $el.css({
+                'top': s.top == 'auto' ?
+                    ((parseInt($this.css('borderTopWidth'),10)||0)*-1)+'px' : prop(s.top),
+                'left': s.left == 'auto' ?
+                    ((parseInt($this.css('borderLeftWidth'),10)||0)*-1)+'px' : prop(s.left),
+                'width': s.width == 'auto' ? (this.offsetWidth + 'px') : prop(s.width),
+                'height': s.height == 'auto' ? (this.offsetHeight + 'px') : prop(s.height),
+                'opacity': s.opacity === true ? 0 : undefined
+            });
 
-})(jQuery);
+            if ( existing.length === 0 ) {
+                $this.prepend($el);
+            }
+        });
+    };
+
+    // old alias
+    $.fn.bgIframe = $.fn.bgiframe;
+
+    function prop(n) {
+        return n && n.constructor === Number ? n + 'px' : n;
+    }
+
+}));

trunk/src/bp-messages/js/autocomplete/license.bgiframe.txt

@@ -1 @@
-Copyright 2010, Brandon Aaron (http://brandonaaron.net/)
- 
+Copyright 2013, Brandon Aaron (http://brandonaaron.net/)
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -8 +8 @@
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
- 
+
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
- 
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF