Skip to content

Commit 0e2d24f

Browse files
tehaikstehaiks
committed
INT: internal update of JS, LESS and EJS files
1 parent 0843113 commit 0e2d24f

File tree

11 files changed

+899
-763
lines changed

11 files changed

+899
-763
lines changed

‎CHANGELOG.md

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,45 @@
1-
# Change Log
1+
# Changelog
22

3-
This project follows [Semantic Versioning](CONTRIBUTING.md).
3+
### [0.9.2]
44

5-
## Proposals
5+
##### New
66

7-
We do not give estimated times for completion on `Accepted` Proposals.
7+
* New system layouts (wide menu, top menu, short Top menu)
8+
* Upgraded new JS events system.
9+
* New layout - table filtering.
10+
* Massive front-end demo update.
11+
* Responsive wideget layout engine.
12+
* Mobile select mode in table view.
13+
* Various optimizations towards mobile devices.
14+
* Full babel support.
15+
* Webpack 3 support.
16+
17+
##### Changes
18+
19+
* Demo menu layout
20+
* Grunt && Webpack configuration files
21+
* Removing unused files
22+
23+
##### Fixes
24+
25+
* JS performance improvements.
26+
* Form plugins initiation time reduction.
27+
* Cross browser layout fixes.
28+
* Branding system update && optimization.
29+
* Translatons layout fixes.
30+
* Dropdowns JS engine fixes.
31+
* Notfications engine update && optimization.
32+
* Grid system updates
33+
34+
##### Internal
35+
36+
* Dependency update
37+
* Webpack cofniguration update && optimization.
38+
* Grunt cofniguration update && optimization.
39+
40+
##### Other
41+
42+
* Update travis configuration.
43+
* Update README file.
844

9-
---
1045

11-
#INITIAL ANTARES RELEASE

‎_src/js/antares_forms.js

Lines changed: 84 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ const AntaresForms = {
5050
self.elements.disabledDashboardChartCompareMode();
5151
self.elements.stopScroll();
5252
self.elements.updateHeightChartJS();
53-
self.elements.logsCorrectTimelineBorder();
53+
self.elements.cardChartHeaderTruncate();
54+
self.elements.checkIfNeedTruncateTooltip();
55+
self.elements.classForChart();
56+
5457
//MDL reinit
5558
componentHandler.upgradeAllRegistered();
5659
},
@@ -502,9 +505,9 @@ const AntaresForms = {
502505

503506
// Select2 Init - Mdl Big
504507
$('[data-selectAR--mdl-big]').each(function() {
505-
if ($(this).data('select2')) {
506-
return false;
507-
}
508+
// if ($(this).data('select2')) {
509+
// return false;
510+
// }
508511
let myData = $(this).attr('data-select2--class');
509512
if (myData === undefined) {
510513
myData = '';
@@ -1184,6 +1187,7 @@ const AntaresForms = {
11841187
enquire.register('screen and (min-width: 1450px)', {
11851188
match: function() {
11861189
updateHeight('desc');
1190+
11871191
function updateHeightCharts(containerTarget) {
11881192
if (containerTarget === undefined) {
11891193
return false;
@@ -1213,6 +1217,7 @@ const AntaresForms = {
12131217
cardChartHeaderTruncate() {
12141218
$('.card--chart .card__header').each(function() {
12151219
let self = $(this);
1220+
12161221
function giveTruncate() {
12171222
let widthHeader = self.width();
12181223
let thisNameSpan = self.find('.card__header-left span');
@@ -1265,6 +1270,7 @@ const AntaresForms = {
12651270
thisNameSpan.qtip('destroy');
12661271
}
12671272
}
1273+
12681274
$(window).resize(
12691275
_.debounce(function() {
12701276
giveTruncate();
@@ -1275,19 +1281,80 @@ const AntaresForms = {
12751281
});
12761282
});
12771283
},
1278-
checkIfNeedTruncateTooltip(){
1279-
$('.check-truncate-tooltip').each(function () {
1280-
let $self = $(this)
1281-
let thisSelfWidth = $self.width()
1282-
let grandFatherWidth = $self.parent().parent().width()
1283-
let positionLeft = $self.position().left
1284-
if (thisSelfWidth > grandFatherWidth && (positionLeft > 10 || grandFatherWidth - positionLeft > 10)) {
1285-
let maxWidthForSelf = grandFatherWidth - positionLeft - 20
1286-
$self.attr('data-tooltip-inline', $self.text())
1287-
$self.css('overflow', 'hidden').css('white-space', 'nowrap').css('text-overflow', 'ellipsis').css('max-width', maxWidthForSelf)
1288-
}
1289-
})
1290-
}
1284+
checkIfNeedTruncateTooltip() {
1285+
$('.check-truncate-tooltip').each(function() {
1286+
let $self = $(this);
1287+
let thisSelfWidth = $self.width();
1288+
let grandFatherWidth = $self
1289+
.parent()
1290+
.parent()
1291+
.width();
1292+
let positionLeft = $self.position().left;
1293+
if (thisSelfWidth > grandFatherWidth && (positionLeft > 10 || grandFatherWidth - positionLeft > 10)) {
1294+
let maxWidthForSelf = grandFatherWidth - positionLeft - 20;
1295+
$self.attr('data-tooltip-inline', $self.text());
1296+
$self
1297+
.css('overflow', 'hidden')
1298+
.css('white-space', 'nowrap')
1299+
.css('text-overflow', 'ellipsis')
1300+
.css('max-width', maxWidthForSelf);
1301+
}
1302+
});
1303+
},
1304+
classForChart() {
1305+
enquire.register('screen and (max-width: 767px)', {
1306+
match: function() {
1307+
$('.card--chart')
1308+
.closest('.card-container')
1309+
.removeClass('chart--mobile chart--tablet chart--laptop chart--desktop')
1310+
.addClass('chart--mobile');
1311+
},
1312+
unmatch: function() {
1313+
$('.card--chart')
1314+
.closest('.card-container')
1315+
.removeClass('chart--mobile');
1316+
}
1317+
});
1318+
enquire.register('screen and (min-width: 768px) and (max-width:1023px)', {
1319+
match: function() {
1320+
$('.card--chart')
1321+
.closest('.card-container')
1322+
.removeClass('chart--mobile chart--tablet chart--laptop chart--desktop')
1323+
.addClass('chart--tablet');
1324+
},
1325+
unmatch: function() {
1326+
$('.card--chart')
1327+
.closest('.card-container')
1328+
.removeClass('chart--tablet');
1329+
}
1330+
});
1331+
enquire.register('screen and (min-width:1024px) and (max-width:1366px)', {
1332+
match: function() {
1333+
$('.card--chart')
1334+
.closest('.card-container')
1335+
.removeClass('chart--mobile chart--tablet chart--laptop chart--desktop')
1336+
.addClass('chart--laptop');
1337+
},
1338+
unmatch: function() {
1339+
$('.card--chart')
1340+
.closest('.card-container')
1341+
.removeClass('chart--laptop');
1342+
}
1343+
});
1344+
enquire.register('screen and (min-width:1367px)', {
1345+
match: function() {
1346+
$('.card--chart')
1347+
.closest('.card-container')
1348+
.removeClass('chart--mobile chart--tablet chart--laptop chart--desktop')
1349+
.addClass('chart--desktop');
1350+
},
1351+
unmatch: function() {
1352+
$('.card--chart')
1353+
.closest('.card-container')
1354+
.removeClass('chart--desktop');
1355+
}
1356+
});
1357+
}
12911358
}
12921359
};
12931360

‎_src/js/components/dashboard/chart_js/bar.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import VueCharts from 'vue-chartjs';
33
import { Bar, mixins } from 'vue-chartjs';
44

55
export default Bar.extend({
6-
mixins: [mixins.reactiveProp],
7-
props: ['chartData', 'options'],
8-
mounted() {
9-
this.renderChart(this.chartData, this.options); // options end
10-
}
6+
mixins: [mixins.reactiveProp],
7+
props: ['chartData', 'options'],
8+
mounted() {
9+
this.renderChart(this.chartData, this.options); // options end
10+
}
1111
});

‎_src/js/components/dropdowns/ddown_general.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,15 +218,14 @@ const AntaresDdownGeneral = {
218218
// $(document).mouseup(function (e) {
219219
// var container = $('.ddown');
220220
// var container2 = $('.input-field--group');
221-
// console.log(e.target)
222-
// if (!e.target.closest('.ui-widget-content')) {
221+
// if ($(!e.target).closest('.ui-widget-content')) {
223222
// if (container.has(e.target).length === 0 || container2.has(e.target).length === 0) {
224223
// $('[data-daterangepicker]').daterangepicker('close');
225224
// }
226225
// }
227226
// });
228227
// $('.breadcrumbs').click(function () {
229-
// self.closeAllDropdowns;
228+
// self.closeAllDropdowns();
230229
// $('.grid-stack-item').css('z-index', '0');
231230
// });
232231
},

0 commit comments

Comments
 (0)