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.

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

Adds jquery as a dependency instead of a peer-dependency so it can be… #83

Merged
merged 2 commits into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
nodejs 10.15.2
python 2.7.13
yarn 1.22.19
18,085 changes: 18,085 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contently/videojs-annotation-comments",
"version": "2.0.1",
"version": "2.1.1",
"description": "A plugin for video.js to add support for timeline moment/range comments and annotations",
"repository": "[email protected]:contently/videojs-annotation-comments.git",
"main": "build/videojs-annotation-comments.cjs.js",
Expand All @@ -23,8 +23,8 @@
"@semantic-release/git": "^7.0.18",
"babel-core": "^6.26.3",
"babel-eslint": "^10.1.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-es2015-modules-simple-commonjs": "^0.3.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-es2015-script": "^1.1.0",
"babelify": "^7.3.0",
Expand Down Expand Up @@ -100,6 +100,7 @@
]
},
"dependencies": {
"jquery": "^3.6.3",
"mitt": "^1.2.0"
}
}
2 changes: 2 additions & 0 deletions src/js/annotation_comments.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
Can be registered to a videojs instance as a plugin
*/

const $ = require('jquery');

module.exports = videojs => {
require('./lib/polyfills');

Expand Down
1 change: 1 addition & 0 deletions src/js/components/comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/

const moment = require('moment');
const $ = require('jquery');
const PlayerUIComponent = require('./../lib/player_ui_component');
const Utils = require('./../lib/utils');

Expand Down
1 change: 1 addition & 0 deletions src/js/components/controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
including all functionality to add new annotations
*/

const $ = require('jquery');
const PlayerUIComponent = require('./../lib/player_ui_component');
const Utils = require('./../lib/utils');
const DraggableMarker = require('./draggable_marker.js');
Expand Down
1 change: 1 addition & 0 deletions src/js/components/draggable_marker.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
as drag occurs
*/

const $ = require('jquery');
const Marker = require('./marker');
const Utils = require('./../lib/utils');

Expand Down
1 change: 1 addition & 0 deletions src/js/components/marker.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Component for a timeline marker with capabilities to render on timeline, including tooltip for comment
*/

const $ = require('jquery');
const PlayerUIComponent = require('./../lib/player_ui_component');
const Utils = require('./../lib/utils');

Expand Down
1 change: 1 addition & 0 deletions src/js/components/player_button.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Component main 'annotation toggle' button in the player controls, including notifier for # annotations
*/

const $ = require('jquery');
const PlayerUIComponent = require('./../lib/player_ui_component');

const templateName = 'player_button';
Expand Down
1 change: 1 addition & 0 deletions src/js/components/selectable_shape.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Component for a shape that can be drug/sized on top of the video while adding a new annotation
*/

const $ = require('jquery');
const Shape = require('./shape');
const Utils = require('./../lib/utils');

Expand Down
1 change: 1 addition & 0 deletions src/js/components/shape.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Component for managing a shape (i.e. box drawn on the player) for an annotation
*/

const $ = require('jquery');
const PlayerUIComponent = require('./../lib/player_ui_component');

module.exports = class Shape extends PlayerUIComponent {
Expand Down
2 changes: 1 addition & 1 deletion src/js/lib/player_ui_component.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Base class all player UI components interit from - it includes lots of helper functions (to get reference to
the player $el, various classes/helpers, template rendering, etc)
*/

const $ = require('jquery');
const Handlebars = require('handlebars/runtime');
const PlayerComponent = require('./player_component');
const { templates } = require('../compiled/templates');
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5565,6 +5565,11 @@ java-properties@^1.0.0:
resolved "https://registry.npmjs.org/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211"
integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==

jquery@^3.6.3:
version "3.6.3"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6"
integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==

js-base64@^2.1.8:
version "2.5.2"
resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209"
Expand Down