Skip to content

A
atlas
Commit af51fbcf by kevalbhatt
Options

ATLAS-2250: Upgrade JQuery version to 3.*

parent 37be53bb
Showing with 151 additions and 24 deletions
3party-licenses/backgrid-columnmanager-LICENSE 0 → 100644
The MIT License (MIT)
Copyright (c) 2015 Wilbert van de Ridder
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.
LICENSE
......@@ -256,4 +256,7 @@ MIT License. For details, see 3party-licenses/bootstrap-daterangepicker-LICENSE
This product bundles jQuery QueryBuilder 2.4.3, which is available under
MIT License. For details, see 3party-licenses/jQuery-QueryBuilder-LICENSE
This product bundles backgrid-columnmanager 0.2.4, which is available under
MIT License. For details, see 3party-licenses/backgrid-columnmanager-LICENSE
=======================================================================
dashboardv2/package.json
......@@ -21,7 +21,6 @@
"backbone.paginator": "2.0.5",
"backbone.wreqr": "1.4.0",
"backgrid": "0.3.8",
"backgrid-columnmanager": "0.2.4",
"backgrid-filter": "0.3.7",
"backgrid-orderable-columns": "0.1.2",
"backgrid-paginator": "0.3.9",
......@@ -34,7 +33,7 @@
"dagre-d3": "0.4.17",
"font-awesome": "4.7.0",
"jQuery-QueryBuilder": "2.4.3",
"jquery": "2.2.4",
"jquery": "^3.2.1",
"jquery-asBreadcrumbs": "0.2.2",
"jquery-placeholder": "2.3.1",
"jquery-sparkline": "2.4.0",
......@@ -48,29 +47,18 @@
"underscore": "1.8.3"
},
"devDependencies": {
"connect-livereload": "0.5.4",
"git-rev": "0.2.1",
"grunt": "0.4.2",
"grunt-cli": "0.1.11",
"grunt-concurrent": "1.0.0",
"grunt-connect-proxy": "0.2.0",
"grunt-contrib-clean": "0.6.0",
"grunt-contrib-compress": "0.13.0",
"grunt-contrib-connect": "1.0.0",
"grunt-contrib-copy": "0.8.0",
"grunt": "^1.0.1",
"grunt-cli": "^1.2.0",
"grunt-contrib-clean": "^1.1.0",
"grunt-contrib-connect": "^1.0.0",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "2.0.0",
"grunt-contrib-htmlmin": "2.2.0",
"grunt-contrib-jshint": "0.11.0",
"grunt-contrib-uglify": "2.1.0",
"grunt-contrib-watch": "0.6.1",
"grunt-dev-update": "1.0.2",
"grunt-nginx": "0.2.2",
"grunt-nodemon": "0.4.0",
"grunt-npmcopy": "0.1.0",
"grunt-sass": "1.1.0",
"grunt-shell": "1.1.1",
"grunt-contrib-watch": "^1.0.0",
"grunt-middleware-proxy": "^1.0.7",
"grunt-sass": "^1.1.0",
"grunt-template": "1.0.0",
"load-grunt-tasks": "3.1.0",
"proxit": "0.6.4"
"load-grunt-tasks": "^3.1.0"
}
}
dashboardv2/public/index.html.tpl
......@@ -42,7 +42,7 @@
<link rel="stylesheet" href="js/libs/backgrid-paginator/css/backgrid-paginator.css?bust=<%- bust %>">
<link rel="stylesheet" href="js/libs/backgrid-orderable-columns/css/backgrid-orderable-columns.css?bust=<%- bust %>">
<link rel="stylesheet" href="js/libs/backgrid-sizeable-columns/css/backgrid-sizeable-columns.css?bust=<%- bust %>">
<link rel="stylesheet" href="js/libs/backgrid-columnmanager/css/Backgrid.ColumnManager.css?bust=<%- bust %>">
<link rel="stylesheet" href="js/external_lib/backgrid-columnmanager/css/Backgrid.ColumnManager.css?bust=<%- bust %>">
<link rel="stylesheet" href="js/libs/select2/css/select2.min.css?bust=<%- bust %>">
<link rel="stylesheet" href="js/libs/bootstrap/css/bootstrap.min.css?bust=<%- bust %>">
<link rel="stylesheet" href="js/libs/jquery-asBreadcrumbs/css/asBreadcrumbs.min.css?bust=<%- bust %>">
......
dashboardv2/public/js/external_lib/backgrid-columnmanager/css/Backgrid.ColumnManager.css 0 → 100644
#control {
margin: 0 0 10px 0;
}
div.columnmanager-visibilitycontrol {
margin: 0 auto;
position: relative;
width: 50px;
}
div.columnmanager-visibilitycontrol > button.dropdown-button {
background-image: -moz-linear-gradient(top, #ffffff, #dbdbdb);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #ffffff),color-stop(1, #dbdbdb));
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#dbdbdb');
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#dbdbdb')";
border: 1px solid #fff;
-moz-box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.4);
-webkit-box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.4);
box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.4);
text-decoration: none;
text-shadow: #fff 0 1px 0;
color: #597390;
font-weight: bold;
}
div.columnmanager-visibilitycontrol > button.dropdown-button:hover {
background-image: -moz-linear-gradient(top, #ffffff, #eeeeee);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #ffffff),color-stop(1, #eeeeee));
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#eeeeee');
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#eeeeee')";
color: #000;
}
div.columnmanager-visibilitycontrol > button.dropdown-button:active {
background-image: -moz-linear-gradient(top, #dbdbdb, #ffffff);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #dbdbdb),color-stop(1, #ffffff));
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#dbdbdb', EndColorStr='#ffffff');
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#dbdbdb', EndColorStr='#ffffff')";
text-shadow: 0px -1px 0 rgba(255, 255, 255, 0.5);
}
div.columnmanager-dropdown-container {
cursor: default;
position: absolute;
z-index: 10;
top: 0;
left: 0;
background: #fff;
border: solid 1px #bbb;
-webkit-box-shadow: #999999 0 1px 3px;
-moz-box-shadow: #999999 0 1px 3px;
box-shadow: #999999 0 1px 3px;
width: 200px;
display: none !important;
min-height: 20px;
max-height: 400px;
font-size: 14px;
line-height: 1.1em;
font-weight: normal;
text-align: left;
color: #444;
text-transform: none;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
pointer-events: none;
}
div.columnmanager-dropdown-container.open {
display: block !important;
pointer-events: auto;
}
.columnmanager-dropdown-container > li {
list-style-type:none;
padding: 5px 0px 0px 20px;
border-bottom: solid 1px lightgray;
cursor: pointer;
}
.columnmanager-dropdown-container > li:hover {
background-color: #f0f0f0;
}
.columnmanager-dropdown-container > li:last-child {
border-bottom: none;
}
.columnmanager-dropdown-container > li > span.indicator {
width: 20px;
display: inline-block;
}
.columnmanager-dropdown-container > li.visible > span.indicator::before {
content: "✓";
color: blue;
}
.columnmanager-dropdown-container > li > span.column-label {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
display: inline-block;
width: 150px;
}
th.columnVisibility {
overflow: visible;
}
dashboardv2/public/js/main.js
......@@ -137,7 +137,7 @@ require.config({
'backgrid-orderable': 'libs/backgrid-orderable-columns/js/backgrid-orderable-columns',
'backgrid-paginator': 'libs/backgrid-paginator/js/backgrid-paginator.min',
'backgrid-sizeable': 'libs/backgrid-sizeable-columns/js/backgrid-sizeable-columns',
'backgrid-columnmanager': 'libs/backgrid-columnmanager/js/Backgrid.ColumnManager',
'backgrid-columnmanager': 'external_lib/backgrid-columnmanager/js/Backgrid.ColumnManager',
'asBreadcrumbs': 'libs/jquery-asBreadcrumbs/js/jquery-asBreadcrumbs.min',
'd3': 'libs/d3/d3.min',
'd3-tip': 'libs/d3/index',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment