Merge pull request #83 from contently/PETA-1335-with-jquery

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

.tool-versions

@@ -1 +1,3 @@
 nodejs 10.15.2
+python 2.7.13
+yarn 1.22.19

package.json

@@ -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",
@@ -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",
@@ -100,6 +100,7 @@
     ]
   },
   "dependencies": {
+    "jquery": "^3.6.3",
     "mitt": "^1.2.0"
   }
 }

src/js/annotation_comments.js

@@ -3,6 +3,8 @@
     Can be registered to a videojs instance as a plugin
 */
 
+const $ = require('jquery');
+
 module.exports = videojs => {
   require('./lib/polyfills');
 

src/js/components/comment.js

@@ -3,6 +3,7 @@
 */
 
 const moment = require('moment');
+const $ = require('jquery');
 const PlayerUIComponent = require('./../lib/player_ui_component');
 const Utils = require('./../lib/utils');
 

src/js/components/controls.js

@@ -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');

src/js/components/draggable_marker.js

@@ -3,6 +3,7 @@
     as drag occurs
 */
 
+const $ = require('jquery');
 const Marker = require('./marker');
 const Utils = require('./../lib/utils');
 

src/js/components/marker.js

@@ -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');
 

src/js/components/player_button.js

@@ -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';

src/js/components/selectable_shape.js

@@ -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');
 

src/js/components/shape.js

@@ -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 {

src/js/lib/player_ui_component.js

@@ -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');

yarn.lock

@@ -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"