Merge branch 'hotfix/5.2.3'

polimediaupv · Aug 4, 2017 · e7c9abc · e7c9abc
2 parents d85ae8c + d61f1da
commit e7c9abc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+* Paella 5.2.3
+
+  * Now the video zoom button in toolbar shows the current zoom level.
+
 * Paella 5.2.2
 
   * Bug fixed in breaks plugin.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paellaplayer",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "description": "Paella Player",
   "license": "GPL-3.0",
   "repository": {

diff --git a/plugins/es.upv.paella.videoZoom/video_zoom.js b/plugins/es.upv.paella.videoZoom/video_zoom.js
@@ -196,6 +196,12 @@
         }
 
         buildContent(domElement) {
+            paella.events.bind(paella.events.videoZoomChanged, (evt,target) => {
+                this.setText(target.video.zoom + "%");
+            });
+
+            this.setText("100%");
+
             function getZoomButton(className,onClick) {
                 let btn = document.createElement('div');
                 btn.className = `videoZoomToolbarItem ${ className }`;

diff --git a/plugins/es.upv.paella.videoZoom/video_zoom.less b/plugins/es.upv.paella.videoZoom/video_zoom.less
@@ -96,7 +96,10 @@
 }
 
 .buttonPlugin.videoZoomToolbar {
-    background-position: -700% -100%;
+    background-position: -600% -100%;
+    font-size: 0.8em;
+    padding-top: 9px;
+    text-align: center;
 }
 
 .videoZoomToolbarItem {