Skip to content
This repository was archived by the owner on Aug 24, 2022. It is now read-only.

Commit 4d0d2f5

Browse files
authored
Merge pull request #183 from the-badger/fix-selectize
Put back a missing JS plugin (selectize) to tag entities
2 parents 65ec381 + f3a65bf commit 4d0d2f5

File tree

11 files changed

+107
-12
lines changed

11 files changed

+107
-12
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [Unreleased]
66

7+
## [0.9.3] - 2017-12-21
8+
### Fixed
9+
- Woops, put back a missing JS plugin for tagging entities (used in admin part)
10+
711
## [0.9.2] - 2017-12-12
812
### Fixed
913
- Fix thumbnails size for new users on dashboard
@@ -135,7 +139,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
135139
- Badge info view, with obtention percentage and user list who have it
136140
- Feedview with recent unlocks
137141

138-
[Unreleased]: https://github.com/the-badger/badger/compare/v0.9.2...HEAD
142+
[Unreleased]: https://github.com/the-badger/badger/compare/v0.9.3...HEAD
143+
[0.9.3]: https://github.com/the-badger/badger/compare/v0.9.2...v0.9.3
139144
[0.9.2]: https://github.com/the-badger/badger/compare/v0.9.1...v0.9.2
140145
[0.9.1]: https://github.com/the-badger/badger/compare/v0.9.0...v0.9.1
141146
[0.9.0]: https://github.com/the-badger/badger/compare/v0.8.1...v0.9.0

app/config/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ imports:
88
# http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
99
parameters:
1010
locale: en
11-
version: 0.9.2
11+
version: 0.9.3
1212

1313
framework:
1414
#esi: ~

gulpfile.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ gulp.task('install', function() {
88
gulp.src([
99
'./node_modules/autolinker/dist/Autolinker.min.js',
1010
'./node_modules/mustache/mustache.min.js',
11-
'./node_modules/lodash/lodash.min.js'
11+
'./node_modules/lodash/lodash.min.js',
12+
'./node_modules/selectize/dist/js/standalone/selectize.min.js',
13+
'./node_modules/selectize/dist/css/selectize.css',
14+
'./node_modules/selectize/dist/css/selectize.default.css'
1215
]).pipe(gulp.dest('./web/vendor/dist/'));
1316
});
1417

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"dependencies": {
2020
"autolinker": "^1.2.0",
2121
"lodash": "^4.16.4",
22-
"mustache": "^2.2.1"
22+
"mustache": "^2.2.1",
23+
"selectize": "^0.12.1"
2324
},
2425
"devDependencies": {
2526
"gulp": "^3.9.0",

src/Badger/Bundle/GameBundle/Resources/views/adventures/form.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
{% endblock %}
4747

4848
{% block javascripts %}
49-
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/forms/tags/selectize/selectize.min.js') }}"></script>
49+
<script type="text/javascript" src="{{ asset('vendor/dist/selectize.min.js') }}"></script>
5050

5151
<script type="text/javascript">
5252
var stepCount = '{{ form.steps|length }}';

src/Badger/Bundle/GameBundle/Resources/views/badges/edit.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
{% endblock %}
3535

3636
{% block javascripts %}
37-
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/forms/tags/selectize/selectize.min.js') }}"></script>
37+
<script type="text/javascript" src="{{ asset('vendor/dist/selectize.min.js') }}"></script>
3838

3939
<script>
4040
$('#badge_tags').selectize({

src/Badger/Bundle/GameBundle/Resources/views/badges/new.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{% endblock %}
2929

3030
{% block javascripts %}
31-
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/forms/tags/selectize/selectize.min.js') }}"></script>
31+
<script type="text/javascript" src="{{ asset('vendor/dist/selectize.min.js') }}"></script>
3232

3333
<script>
3434
$('#badge_tags').selectize({

src/Badger/Bundle/GameBundle/Resources/views/quests/edit.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{% endblock %}
2929

3030
{% block javascripts %}
31-
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/forms/tags/selectize/selectize.min.js') }}"></script>
31+
<script type="text/javascript" src="{{ asset('vendor/dist/selectize.min.js') }}"></script>
3232
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/pickers/pickadate/picker.js') }}"></script>
3333
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/pickers/pickadate/picker.date.js') }}"></script>
3434

src/Badger/Bundle/GameBundle/Resources/views/quests/new.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{% endblock %}
2929

3030
{% block javascripts %}
31-
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/forms/tags/selectize/selectize.min.js') }}"></script>
31+
<script type="text/javascript" src="{{ asset('vendor/dist/selectize.min.js') }}"></script>
3232
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/pickers/pickadate/picker.js') }}"></script>
3333
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/pickers/pickadate/picker.date.js') }}"></script>
3434

src/Badger/Bundle/UserBundle/Resources/views/user/edit.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{% endblock %}
2929

3030
{% block javascripts %}
31-
<script type="text/javascript" src="{{ asset('bundles/game/js/plugins/forms/tags/selectize/selectize.min.js') }}"></script>
31+
<script type="text/javascript" src="{{ asset('vendor/dist/selectize.min.js') }}"></script>
3232

3333
<script>
3434
$('#user_tags').selectize({

0 commit comments

Comments
 (0)