Skip to content
This repository was archived by the owner on Feb 16, 2021. It is now read-only.

Update select2 #169

Merged
merged 2 commits into from
Jul 10, 2017
Merged

Update select2 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ed6fac
Remove select2 from yarn
Jun 19, 2017
db66ad4
Update select2 to 4.0
Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
"gulp-sass": "^2.3.2",
"gulp-sequence": "^0.4.6",
"gulp-shell": "^0.5.2",
"gulp-uglify": "^1.5",
"select2-bootstrap-css": "^1.4.6"
"gulp-uglify": "^1.5"
},
"engines": {
"node": "^7.*"
Expand Down
4 changes: 2 additions & 2 deletions src/SumoCoders/FrameworkCoreBundle/Resources/views/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<![endif]-->

{% block stylesheets %}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2.min.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/css/select2.min.css" />
Copy link
Contributor

@carakas carakas Jun 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe just do //cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/css/select2.min.css ?

Copy link
Member Author

@jonasdekeukelaere jonasdekeukelaere Jun 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the plus side instead of enforcing https?

Copy link
Contributor

@carakas carakas Jun 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had started typing it and then thought, nah, we can leave it like this, but apparently I accidentally submitted it anyway

<link rel="stylesheet" href="{{ asset('assets/css/style.css') }}" />
{% endblock %}

Expand All @@ -38,7 +38,7 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.1.1/Chart.min.js"></script>
<script type="text/javascript" src="{{ asset('/bundles/mopabootstrap/js/mopabootstrap-collection.js') }}"></script>
Expand Down
4 changes: 0 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3095,10 +3095,6 @@ seek-bzip@^1.0.3:
dependencies:
commander "~2.8.1"

select2-bootstrap-css@^1.4.6:
version "1.4.6"
resolved "https://registry.yarnpkg.com/select2-bootstrap-css/-/select2-bootstrap-css-1.4.6.tgz#5cfb68246f5299ca1858e01efd788804c734997e"

semver-regex@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
Expand Down