Merge remote-tracking branch 'upstream/master' into add-xapi-video-verbs

h5p · May 25, 2018 · 17052be · 17052be
2 parents 26b8f94 + 229fcd8
commit 17052be
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/language/ar.json b/language/ar.json
@@ -21,7 +21,7 @@
       ]
     },
     {
-      "label":"Playback",
+      "label":"تشغيل",
       "fields":[
         {
           "label":"التشغيل التلقائي الفيديو",
@@ -92,47 +92,47 @@
       ]
     },
     {
-      "label":"Accessibility",
+      "label":"إمكانية الوصول",
       "fields":[
         {
-          "label":"Add video track",
+          "label":"إضافة مسار الفيديو",
           "entity":"Track",
           "field":{
             "label":"Track",
             "fields":[
               {
-                "label":"Track label"
+                "label":"تتبع المسار"
               },
               {
-                "label":"Type kind, refer to <a href=https://html.spec.whatwg.org/multipage/embedded-content.html#the-track-element>HTML living standard</a>",
-                "default":"descriptions",
+                "label":"اكتب النوع، ارجع إلى <a href=https://html.spec.whatwg.org/multipage/embedded-content.html#the-track-element>HTML living standard</a>",
+                "default":"الوصف",
                 "options":[
                   {
-                    "label":"Subtitles"
+                    "label":"عناوين فرعية"
                   },
                   {
-                    "label":"Captions"
+                    "label":"التسميات التوضيحية"
                   },
                   {
-                    "label":"Descriptions"
+                    "label":"الوصف"
                   },
                   {
-                    "label":"Chapters"
+                    "label":"فصول"
                   }
                 ]
               },
               {
-                "label":"Track file (WebVTT)",
+                "label":"تتبع الملف (WebVTT)",
                 "default":"en",
                 "description":"Must be a valid BCP 47 language tag. If the kind attribute is set to subtitles, then srclang must be defined."
               },
               {
-                "label":"Track file (WebVTT)"
+                "label":"تتبع الملف (WebVTT)"
               }
             ]
           }
         }
       ]
     }
   ]
-}
+}
diff --git a/library.json b/library.json
@@ -6,8 +6,8 @@
   "license": "MIT",
   "author": "Joubel",
   "majorVersion": 1,
-  "minorVersion": 3,
-  "patchVersion": 10,
+  "minorVersion": 4,
+  "patchVersion": 1,
   "runnable": 0,
   "coreApi": {
     "majorVersion": 1,
@@ -42,4 +42,4 @@
       "minorVersion": 0
     }
   ]
-}
+}
diff --git a/scripts/video.js b/scripts/video.js
@@ -46,6 +46,9 @@ H5P.Video = (function ($, ContentCopyrights, MediaCopyright, handlers) {
       self.mousedown = false;
     });
 
+    // Reference to the handler
+    var handlerName = '';
+
     // Initialize event inheritance
     H5P.EventDispatcher.call(self);
 
@@ -139,6 +142,16 @@ H5P.Video = (function ($, ContentCopyrights, MediaCopyright, handlers) {
       return info;
     };
 
+    /**
+     * Get name of the video handler
+     *
+     * @public
+     * @returns {string}
+     */
+    self.getHandlerName = function() {
+      return handlerName;
+    };
+
     // Resize the video when we know its aspect ratio
     self.on('loaded', function () {
       self.trigger('resize');
@@ -189,11 +202,13 @@ H5P.Video = (function ($, ContentCopyrights, MediaCopyright, handlers) {
             tracks: tracks,
             disableRemotePlayback: (parameters.visuals.disableRemotePlayback || false)
           }, parameters.l10n);
+          handlerName = handler.name;
           return;
         }
 
         if (handler === H5P.VideoHtml5) {
           html5Handler = handler;
+          handlerName = handler.name;
         }
       }