Repository: incubator-atlas Updated Branches: refs/heads/master 180c6e571 -> 100749b49
ATLAS-1199 Atlas UI not loading after fresh build due to jquery-asBreadcrumbs plugin upgrade (kevalbhatt via shwethags) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/100749b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/100749b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/100749b4 Branch: refs/heads/master Commit: 100749b49a394f928cebd24ba085a5120066dcad Parents: 180c6e5 Author: Shwetha GS <[email protected]> Authored: Thu Sep 29 11:43:54 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Thu Sep 29 11:43:54 2016 +0530 ---------------------------------------------------------------------- dashboardv2/gruntfile.js | 4 +-- dashboardv2/package.json | 2 +- dashboardv2/public/index.html | 5 +-- .../public/js/utils/CommonViewFunction.js | 38 ++++++++++---------- dashboardv2/public/js/utils/Overrides.js | 15 -------- release-log.txt | 1 + 6 files changed, 25 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/100749b4/dashboardv2/gruntfile.js ---------------------------------------------------------------------- diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js index 0ca253d..be6a028 100644 --- a/dashboardv2/gruntfile.js +++ b/dashboardv2/gruntfile.js @@ -142,7 +142,7 @@ module.exports = function(grunt) { 'backgrid-orderable-columns/css': 'backgrid-orderable-columns/backgrid-orderable-columns.css', 'backgrid-paginator/css': 'backgrid-paginator/backgrid-paginator.css', 'backgrid-sizeable-columns/css': 'backgrid-sizeable-columns/backgrid-sizeable-columns.css', - 'jquery-asBreadcrumbs/css': 'jquery-asBreadcrumbs/css/asBreadcrumbs.css', + 'jquery-asBreadcrumbs/css': 'jquery-asBreadcrumbs/dist/css/asBreadcrumbs.min.css', 'select2/css': 'select2/dist/css/select2.min.css', 'backgrid-select-all': 'backgrid-select-all/backgrid-select-all.min.css', 'font-awesome/css': 'font-awesome/css/font-awesome.min.css', @@ -168,7 +168,7 @@ module.exports = function(grunt) { 'backgrid-orderable-columns': 'backgrid-orderable-columns/LICENSE-MIT', 'backgrid-paginator': 'backgrid-paginator/LICENSE-MIT', 'backgrid-sizeable-columns': 'backgrid-sizeable-columns/LICENSE-MIT', - 'jquery-asBreadcrumbs': 'jquery-asBreadcrumbs/LICENSE-GPL', + 'jquery-asBreadcrumbs': 'jquery-asBreadcrumbs/LICENSE', 'd3': 'd3/LICENSE', 'd3/': 'd3-tip/LICENSE', 'noty': 'noty/LICENSE.txt', http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/100749b4/dashboardv2/package.json ---------------------------------------------------------------------- diff --git a/dashboardv2/package.json b/dashboardv2/package.json index 91c7756..9985127 100644 --- a/dashboardv2/package.json +++ b/dashboardv2/package.json @@ -33,7 +33,7 @@ "dagre-d3": "^0.4.17", "font-awesome": "^4.6.3", "jquery": "^2.2.2", - "jquery-asBreadcrumbs": "git+https://github.com/amazingSurge/jquery-asBreadcrumbs.git";, + "jquery-asBreadcrumbs": "^0.2.1", "jquery-ui": "^1.10.4", "jstree": "^3.3.0", "noty": "^2.3.8", http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/100749b4/dashboardv2/public/index.html ---------------------------------------------------------------------- diff --git a/dashboardv2/public/index.html b/dashboardv2/public/index.html index a8f191a..0b37cb9 100644 --- a/dashboardv2/public/index.html +++ b/dashboardv2/public/index.html @@ -1,3 +1,4 @@ +<!doctype html> <!-- * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -14,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. --> -<!doctype html> + <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]--> <!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]--> @@ -39,7 +40,7 @@ <link rel="stylesheet" href="js/libs/backgrid-sizeable-columns/css/backgrid-sizeable-columns.css"> <link rel="stylesheet" href="js/libs/select2/css/select2.min.css"> <link rel="stylesheet" href="js/libs/bootstrap/css/bootstrap.min.css"> - <link rel="stylesheet" href="js/libs/jquery-asBreadcrumbs/css/asBreadcrumbs.css"> + <link rel="stylesheet" href="js/libs/jquery-asBreadcrumbs/css/asBreadcrumbs.min.css"> <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'> <link rel="stylesheet" type="text/css" href="js/external_lib/jquery-ui/jquery-ui.min.css"> <link href="css/bootstrap-sidebar.css" rel="stylesheet"> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/100749b4/dashboardv2/public/js/utils/CommonViewFunction.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js index ceb10d2..6125486 100644 --- a/dashboardv2/public/js/utils/CommonViewFunction.js +++ b/dashboardv2/public/js/utils/CommonViewFunction.js @@ -354,7 +354,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob var li = ""; if (options.urlList) { _.each(options.urlList, function(object) { - li += '<li><a href="javascript:void(0)" class="link" data-href="/api/atlas/v1/taxonomies/' + object.href + '">' + object.value + '</a></li>'; + li += '<li><a class="link" href="#!/taxonomy/detailCatalog/api/atlas/v1/taxonomies/' + object.href + '?load=true">' + object.value + '</a></li>'; }); } if (options.scope) { @@ -363,29 +363,27 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob options.scope.asBreadcrumbs({ namespace: 'breadcrumb', overflow: "left", - dropicon: "fa fa-ellipsis-h", responsive: false, - dropdown: function() { - return '<div class=\"dropdown\">' + - '<a href=\"javascript:void(0);\" class=\"' + this.namespace + '-toggle\" data-toggle=\"dropdown\"><i class=\"' + this.dropicon + '\"</i></a>' + - '<ul class=\"' + this.namespace + '-menu dropdown-menu popover popoverTerm bottom arrowPosition \" ><div class="arrow"></div></ul>' + - '</div>'; - }, - dropdownContent: function(a) { - return '<li><a class="link" href="javascript:void(0)" data-href="' + a.find('a').data('href') + '" class="dropdown-item">' + a.text() + "</a></li>"; + toggleIconClass: 'fa fa-ellipsis-h', + dropdown: function(classes) { + const dropdownClass = 'dropdown'; + let dropdownMenuClass = 'dropdown-menu popover popoverTerm bottom arrowPosition'; + + if (this.options.overflow === 'right') { + dropdownMenuClass += ' dropdown-menu-right'; + } + + return `<li class="${dropdownClass} ${classes.dropdownClass}"> + <a href="javascript:void(0);" class="${classes.toggleClass}" data-toggle="dropdown"> + <i class="${classes.toggleIconClass}"></i> + </a> + <ul class="${dropdownMenuClass} ${classes.dropdownMenuClass}"> + <div class="arrow"></div> + </ul> + </li>`; } }); } - options.scope.find('li a.link').click(function() { - Utils.setUrl({ - url: "#!/taxonomy/detailCatalog" + $(this).data('href') + "?load=true", - mergeBrowserUrl: false, - trigger: true, - updateTabState: function() { - return { taxonomyUrl: this.url, stateChanged: false }; - } - }); - }); } CommonViewFunction.termTableBreadcrumbMaker = function(model) { var traits = model.get('$traits$'), http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/100749b4/dashboardv2/public/js/utils/Overrides.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/utils/Overrides.js b/dashboardv2/public/js/utils/Overrides.js index b2af8e1..ea4ada3 100644 --- a/dashboardv2/public/js/utils/Overrides.js +++ b/dashboardv2/public/js/utils/Overrides.js @@ -19,21 +19,6 @@ define(['require', 'backgrid', 'asBreadcrumbs'], function(require) { 'use strict'; - $.asBreadcrumbs.prototype.generateChildrenInfo = function() { - var self = this; - this.$children.each(function() { - var $this = $(this); - self.childrenInfo.push({ - $this: $this, - outerWidth: $this.outerWidth(), - $content: $(self.options.dropdownContent($this)) - }); - }); - if (this.options.overflow === "left") { - this.childrenInfo.reverse(); - } - this.childrenLength = this.childrenInfo.length; - }; String.prototype.trunc = String.prototype.trunc || function(n) { return (this.length > n) ? this.substr(0, n - 1) + '...' : this; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/100749b4/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 0d8f5bf..0d78273 100644 --- a/release-log.txt +++ b/release-log.txt @@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai) ALL CHANGES: +ATLAS-1199 Atlas UI not loading after fresh build due to jquery-asBreadcrumbs plugin upgrade (kevalbhatt via shwethags) ATLAS-1174 Framework to apply updates to types in the type-system ([email protected] via shwethags) ATLAS-1155 Errors in Eclipse when I bring in the latest code (davidrad via shwethags) ATLAS-1098 Atlas allows creation of tag with name "isa" which causes exceptions during search (apoorvnaik via shwethags)
