Skip to content

Commit 0d873f0

Browse files
kulgavykulgavy
committed
packages update
1 parent 4871e8e commit 0d873f0

File tree

12 files changed

+115
-117
lines changed

12 files changed

+115
-117
lines changed

‎.vscode/settings.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"search.exclude": {
3+
"**/node_modules": false,
4+
"**/bower_components": false
5+
},
6+
}

‎bower.json‎

Lines changed: 85 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,70 +7,72 @@
77
"okendoken flatlogic.com"
88
],
99
"dependencies": {
10-
"jquery": "2.1.4",
11-
"jquery-pjax": "1.9.6",
12-
"font-awesome": "4.5.0",
13-
"bootstrap-select": "1.6.5",
14-
"select2": "3.5.4",
15-
"select2-bootstrap-css": "1.4.6",
16-
"jasny-bootstrap": "3.1.3",
10+
"jquery": "^3.3.1",
11+
"jquery-pjax": "^2.0.1",
12+
"font-awesome": "4.7.0",
13+
"bootstrap-select": "^1.13.2",
14+
"select2": "^4.0.5",
15+
"select2-bootstrap-css": "^1.4.6",
16+
"jasny-bootstrap": "^3.1.3",
1717
"slimScroll": "1.3.7",
18-
"widgster": "0.0.2",
18+
"widgster": "^0.0.3",
1919
"pace.js": "https://github.com/HubSpot/pace.git#v0.7.1",
20-
"animate.css": "3.5.0",
21-
"awesome-bootstrap-checkbox": "1.0.0",
22-
"backbone": "1.2.3",
23-
"backbone.paginator": "2.0.2",
24-
"backgrid": "0.3.5",
25-
"backgrid-paginator": "03632df8ad238e3d043c0fd471a6c78494e1bdfc",
20+
"animate.css": "^3.7.0",
21+
"awesome-bootstrap-checkbox": "^1.0.1",
22+
"backbone": "^1.3.3",
23+
"backbone.paginator": "^2.0.8",
24+
"backgrid": "^0.3.8",
25+
"backgrid-paginator": "^0.3.9",
2626
"jquery.sparkline": "http://omnipotent.net/jquery.sparkline/2.1.2/jquery.sparkline.min.js",
27-
"d3": "3.5.6",
28-
"rickshaw": "1.6.5",
29-
"nvd3": "1.8.6",
30-
"morris.js": "0.5.1",
27+
"d3": "^5.7.0",
28+
"rickshaw": "^1.6.6",
29+
"nvd3": "^1.8.6",
30+
"morris.js": "^0.5.1",
3131
"flot": "0.8.3",
3232
"flot.animator": "https://github.com/Codicode/flotanimator.git#3c256c0183d713fd3bf41d04417873928eb1a751",
3333
"flot-orderBars": "https://github.com/emmerich/flot-orderBars.git#d44ff4f2fec4c8bb1254e59567ee39fa3684372e",
3434
"flot.dashes": "https://github.com/cquartier/flot.dashes.git#454016a8d61b3e7af375e4ffda36c7c55413f62b",
3535
"jquery-autosize": "1.18.18",
3636
"bootstrap3-wysihtml5": "git://github.com/schnawel007/bootstrap3-wysihtml5.git#5f07036cb228c1cc8bab2d271701ceff0de66828",
37-
"switchery": "0.8.1",
38-
"tempusdominus-bootstrap-4": "git://github.com/tempusdominus/bootstrap-4.git#v5.0.0-alpha18",
37+
"switchery": "^0.8.2",
38+
"tempusdominus-bootstrap-4": "^5.1.1",
3939
"mjolnic-bootstrap-colorpicker": "2.3.0",
40-
"holderjs": "2.5.0",
41-
"dropzone": "4.0.1",
40+
"holderjs": "^2.5.0",
41+
"dropzone": "^5.5.0",
4242
"jQuery-Mapael": "https://github.com/neveldo/jQuery-Mapael.git#v0.7.1",
43-
"gmaps": "0.4.19",
44-
"markdown": "0.5.0",
45-
"to-markdown": "1.2.1",
46-
"seiyria-bootstrap-slider": "5.1.1",
47-
"bootstrap_calendar": "1.0.1",
43+
"gmaps": "^0.4.25",
44+
"markdown": "^0.5.0",
45+
"to-markdown": "^5.0.1",
46+
"seiyria-bootstrap-slider": "^10.2.1",
47+
"bootstrap_calendar": "^1.0.1",
4848
"jvectormap": "http://jvectormap.com/binary/jquery-jvectormap-2.0.3.zip",
4949
"jvectormap-world": "http://jvectormap.com/js/jquery-jvectormap-world-mill.js",
50-
"parsleyjs": "2.2.0-rc1",
51-
"twitter-bootstrap-wizard": "git://github.com/VinceG/twitter-bootstrap-wizard.git#44a6d38bcdebc2cb40f5344dd60581e381387ea4",
52-
"bootstrap-application-wizard": "git://github.com/amoffat/bootstrap-application-wizard.git#3768da3142f43428c5f63284407a2481a9e283d3",
53-
"jquery-ui": "1.11.4",
50+
"parsleyjs": "^2.8.1",
51+
"twitter-bootstrap-wizard": "^1.4.2",
52+
"bootstrap-application-wizard": "*",
53+
"jquery-ui": "^1.12.1",
5454
"jquery-ui-touch-punch": "git://github.com/furf/jquery-ui-touch-punch.git#4bc009145202d9c7483ba85f3a236a8f3470354d",
55-
"datatables": "1.10.9",
56-
"jquery.nestable": "git://github.com/dbushell/Nestable.git#4f93032cfafe2002f24ed6bd7dc1510931498503",
57-
"messenger": "1.4.2",
58-
"jquery.easy-pie-chart": "2.1.6",
59-
"fullcalendar": "1.6.7",
60-
"shufflejs": "3.1.1",
61-
"magnific-popup": "1.0.0",
62-
"jquery-animateNumber": "https://github.com/aishek/jquery-animateNumber.git#v0.0.11",
55+
"datatables": "^1.10.19",
56+
"jquery.nestable": "*",
57+
"messenger": "^1.5.0",
58+
"jquery.easy-pie-chart": "^2.1.6",
59+
"fullcalendar": "^3.9.0",
60+
"shufflejs": "^5.2.0",
61+
"magnific-popup": "^1.1.0",
62+
"jquery-animateNumber": "^0.0.14",
6363
"MetroJS": "https://github.com/drewgreenwell/MetroJS.git#349ab828fe4deecff40496357d5bcba06f470413",
6464
"skycons": "https://github.com/darkskyapp/skycons.git#60d41374ea97c5da1f92622ddcecca6dd1d9beed",
65-
"bootstrap": "4.0.0",
66-
"bootstrap-markdown": "2.9.0",
65+
"bootstrap": "^4.0.0",
66+
"bootstrap-markdown": "^2.10.0",
6767
"slick-carousel": "^1.8.1",
68-
"hammerjs": "hammer#^2.0.8",
68+
"hammerjs": "^2.0.8",
6969
"jquery-hammerjs": "^2.0.0",
70-
"owl.carousel": "^2.3.3",
70+
"owl.carousel": "^2.3.4",
7171
"d3.v5": "d3#~5.1.0",
72-
"moment": "~2.21",
73-
"eonasdan-bootstrap-datetimepicker": "^4.17.47"
72+
"moment": "^2.22.2",
73+
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
74+
"jquery-slimscroll": "slimScroll#^1.3.8",
75+
"bootstrap-wysihtml5": "bootstrap3-wysihtml5#*"
7476
},
7577
"private": true,
7678
"ignore": [
@@ -81,11 +83,46 @@
8183
"jquery": "~2.1.3",
8284
"d3": "~3.5.4",
8385
"underscore": "1.9.1",
84-
"backbone": "^1.1.2",
85-
"bootstrap": "~4"
86+
"backbone": "^1.3.3",
87+
"bootstrap": "~4",
88+
"jquery-pjax": "^2.0.1",
89+
"font-awesome": "^5.3.1",
90+
"bootstrap-select": "^1.13.2",
91+
"select2": "^4.0.5",
92+
"widgster": "^0.0.3",
93+
"animate.css": "^3.7.0",
94+
"awesome-bootstrap-checkbox": "^1.0.1",
95+
"backbone.paginator": "^2.0.8",
96+
"backgrid": "^0.3.8",
97+
"backgrid-paginator": "^0.3.9",
98+
"rickshaw": "^1.6.6",
99+
"flot-orderBars": "^1.0.0",
100+
"jquery-autosize": "1.18.18",
101+
"switchery": "^0.8.2",
102+
"tempusdominus-bootstrap-4": "^5.1.1",
103+
"mjolnic-bootstrap-colorpicker": "2.3.0",
104+
"holderjs": "2.5.0",
105+
"dropzone": "^5.5.0",
106+
"gmaps": "^0.4.25",
107+
"to-markdown": "^5.0.1",
108+
"seiyria-bootstrap-slider": "^10.2.1",
109+
"parsleyjs": "^2.8.1",
110+
"twitter-bootstrap-wizard": "^1.4.2",
111+
"bootstrap-application-wizard": "91c9ba33ef",
112+
"jquery-ui": "^1.12.1",
113+
"datatables": "^1.10.19",
114+
"jquery.nestable": "c06942484f",
115+
"messenger": "^1.5.0",
116+
"fullcalendar": "^3.9.0",
117+
"shufflejs": "^5.2.0",
118+
"magnific-popup": "^1.1.0",
119+
"jquery-animateNumber": "^0.0.14",
120+
"skycons": "3f4b042df6",
121+
"bootstrap-markdown": "^2.10.0",
122+
"moment": "^2.22.2"
86123
},
87124
"devDependencies": {
88125
"glyphicons-halflings": "*",
89-
"popper.js": "1.12.9"
126+
"popper.js": "^1.14.4"
90127
}
91128
}

‎src/js/extra/gallery.js‎

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,16 @@ $(function(){
66
var $grid = $('#grid'),
77
$filterOptions = $('.js-filter-options > .filter'),
88
$sizer = $grid.find('.js-shuffle-sizer'),
9+
shuffleInstance = new Shuffle($grid, {
10+
itemSelector: '.gallery-item',
11+
sizer: $sizer // could also be a selector: '.my-sizer-element'
12+
});
913

10-
init = function() {
11-
setTimeout(function() {
12-
$grid.shuffle( 'shuffle', 'all' );
13-
}, 0);
14-
14+
var init = function() {
1515
setupFilters();
1616
setupSorting();
17-
setupSearching();
18-
19-
SingApp.onResize(function(){
20-
$grid.shuffle('update');
21-
});
22-
23-
// instantiate the plugin
24-
$grid.shuffle({
25-
itemSelector: '.gallery-item',
26-
sizer: $sizer
27-
});
28-
2917

18+
shuffleInstance.filter('all');
3019
},
3120

3221
// Set up button clicks
@@ -38,11 +27,9 @@ $(function(){
3827

3928
// Hide current label, show current label in title
4029
$('.js-filter-options .active').removeClass('active');
41-
4230
$this.addClass('active');
4331

44-
// Filter elements
45-
$grid.shuffle( 'shuffle', group );
32+
shuffleInstance.filter(group);
4633
});
4734

4835
$btns = null;
@@ -55,31 +42,14 @@ $(function(){
5542
opts = {
5643
reverse: order === 'desc',
5744
by: function($el) {
58-
return $el.data('title').toLowerCase();
45+
return $el.getAttribute('data-title').toLowerCase();
5946
}
6047

6148
};
6249
$('.js-sort-options .active').removeClass('active');
6350

6451
$(this).addClass('active');
65-
$grid.shuffle('sort', opts);
66-
});
67-
},
68-
69-
setupSearching = function() {
70-
// Advanced filtering
71-
$('.js-shuffle-search').on('keyup change', function() {
72-
var val = this.value.toLowerCase();
73-
$grid.shuffle('shuffle', function($el, shuffle) {
74-
75-
// Only search elements in the current group
76-
if (shuffle.group !== 'all' && $.inArray(shuffle.group, $el.data('groups')) === -1) {
77-
return false;
78-
}
79-
80-
var text = $.trim( $el.find('.picture-item__title').text() ).toLowerCase();
81-
return text.indexOf(val) !== -1;
82-
});
52+
shuffleInstance.sort(opts);
8353
});
8454
};
8555

‎src/pages/components/ui_list_groups.hbs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,7 @@
131131
</section>
132132
{{/content}}
133133
{{#content "scripts"}}
134-
<script src="../../bower_components/jquery-ui/ui/core.js"></script>
135-
<script src="../../bower_components/jquery-ui/ui/widget.js"></script>
136-
<script src="../../bower_components/jquery-ui/ui/mouse.js"></script>
137-
<script src="../../bower_components/jquery-ui/ui/sortable.js"></script>
134+
<script src="../../bower_components/jquery-ui/jquery-ui.min.js"></script>
138135
<script src="../../bower_components/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js"></script>
139136
<script src="../../bower_components/jquery.nestable/jquery.nestable.js"></script>
140137

‎src/pages/e-commerce/product_grid.hbs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,6 @@
313313
</div>
314314
{{/content}}
315315
{{#content "scripts"}}
316-
<script src="../../bower_components/jquery-ui/ui/core.js"></script>
317-
<script src="../../bower_components/jquery-ui/ui/widget.js"></script>
318-
<script src="../../bower_components/jquery-ui/ui/mouse.js"></script>
319-
<script src="../../bower_components/jquery-ui/ui/draggable.js"></script>
320-
<script src="../../bower_components/jquery-ui/ui/resizable.js"></script>
321-
<script src="../../bower_components/fullcalendar/fullcalendar.js"></script>
322316
<!-- page specific js -->
323317
<script src="../js/e-commerce/product-grid.js"></script>
324318
{{/content}}

‎src/pages/extra/calendar.hbs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,9 @@
9191
</div>
9292
{{/content}}
9393
{{#content "scripts"}}
94-
<script src="../../bower_components/jquery-ui/ui/core.js"></script>
95-
<script src="../../bower_components/jquery-ui/ui/widget.js"></script>
96-
<script src="../../bower_components/jquery-ui/ui/mouse.js"></script>
97-
<script src="../../bower_components/jquery-ui/ui/draggable.js"></script>
98-
<script src="../../bower_components/jquery-ui/ui/resizable.js"></script>
99-
<script src="../../bower_components/fullcalendar/fullcalendar.js"></script>
94+
<script src="../../bower_components/moment/min/moment.min.js"></script>
95+
<script src="../../bower_components/jquery-ui/jquery-ui.js"></script>
96+
<script src="../../bower_components/fullcalendar/dist/fullcalendar.min.js"></script>
10097
<!-- page specific js -->
10198
<script src="../js/extra/calendar.js"></script>
10299
{{/content}}

‎src/pages/extra/gallery.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
</div>
184184
{{/content}}
185185
{{#content "scripts"}}
186-
<script src="../../bower_components/shufflejs/dist/jquery.shuffle.modernizr.min.js"></script>
186+
<script src="../../bower_components/shufflejs/dist/shuffle.min.js"></script>
187187
<script src="../../bower_components/magnific-popup/dist/jquery.magnific-popup.min.js"></script>
188188
<!-- page specific js -->
189189
<script src="../js/extra/gallery.js"></script>

‎src/pages/form/form_elements.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,7 @@ Enjoy!
15891589
<div class="col-md-8">
15901590
<div class="fileinput fileinput-new" data-provides="fileinput">
15911591
<div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">
1592-
<img data-src="holder.js/100%x100%" alt="..." src="">
1592+
<img data-src="holder.js/100px380" alt="..." src="">
15931593
</div>
15941594
<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 200px; max-height: 150px;"></div>
15951595
<div>
@@ -1634,7 +1634,7 @@ Enjoy!
16341634
<script src="../../bower_components/jquery-autosize/jquery.autosize.min.js"></script>
16351635
<script src="../../bower_components/bootstrap3-wysihtml5/lib/js/wysihtml5-0.3.0.min.js"></script>
16361636
<script src="../../bower_components/bootstrap3-wysihtml5/src/bootstrap3-wysihtml5.js"></script>
1637-
<script src="../../bower_components/select2/select2.min.js"></script>
1637+
<script src="../../bower_components/select2/dist/js/select2.min.js"></script>
16381638
<script src="../../bower_components/switchery/dist/switchery.min.js"></script>
16391639
<script src="../../bower_components/moment/min/moment.min.js"></script>
16401640
<script src="../../bower_components/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.js"></script>

‎src/pages/other/grid.hbs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,7 @@ data-widgster-autoload="true"</code></pre>
306306
</div>
307307
{{/content}}
308308
{{#content "scripts"}}
309-
<script src="../../bower_components/jquery-ui/ui/core.js"></script>
310-
<script src="../../bower_components/jquery-ui/ui/widget.js"></script>
311-
<script src="../../bower_components/jquery-ui/ui/mouse.js"></script>
312-
<script src="../../bower_components/jquery-ui/ui/sortable.js"></script>
309+
<script src="../../bower_components/jquery-ui/jquery-ui.min.js"></script>
313310
<script src="../../bower_components/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js"></script>
314311

315312
<!-- page specific js -->

‎src/sass/_custom-libs-override.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,10 +450,10 @@ $slider-handle-size: 26px;
450450
cursor: pointer;
451451
color: $gray-800 !important;
452452
display: inline-block;
453-
width: 30px;
454453
height: 30px;
455454
line-height: 30px;
456455
position: relative;
456+
min-width: calc(100% - 15px);
457457
}
458458
.calendar td{
459459
text-align: center;

0 commit comments

Comments
 (0)