mirror of
https://github.com/ansible/awx.git
synced 2026-01-17 04:31:21 -03:30
Fixing tooltips. They stopped working. It seems that twitter bootstrap requires jqueryui to be loaded. We were inlcluding after bootstrap.
This commit is contained in:
parent
bc6edeb65c
commit
1579ce0b29
@ -217,7 +217,7 @@ textarea {
|
||||
z-index: 2050;
|
||||
opacity: 1.0;
|
||||
}
|
||||
|
||||
|
||||
.alert {
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
|
||||
@ -241,6 +241,7 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
|
||||
else {
|
||||
placement = (attrs.placement !== undefined && attrs.placement !== null) ? attrs.placement : 'left';
|
||||
}
|
||||
|
||||
$(element).on('hidden.bs.tooltip', function( ) {
|
||||
// TB3RC1 is leaving behind tooltip <div> elements. This will remove them
|
||||
// after a tooltip fades away. If not, they lay overtop of other elements and
|
||||
@ -249,7 +250,15 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
|
||||
$(this).remove();
|
||||
});
|
||||
});
|
||||
$(element).tooltip({ placement: placement, delay: delay, html: true, title: attrs.awToolTip, container: 'body' });
|
||||
|
||||
$(element).tooltip({
|
||||
placement: placement,
|
||||
delay: delay,
|
||||
html: true,
|
||||
title: attrs.awToolTip,
|
||||
container: 'body',
|
||||
trigger: 'hover focus'
|
||||
});
|
||||
|
||||
if (attrs.tipWatch) {
|
||||
// Add dataTipWatch: 'variable_name'
|
||||
|
||||
@ -30,6 +30,6 @@
|
||||
},
|
||||
"_source": "git://github.com/twbs/bootstrap.git",
|
||||
"_target": "~3.1.1",
|
||||
"_originalSource": "twitter",
|
||||
"_originalSource": "bootstrap",
|
||||
"_direct": true
|
||||
}
|
||||
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
@ -1,22 +1,37 @@
|
||||
{
|
||||
"name": "jquery",
|
||||
"version": "2.1.0",
|
||||
"description": "jQuery component",
|
||||
"main": "dist/jquery.js",
|
||||
"license": "MIT",
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"build",
|
||||
"speed",
|
||||
"test",
|
||||
"*.md",
|
||||
"AUTHORS.txt",
|
||||
"Gruntfile.js",
|
||||
"package.json"
|
||||
],
|
||||
"devDependencies": {
|
||||
"sizzle": "1.10.16",
|
||||
"requirejs": "~2.1.8",
|
||||
"qunit": "~1.12.0",
|
||||
"sinon": "~1.7.3"
|
||||
},
|
||||
"keywords": [
|
||||
"jquery",
|
||||
"component"
|
||||
"javascript",
|
||||
"library"
|
||||
],
|
||||
"main": "jquery.js",
|
||||
"license": "MIT",
|
||||
"homepage": "https://github.com/components/jquery",
|
||||
"homepage": "https://github.com/jquery/jquery",
|
||||
"_release": "2.1.0",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "2.1.0",
|
||||
"commit": "099ad075783a6189f13c1e742e03f9cc95654a27"
|
||||
"commit": "9434e03193c45d51bbd063a0edd1a07a6178d33f"
|
||||
},
|
||||
"_source": "git://github.com/components/jquery.git",
|
||||
"_target": "~2.1.0",
|
||||
"_originalSource": "jquery",
|
||||
"_direct": true
|
||||
"_source": "git://github.com/jquery/jquery.git",
|
||||
"_target": ">=1.6",
|
||||
"_originalSource": "jquery"
|
||||
}
|
||||
1
awx/ui/static/lib/jquery/.gitignore
vendored
1
awx/ui/static/lib/jquery/.gitignore
vendored
@ -1 +0,0 @@
|
||||
build
|
||||
21
awx/ui/static/lib/jquery/MIT-LICENSE.txt
Normal file
21
awx/ui/static/lib/jquery/MIT-LICENSE.txt
Normal file
@ -0,0 +1,21 @@
|
||||
Copyright 2014 jQuery Foundation and other contributors
|
||||
http://jquery.com/
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
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
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
@ -1,11 +0,0 @@
|
||||
jQuery Component
|
||||
================
|
||||
|
||||
Shim [repository](https://github.com/components/jquery) for the [jQuery](http://jquery.com).
|
||||
|
||||
Package Managers
|
||||
----------------
|
||||
|
||||
* [Bower](http://bower.io/): `jquery`
|
||||
* [Component](https://github.com/component/component): `components/jquery`
|
||||
* [Composer](http://packagist.org/packages/components/jquery): `components/jquery`
|
||||
@ -1,11 +1,27 @@
|
||||
{
|
||||
"name": "jquery",
|
||||
"version": "2.1.0",
|
||||
"description": "jQuery component",
|
||||
"main": "dist/jquery.js",
|
||||
"license": "MIT",
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"build",
|
||||
"speed",
|
||||
"test",
|
||||
"*.md",
|
||||
"AUTHORS.txt",
|
||||
"Gruntfile.js",
|
||||
"package.json"
|
||||
],
|
||||
"devDependencies": {
|
||||
"sizzle": "1.10.16",
|
||||
"requirejs": "~2.1.8",
|
||||
"qunit": "~1.12.0",
|
||||
"sinon": "~1.7.3"
|
||||
},
|
||||
"keywords": [
|
||||
"jquery",
|
||||
"component"
|
||||
],
|
||||
"main": "jquery.js",
|
||||
"license": "MIT"
|
||||
"javascript",
|
||||
"library"
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
{
|
||||
"name": "jquery",
|
||||
"repo": "components/jquery",
|
||||
"version": "2.1.0",
|
||||
"description": "jQuery component",
|
||||
"keywords": [
|
||||
"jquery",
|
||||
"component"
|
||||
],
|
||||
"main": "jquery.js",
|
||||
"scripts": [
|
||||
"jquery.js"
|
||||
],
|
||||
"license": "MIT"
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
{
|
||||
"name": "components/jquery",
|
||||
"description": "jQuery JavaScript Library",
|
||||
"type": "component",
|
||||
"homepage": "http://jquery.com",
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"irc": "irc://irc.freenode.org/jquery",
|
||||
"issues": "http://bugs.jquery.com",
|
||||
"forum": "http://forum.jquery.com",
|
||||
"wiki": "http://docs.jquery.com/",
|
||||
"source": "https://github.com/jquery/jquery"
|
||||
},
|
||||
"authors": [
|
||||
{
|
||||
"name": "John Resig",
|
||||
"email": "jeresig@gmail.com"
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"robloach/component-installer": "*"
|
||||
},
|
||||
"extra": {
|
||||
"component": {
|
||||
"scripts": [
|
||||
"jquery.js"
|
||||
],
|
||||
"files": [
|
||||
"jquery.min.js",
|
||||
"jquery.min.map",
|
||||
"jquery-migrate.js",
|
||||
"jquery-migrate.min.js"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
1
awx/ui/static/lib/jquery/dist/jquery.min.map
vendored
Normal file
1
awx/ui/static/lib/jquery/dist/jquery.min.map
vendored
Normal file
File diff suppressed because one or more lines are too long
9789
awx/ui/static/lib/jquery/jquery-1.10.2.js
vendored
9789
awx/ui/static/lib/jquery/jquery-1.10.2.js
vendored
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
9597
awx/ui/static/lib/jquery/jquery-1.9.1.js
vendored
9597
awx/ui/static/lib/jquery/jquery-1.9.1.js
vendored
File diff suppressed because it is too large
Load Diff
5
awx/ui/static/lib/jquery/jquery-1.9.1.min.js
vendored
5
awx/ui/static/lib/jquery/jquery-1.9.1.min.js
vendored
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user