Merge pull request #255 from xbmc/develop

Develop merge
xbmc · Mar 18, 2017 · 037ea7c · 037ea7c
2 parents 5d50092 + 613b3f6
commit 037ea7c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 6 deletions.
diff --git a/src/js/apps/command/local/_base/_base.js.coffee b/src/js/apps/command/local/_base/_base.js.coffee
@@ -33,6 +33,7 @@
           autoplay: false
           autoLoad: true
           stream: true
+          volume: stateObj.getState('volume')
           onerror: ->
             console.log 'SM ERROR!'
           onplay: =>

diff --git a/src/js/apps/input/input_app.js.coffee b/src/js/apps/input/input_app.js.coffee
@@ -69,7 +69,7 @@
         return
 
       ## Don't do anything for white listed commands like CTRL, ALT, SHIFT, etc
-      whiteListCommands = [17, 16, 9, 91, 18, 70]
+      whiteListCommands = [17, 16, 91, 18, 70]
       if helpers.global.inArray e.which, whiteListCommands
         return
 
@@ -100,10 +100,10 @@
           @doInput "Select"
         when 67 # c (context)
           @doInput "ContextMenu"
-        when 107, 187 # + (vol up)
+        when 107, 187, 61 # + (vol up)
           vol = stateObj.getState('volume') + 5
           @appController().setVolume ((if vol > 100 then 100 else Math.ceil(vol)))
-        when 109, 189 # - (vol down)
+        when 109, 189, 173 # - (vol down)
           vol = stateObj.getState('volume') - 5
           @appController().setVolume ((if vol < 0 then 0 else Math.ceil(vol)))
         when 32 # spacebar (play/pause)

diff --git a/src/js/apps/movie/edit/edit_controller.js.coffee b/src/js/apps/movie/edit/edit_controller.js.coffee
@@ -28,7 +28,8 @@
             {id: 'plotoutline', title: tr('Tagline'), type: 'textfield'},
             {id: 'plot', title: tr('Plot'), type: 'textarea'},
             {id: 'studio', title: tr('Studio'), type: 'textfield', format: 'array.string'},
-            {id: 'mpaa', title: tr('Content rating'), type: 'textfield'},
+            {id: 'year', title: tr('Year'), type: 'number', format: 'integer', attributes: {class: 'half-width', step: 1, min: 1000, max: 9999}},
+            {id: 'mpaa', title: tr('Content rating'), type: 'textfield', attributes: {class: 'half-width'}},
             {id: 'rating', title: tr('Rating'), type: 'number', format: 'float', attributes: {class: 'half-width', step: 0.1, min: 0, max: 10}},
             {id: 'imdbnumber', title: tr('IMDb'), type: 'textfield', attributes: {class: 'half-width'}, suffix: '<div class="clearfix"></div>'},
             {id: 'sorttitle', title: tr('Sort title'), type: 'textfield'},

diff --git a/src/js/helpers/jquery.js.coffee b/src/js/helpers/jquery.js.coffee
@@ -8,7 +8,6 @@
 ## usage: $('#hello').removeClassRegex(/^color-/)
 $.fn.removeClassRegex = (regex) ->
   $(@).removeClass (index, classes) ->
-    console.log classes
     classes.split(/\s+/).filter (c) ->
       regex.test c
     .join ' '

diff --git a/src/lang/_strings/pl.po b/src/lang/_strings/pl.po
@@ -1390,3 +1390,6 @@ msgctxt ""
 msgid "This should be the play path for the trailer. Eg. %1$s"
 msgstr "To powinna być ścieżka odtwarzania zwiastuna. Np. %1$s"
 
+msgctxt ""
+msgid "%1$s party mode toggled"
+msgstr "Przełączono Tryb imprezy %1$s"
diff --git a/src/lang/pl/app-changelog.md b/src/lang/pl/app-changelog.md
@@ -1,3 +1,15 @@
+Wersja 2.4.3
+-------------
+* Naprawiono działanie menu kontekstowego w przeglądarce #226
+* Naprawiono wyodrębianie kodu BBcode w przeglądarce #223
+* Added party mode functionality to local browser player #218
+* Dodano funkcjonalność Trybu Imprezy do odtwarzacza w przeglądarce #218
+* Updated to latest Soundmanager2 (297a-20150601)
+* Zaktualizowano bibliotekę Soundmanager2 do najnowszej wersji (297a-20150601)
+* Naprawiono mechanizm wyboru trybu odtwarzania po wczytaniu
+* Zaktualizowano tłumaczenie na język polski #227
+* Zaktualizowano tłumaczenie na język niemiecki #225
+
 Wersja 2.4.2
 -------------
 * Dodano do edytora filmu możliwość wyboru zwiastuna

diff --git a/src/themes/base/sass/components/_filters.scss b/src/themes/base/sass/components/_filters.scss
@@ -129,7 +129,7 @@
   background: $color-white;
   padding: $spacing-quarter-unit * 3;
   text-align: center;
-  z-index: $z-index-beta;
+  z-index: $z-index-gamma;
   .remove {
     @include set-position-absolute(right 0 top 0 bottom 0);
     @include icon-button-square(content-clear, $spacing-double-unit);