diff options
| -rw-r--r-- | bower.json | 3 | ||||
| -rw-r--r-- | core/css/jquery-tipsy.css | 25 | ||||
| -rw-r--r-- | core/js/core.json | 4 | ||||
| -rw-r--r-- | core/js/jquery-tipsy.js | 242 | ||||
| -rw-r--r-- | core/vendor/.gitignore | 6 | ||||
| -rw-r--r-- | core/vendor/bootstrap/js/tooltip.js (renamed from core/js/tooltip.js) | 16 | ||||
| -rw-r--r-- | lib/base.php | 2 |
7 files changed, 11 insertions, 287 deletions
diff --git a/bower.json b/bower.json index e039b5f223b..06badc71206 100644 --- a/bower.json +++ b/bower.json @@ -25,6 +25,7 @@ "zxcvbn": "*", "snapjs": "~2.0.0-rc1", "strengthify": "0.4.1", - "underscore": "~1.6.0" + "underscore": "~1.6.0", + "bootstrap": "~3.3.5" } } diff --git a/core/css/jquery-tipsy.css b/core/css/jquery-tipsy.css deleted file mode 100644 index 957385a269f..00000000000 --- a/core/css/jquery-tipsy.css +++ /dev/null @@ -1,25 +0,0 @@ -.tipsy { font-size:10px; position:absolute; padding:5px; z-index:100000; } -.tipsy-inner { background-color:#000; color:#FFF; max-width:200px; padding:5px 8px 4px 8px; text-align:center; } - -/* Rounded corners */ -.tipsy-inner { border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; } - -/* Uncomment for shadow */ -/*.tipsy-inner { box-shadow:0 0 5px #000000; -webkit-box-shadow:0 0 5px #000000; -moz-box-shadow:0 0 5px #000000; }*/ - -.tipsy-arrow { position:absolute; width:0; height:0; border:5px solid transparent; } - -/* Rules to colour arrows */ -.tipsy-arrow-n { border-bottom-color:#000; } -.tipsy-arrow-s { border-top-color:#000; } -.tipsy-arrow-e { border-left-color:#000; } -.tipsy-arrow-w { border-right-color:#000; } - -.tipsy-n .tipsy-arrow, .tipsy-nw .tipsy-arrow, .tipsy-ne .tipsy-arrow { top:0; border-top:none; } -.tipsy-s .tipsy-arrow, .tipsy-sw .tipsy-arrow, .tipsy-se .tipsy-arrow { bottom:0; border-bottom:none; } -.tipsy-n .tipsy-arrow, .tipsy-s .tipsy-arrow { left:50%; margin-left:-5px; } -.tipsy-nw .tipsy-arrow, .tipsy-sw .tipsy-arrow { left:10px; } -.tipsy-ne .tipsy-arrow, .tipsy-se .tipsy-arrow { right:10px; } -.tipsy-e .tipsy-arrow, .tipsy-w .tipsy-arrow { top:50%; margin-top:-5px; } -.tipsy-e .tipsy-arrow { right:0; border-right:none; } -.tipsy-w .tipsy-arrow { left:0; border-left:none; } diff --git a/core/js/core.json b/core/js/core.json index 668f87a2d84..5bf6b8878f1 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -6,11 +6,11 @@ "underscore/underscore.js", "moment/min/moment-with-locales.js", "handlebars/handlebars.js", - "blueimp-md5/js/md5.js" + "blueimp-md5/js/md5.js", + "bootstrap/js/tooltip.js" ], "libraries": [ "jquery-showpassword.js", - "tooltip.js", "jquery.avatar.js", "placeholder.js" ], diff --git a/core/js/jquery-tipsy.js b/core/js/jquery-tipsy.js deleted file mode 100644 index ef4bbfd87a1..00000000000 --- a/core/js/jquery-tipsy.js +++ /dev/null @@ -1,242 +0,0 @@ -// tipsy, facebook style tooltips for jquery -// version 1.0.0a -// (c) 2008-2010 jason frame [jason@onehackoranother.com] -// released under the MIT license - -(function($) { - - function maybeCall(thing, ctx) { - return (typeof thing == 'function') ? (thing.call(ctx)) : thing; - }; - - function Tipsy(element, options) { - this.$element = $(element); - this.options = options; - this.enabled = true; - this.fixTitle(); - }; - - Tipsy.prototype = { - show: function() { - var title = this.getTitle(); - if (title && this.enabled) { - var $tip = this.tip(); - - $tip.find('.tipsy-inner')[this.options.html ? 'html' : 'text'](title); - $tip[0].className = 'tipsy'; // reset classname in case of dynamic gravity - $tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).prependTo(document.body); - - var pos = $.extend({}, this.$element.offset(), { - width: this.$element[0].offsetWidth, - height: this.$element[0].offsetHeight - }); - - if (this.options.className) { - $tip.addClass(maybeCall(this.options.className, this.$element[0])); - } - - var actualWidth = $tip[0].offsetWidth, - actualHeight = $tip[0].offsetHeight, - gravity = maybeCall(this.options.gravity, this.$element[0]); - - var tp; - switch (gravity.charAt(0)) { - case 'n': - tp = {top: pos.top + pos.height + this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2}; - break; - case 's': - tp = {top: pos.top - actualHeight - this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2}; - break; - case 'e': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset}; - break; - case 'w': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width + this.options.offset}; - break; - } - - if (gravity.length == 2) { - if (gravity.charAt(1) == 'w') { - tp.left = pos.left + pos.width / 2 - 15; - } else { - tp.left = pos.left + pos.width / 2 - actualWidth + 15; - } - } - - $tip.css(tp).addClass('tipsy-' + gravity); - $tip.find('.tipsy-arrow')[0].className = 'tipsy-arrow tipsy-arrow-' + gravity.charAt(0); - - if (this.options.fade) { - $tip.stop().css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: this.options.opacity}); - } else { - $tip.css({visibility: 'visible', opacity: this.options.opacity}); - } - } - }, - - hide: function() { - if (this.options.fade) { - this.tip().stop().fadeOut(function() { $(this).remove(); }); - } else { - this.tip().remove(); - } - }, - - fixTitle: function() { - var $e = this.$element; - if ($e.attr('title') || typeof($e.attr('original-title')) != 'string') { - $e.attr('original-title', $e.attr('title') || '').removeAttr('title'); - } - }, - - getTitle: function() { - var title, $e = this.$element, o = this.options; - this.fixTitle(); - var title, o = this.options; - if (typeof o.title == 'string') { - title = $e.attr(o.title == 'title' ? 'original-title' : o.title); - } else if (typeof o.title == 'function') { - title = o.title.call($e[0]); - } - title = ('' + title).replace(/(^\s*|\s*$)/, ""); - return title || o.fallback; - }, - - tip: function() { - if (!this.$tip) { - this.$tip = $('<div class="tipsy"></div>').html('<div class="tipsy-arrow"></div><div class="tipsy-inner"></div>'); - } - return this.$tip; - }, - - validate: function() { - if (!this.$element[0].parentNode) { - this.hide(); - this.$element = null; - this.options = null; - } - }, - - enable: function() { this.enabled = true; }, - disable: function() { this.enabled = false; }, - toggleEnabled: function() { this.enabled = !this.enabled; } - }; - - $.fn.tipsy = function(options) { - - if (options === true) { - return this.data('tipsy'); - } else if (typeof options == 'string') { - var tipsy = this.data('tipsy'); - if (tipsy) tipsy[options](); - return this; - } - - options = $.extend({}, $.fn.tipsy.defaults, options); - - function get(ele) { - var tipsy = $.data(ele, 'tipsy'); - if (!tipsy) { - tipsy = new Tipsy(ele, $.fn.tipsy.elementOptions(ele, options)); - $.data(ele, 'tipsy', tipsy); - } - return tipsy; - } - - function enter() { - var tipsy = get(this); - tipsy.hoverState = 'in'; - if (options.delayIn == 0) { - tipsy.show(); - } else { - tipsy.fixTitle(); - setTimeout(function() { if (tipsy.hoverState == 'in') tipsy.show(); }, options.delayIn); - } - }; - - function leave() { - var tipsy = get(this); - tipsy.hoverState = 'out'; - if (options.delayOut == 0) { - tipsy.hide(); - } else { - setTimeout(function() { if (tipsy.hoverState == 'out') tipsy.hide(); }, options.delayOut); - } - }; - - if (!options.live) this.each(function() { get(this); }); - - if (options.trigger != 'manual') { - var binder = options.live ? 'live' : 'bind', - eventIn = options.trigger == 'hover' ? 'mouseenter' : 'focus', - eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur'; - this[binder](eventIn, enter)[binder](eventOut, leave); - } - - return this; - - }; - - $.fn.tipsy.defaults = { - className: null, - delayIn: 0, - delayOut: 0, - fade: false, - fallback: '', - gravity: 'n', - html: false, - live: false, - offset: 0, - opacity: 0.8, - title: 'title', - trigger: 'hover' - }; - - // Overwrite this method to provide options on a per-element basis. - // For example, you could store the gravity in a 'tipsy-gravity' attribute: - // return $.extend({}, options, {gravity: $(ele).attr('tipsy-gravity') || 'n' }); - // (remember - do not modify 'options' in place!) - $.fn.tipsy.elementOptions = function(ele, options) { - return $.metadata ? $.extend({}, options, $(ele).metadata()) : options; - }; - - $.fn.tipsy.autoNS = function() { - return $(this).offset().top > ($(document).scrollTop() + $(window).height() / 2) ? 's' : 'n'; - }; - - $.fn.tipsy.autoWE = function() { - return $(this).offset().left > ($(document).scrollLeft() + $(window).width() / 2) ? 'e' : 'w'; - }; - - /** - * yields a closure of the supplied parameters, producing a function that takes - * no arguments and is suitable for use as an autogravity function like so: - * - * @param margin (int) - distance from the viewable region edge that an - * element should be before setting its tooltip's gravity to be away - * from that edge. - * @param prefer (string, e.g. 'n', 'sw', 'w') - the direction to prefer - * if there are no viewable region edges effecting the tooltip's - * gravity. It will try to vary from this minimally, for example, - * if 'sw' is preferred and an element is near the right viewable - * region edge, but not the top edge, it will set the gravity for - * that element's tooltip to be 'se', preserving the southern - * component. - */ - $.fn.tipsy.autoBounds = function(margin, prefer) { - return function() { - var dir = {ns: prefer[0], ew: (prefer.length > 1 ? prefer[1] : false)}, - boundTop = $(document).scrollTop() + margin, - boundLeft = $(document).scrollLeft() + margin, - $this = $(this); - - if ($this.offset().top < boundTop) dir.ns = 'n'; - if ($this.offset().left < boundLeft) dir.ew = 'w'; - if ($(window).width() + $(document).scrollLeft() - $this.offset().left < margin) dir.ew = 'e'; - if ($(window).height() + $(document).scrollTop() - $this.offset().top < margin) dir.ns = 's'; - - return dir.ns + (dir.ew ? dir.ew : ''); - } - }; - -})(jQuery); diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore index 14b80df5065..95ad4d67ea6 100644 --- a/core/vendor/.gitignore +++ b/core/vendor/.gitignore @@ -112,3 +112,9 @@ snapjs/dist/2.0.0-rc1 snapjs/dist/latest/snap.css snapjs/dist/latest/snap.min.js snapjs/scripts + +# bootstrap - only include the tooltip plugin +bootstrap/** +!bootstrap/js +bootstrap/js/* +!bootstrap/js/tooltip.js diff --git a/core/js/tooltip.js b/core/vendor/bootstrap/js/tooltip.js index 7e1fbb5b5e1..c3fe4b06ca2 100644 --- a/core/js/tooltip.js +++ b/core/vendor/bootstrap/js/tooltip.js @@ -1,19 +1,3 @@ -/*! - * Bootstrap v3.3.5 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ -if (typeof jQuery === 'undefined') { - throw new Error('Bootstrap\'s JavaScript requires jQuery') -} -+function ($) { - 'use strict'; - var version = $.fn.jquery.split(' ')[0].split('.') - if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) { - throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher') - } -}(jQuery); - /* ======================================================================== * Bootstrap: tooltip.js v3.3.5 * http://getbootstrap.com/javascript/#tooltip diff --git a/lib/base.php b/lib/base.php index fb20d98f99f..8d098117984 100644 --- a/lib/base.php +++ b/lib/base.php @@ -392,7 +392,7 @@ class OC { } OC_Util::addScript("placeholders"); - OC_Util::addScript("tooltip"); + //OC_Util::addScript("tooltip"); OC_Util::addScript("compatibility"); OC_Util::addScript("jquery.ocdialog"); OC_Util::addScript("oc-dialogs"); |