Skip to content

Commit 5468b07

Browse files
author
oraclejet
committed
Release candidate v2.1.0
1 parent 9102f96 commit 5468b07

File tree

131 files changed

+6936
-6808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+6936
-6808
lines changed

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Software as contributed to or provided by such licensor, or (ii) the Larger Work
2828
to deal in both
2929
3030
(a) the Software, and (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
31-
one is included with the Software (each a Larger Work to which the Software is contributed by such licensors),
31+
one is included with the Software (each a Larger Work to which the Software is contributed by such licensors),
3232
without restriction, including without limitation the rights to copy, create derivative works of,
3333
display, perform, and distribute the Software and make, use, sell, offer for sale, import, export,
3434
have made, and have sold the Software and the Larger Work(s), and to sublicense the foregoing rights

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "oraclejet",
3-
"version": "2.1.0-b1",
3+
"version": "2.1.0",
44
"description": "Oracle JET distribution",
55
"authors": [
66
"Oracle"

dist/css/alta-android/oj-alta-min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta-android/oj-alta.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta-android/oj-alta.css.map

Lines changed: 168 additions & 168 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta-ios/oj-alta-min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta-ios/oj-alta.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta-ios/oj-alta.css.map

Lines changed: 168 additions & 168 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta-windows/oj-alta-min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta-windows/oj-alta.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta-windows/oj-alta.css.map

Lines changed: 168 additions & 168 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta/oj-alta-min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta/oj-alta-notag-min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta/oj-alta-notag.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta/oj-alta-notag.css.map

Lines changed: 171 additions & 171 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta/oj-alta.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alta/oj-alta.css.map

Lines changed: 170 additions & 170 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/libs/oj/debug/internal-deps/dvt/DvtChart.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3199,13 +3199,13 @@ DvtChartEventManager.prototype.GetDropTargetType = function(event) {
31993199
if (paBounds.containsPoint(relPos.x, relPos.y))
32003200
return 'plotArea';
32013201

3202-
if (DvtChartAxisUtils.axisContainsPoint(this._chart.xAxis, relPos))
3202+
if (DvtChartAxisUtils.isAxisRendered(this._chart, 'x') && DvtChartAxisUtils.axisContainsPoint(this._chart.xAxis, relPos))
32033203
return 'xAxis';
32043204

3205-
if (DvtChartAxisUtils.axisContainsPoint(this._chart.yAxis, relPos))
3205+
if (DvtChartAxisUtils.isAxisRendered(this._chart, 'y') && DvtChartAxisUtils.axisContainsPoint(this._chart.yAxis, relPos))
32063206
return 'yAxis';
32073207

3208-
if (DvtChartAxisUtils.axisContainsPoint(this._chart.y2Axis, relPos))
3208+
if (DvtChartAxisUtils.isAxisRendered(this._chart, 'y2') && DvtChartAxisUtils.axisContainsPoint(this._chart.y2Axis, relPos))
32093209
return 'y2Axis';
32103210

32113211
return null;

dist/js/libs/oj/debug/internal-deps/dvt/DvtTimeline.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,7 @@ DvtTimelineOverviewParser.prototype.ParseRootAttributes = function(options)
14861486
ret.orientation = options['orn'];
14871487
ret.overviewPosition = options['ovp'];
14881488
ret.selectionMode = options['selmode'];
1489-
ret.isRtl = options['rtl'];
1489+
ret.isRtl = options['rtl'].toString();
14901490

14911491
ret.borderTopStyle = options['_bts'];
14921492
ret.borderTopColor = options['_btc'];
@@ -2596,7 +2596,8 @@ dvt.Timeline.prototype.render = function(options, width, height)
25962596

25972597
// Set the timeline as the only keyboard listener
25982598
// Prevents overview from receiving keyboard events
2599-
this.getCtx().setKeyboardFocusArray([this]);
2599+
if (!dvt.TimeAxis.supportsTouch())
2600+
this.getCtx().setKeyboardFocusArray([this]);
26002601
};
26012602

26022603
/**

dist/js/libs/oj/debug/internal-deps/dvt/DvtToolkit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38302,7 +38302,7 @@ dvt.ToolkitUtils.getUrlPathById = function(id) {
3830238302
// If <base> is defined on the document, we have to use the full URL.
3830338303
// document.baseURI is not supported in IE, so we have to check if the <base> tag exists in the document.
3830438304
var hasBase = dvt.Agent.isPlatformIE() ? document.querySelector('base') != null : document.URL != document.baseURI;
38305-
var root = hasBase ? document.URL + '#' : '#';
38305+
var root = hasBase ? document.URL.split('#')[0] + '#' : '#';
3830638306
return root + id;
3830738307
};
3830838308

0 commit comments

Comments
 (0)