Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dev dependencies to use uptodate packages #2859

Merged
merged 1 commit into from
Aug 22, 2017
Merged

Update dev dependencies to use uptodate packages #2859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion Gruntfile.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = (grunt) ->
require('load-grunt-tasks')(grunt)
grunt.loadNpmTasks('grunt1.0-dom-munger') # the naming convention of the package does not allow auto-discovery.

grunt.initConfig
pkg: grunt.file.readJSON('package.json')
Expand Down Expand Up @@ -52,8 +53,9 @@ This file is generated by `grunt build`, do not edit it by hand.
banner: '<%= minified_comments %>'
jquery:
options:
ie8: true
mangle:
except: ['jQuery']
reserved: ['jQuery']
files:
'public/chosen.jquery.min.js': ['public/chosen.jquery.js']
proto:
Expand Down
30 changes: 15 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@
"url": "https://github.com/harvesthq/chosen.git"
},
"engines": {
"node": ">=0.4.0"
"node": ">=4"
},
"scripts": {
"test": "grunt test"
},
"dependencies": {},
"devDependencies": {
"autoprefixer": "^6.1.2",
"autoprefixer": "^7.1.2",
"coffee-script": ">= 1.6",
"grunt": "~0.4.1",
"grunt-contrib-coffee": "~0.6.4",
"grunt-contrib-concat": "~0.1.3",
"grunt-contrib-cssmin": "~0.6.1",
"grunt-contrib-jasmine": "~1.0.3",
"grunt-contrib-uglify": "~0.2.0",
"grunt-contrib-watch": "~0.3.1",
"grunt-dom-munger": "~2.0.1",
"grunt-gh-pages": "~0.10.0",
"grunt-postcss": "^0.7.1",
"grunt-sass": "^1.1.0",
"grunt-zip": "~0.9.2",
"load-grunt-tasks": "^3.0.0",
"grunt": "~1.0",
"grunt-contrib-coffee": "~1.0",
"grunt-contrib-concat": "~1.0",
"grunt-contrib-cssmin": "~2.2",
"grunt-contrib-jasmine": "~1.1",
"grunt-contrib-uglify": "~3.0",
"grunt-contrib-watch": "~1.0",
"grunt-gh-pages": "~2.0",
"grunt-postcss": "^0.8.0",
"grunt-sass": "^2.0",
"grunt-zip": "~0.17.1",
"grunt1.0-dom-munger": "~3.4",
"load-grunt-tasks": "^3.5.2",
"simulant": "^0.2.2"
},
"contributors": [
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="docsupport/prism.css">
<link rel="stylesheet" href="chosen.css">

<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' https://ajax.googleapis.com; style-src 'self'; img-src 'self' data:">
<meta http-equiv="Content-Security-Policy" content="default-src &apos;self&apos;; script-src &apos;self&apos; https://ajax.googleapis.com; style-src &apos;self&apos;; img-src &apos;self&apos; data:">
Copy link
Member

Choose a reason for hiding this comment

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

Is this right? Looking around, it seems like most "Content-Security-Policy" examples use the single-quote-inside-double-quote thing.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

well, escaping is not required, but it is allowed (this is something happening at the HTML level, so the final value has single quotes after parsing).

Escaping the single quote is the result of running dom_munger as part of the prep-release task (the fact that it was not escaped yet is because this change was reverted manually when doing the 1.7.0 release)

Copy link
Member

Choose a reason for hiding this comment

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

It's weird, but it seems to work, so okay ¯\_(ツ)_/¯


</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion public/index.proto.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="docsupport/prism.css">
<link rel="stylesheet" href="chosen.css">

<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' https://ajax.googleapis.com; style-src 'self'; img-src 'self' data:">
<meta http-equiv="Content-Security-Policy" content="default-src &apos;self&apos;; script-src &apos;self&apos; https://ajax.googleapis.com; style-src &apos;self&apos;; img-src &apos;self&apos; data:">

</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion public/options.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ <h3>Example:</h3>
<td>
<p>Chosen supports right-to-left text in select boxes. Add the class <code class="language-html">chosen-rtl</code> to your select tag to support right-to-left text options.</p>
<p><strong>Note:</strong> The <code class="language-html">chosen-rtl</code> class will pass through to the Chosen select even when the <code class="language-javascript">inherit_select_classes</code> option is set to <code class="language-javascript">false</code>.</p>
<p><strong>Note:</strong> This is deprecated in favor of using the <code class="language-javascript">rtl: true</code> option (see the <a href="#options">Options section</a>).
<p><strong>Note:</strong> This is deprecated in favor of using the <code class="language-javascript">rtl: true</code> option (see the <a href="#options">Options section</a>).</p>
</td>
</tr>
</table>
Expand Down