From 0030362e4c260351a51e362f0fc0daa03411b5b0 Mon Sep 17 00:00:00 2001
From: Ruslan Kabalin <ruslan.kabalin@gmail.com>
Date: Fri, 12 Oct 2018 12:16:33 +0100
Subject: [PATCH] MDL-63431 atto_media: Fix non-unique id issues and extend
 tests.

---
 .../plugins/media/tests/behat/media.feature   |  45 ++++++++++++++++--
 .../moodle-atto_media-button-debug.js         | Bin 48118 -> 48486 bytes
 .../moodle-atto_media-button-min.js           | Bin 24274 -> 24410 bytes
 .../moodle-atto_media-button.js               | Bin 48118 -> 48486 bytes
 .../plugins/media/yui/src/button/js/button.js |  28 +++++++----
 5 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/lib/editor/atto/plugins/media/tests/behat/media.feature b/lib/editor/atto/plugins/media/tests/behat/media.feature
index b123a470785..b600418b9c1 100644
--- a/lib/editor/atto/plugins/media/tests/behat/media.feature
+++ b/lib/editor/atto/plugins/media/tests/behat/media.feature
@@ -31,7 +31,7 @@ Feature: Add media to Atto
     When I click on "Save changes" "button"
     Then "//a[. = 'moodle-logo.webm']" "xpath_element" should exist
 
-  @javascript
+  @javascript @atto_media_video
   Scenario: Insert some media as a plain video
     Given I click on "Video" "link"
     And I click on "Browse repositories..." "button" in the "#id_summary_editor_video .atto_media_source.atto_media_media_source" "css_element"
@@ -46,7 +46,7 @@ Feature: Add media to Atto
     When I click on "Insert media" "button"
     Then "//video[descendant::source[contains(@src, 'moodle-logo.webm')]][descendant::source[contains(@src, 'moodle-logo.mp4')]]" "xpath_element" should exist
 
-  @javascript
+  @javascript @atto_media_video
   Scenario: Insert some media as a video with display settings
     Given I click on "Video" "link"
     And I click on "Browse repositories..." "button" in the "#id_summary_editor_video .atto_media_source.atto_media_media_source" "css_element"
@@ -66,7 +66,7 @@ Feature: Add media to Atto
     When I click on "Insert media" "button"
     Then "//video[descendant::source[contains(@src, 'moodle-logo.webm')]][contains(@poster, 'moodle-logo.png')][@width=420][@height=69][@title='VideoTitle']" "xpath_element" should exist
 
-  @javascript
+  @javascript @atto_media_video
   Scenario: Insert some media as a video with advanced settings
     Given I click on "Video" "link"
     And I click on "Browse repositories..." "button" in the "#id_summary_editor_video .atto_media_source.atto_media_media_source" "css_element"
@@ -81,7 +81,7 @@ Feature: Add media to Atto
     When I click on "Insert media" "button"
     Then "//video[descendant::source[contains(@src, 'moodle-logo.webm')]][@controls='true'][@loop='true'][@autoplay='true'][@autoplay='true']" "xpath_element" should exist
 
-  @javascript
+  @javascript @atto_media_video
   Scenario: Insert some media as a video with tracks
     Given I click on "Video" "link"
     And I change window size to "large"
@@ -165,3 +165,40 @@ Feature: Add media to Atto
     And I set the field with xpath "(//*[contains(concat(' ', normalize-space(@class), ' '), ' atto_media_track_default ')])[9]" to "1"
     When I click on "Insert media" "button"
     Then "//video[descendant::source[contains(@src, 'moodle-logo.webm')]][descendant::track[contains(@src, 'pretty-good-sv.vtt')][@kind='subtitles'][@label='Swedish'][@srclang='sv'][@default='true']][descendant::track[contains(@src, 'pretty-good-en.vtt')][@kind='subtitles'][@label='English'][@srclang='en'][not(@default)]][descendant::track[contains(@src, 'pretty-good-sv.vtt')][@kind='captions'][@label='Swedish'][@srclang='sv'][not(@default)]][descendant::track[contains(@src, 'pretty-good-en.vtt')][@kind='captions'][@label='English'][@srclang='en'][@default='true']][descendant::track[contains(@src, 'pretty-good-sv.vtt')][@kind='descriptions'][@label='Swedish'][@srclang='sv'][@default='true']][descendant::track[contains(@src, 'pretty-good-en.vtt')][@kind='descriptions'][@label='English'][@srclang='en'][not(@default)]][descendant::track[contains(@src, 'pretty-good-sv.vtt')][@kind='chapters'][@label='Swedish'][@srclang='sv'][not(@default)]][descendant::track[contains(@src, 'pretty-good-en.vtt')][@kind='chapters'][@label='English'][@srclang='en'][@default='true']][descendant::track[contains(@src, 'pretty-good-sv.vtt')][@kind='metadata'][@label='Swedish'][@srclang='sv'][@default='true']][descendant::track[contains(@src, 'pretty-good-en.vtt')][@kind='metadata'][@label='English'][@srclang='en'][not(@default)]]" "xpath_element" should exist
+
+  @javascript @atto_media_audio
+  Scenario: Insert some media as a plain audio
+    Given I click on "Audio" "link"
+    And I click on "Browse repositories..." "button" in the "#id_summary_editor_audio .atto_media_source.atto_media_media_source" "css_element"
+    And I click on "Private files" "link" in the ".fp-repo-area" "css_element"
+    And I click on "moodle-logo.mp4" "link"
+    And I click on "Select this file" "button"
+    When I click on "Insert media" "button"
+    Then "//audio[descendant::source[contains(@src, 'moodle-logo.mp4')]]" "xpath_element" should exist
+
+  @javascript @atto_media_audio
+  Scenario: Insert some media as an audio with display settings
+    Given I click on "Audio" "link"
+    And I click on "Browse repositories..." "button" in the "#id_summary_editor_audio .atto_media_source.atto_media_media_source" "css_element"
+    And I click on "Private files" "link" in the ".fp-repo-area" "css_element"
+    And I click on "moodle-logo.mp4" "link"
+    And I click on "Select this file" "button"
+    And I click on "Display options" "link" in the "#id_summary_editor_audio" "css_element"
+    And I set the field "audio_media-title-entry" to "AudioTitle"
+    When I click on "Insert media" "button"
+    Then "//audio[descendant::source[contains(@src, 'moodle-logo.mp4')]][@title='AudioTitle']" "xpath_element" should exist
+
+  @javascript @atto_media_audio
+  Scenario: Insert some media as an audio with advanced settings
+    Given I click on "Audio" "link"
+    And I click on "Browse repositories..." "button" in the "#id_summary_editor_audio .atto_media_source.atto_media_media_source" "css_element"
+    And I click on "Private files" "link" in the ".fp-repo-area" "css_element"
+    And I click on "moodle-logo.mp4" "link"
+    And I click on "Select this file" "button"
+    And I click on "Advanced settings" "link" in the "#id_summary_editor_audio" "css_element"
+    And the field "audio_media-controls-toggle" matches value "1"
+    And I set the field "audio_media-autoplay-toggle" to "1"
+    And I set the field "audio_media-mute-toggle" to "1"
+    And I set the field "audio_media-loop-toggle" to "1"
+    When I click on "Insert media" "button"
+    Then "//audio[descendant::source[contains(@src, 'moodle-logo.mp4')]][@controls='true'][@loop='true'][@autoplay='true'][@autoplay='true']" "xpath_element" should exist
\ No newline at end of file
diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js
index b9b5151f8ee76f74cf5e58e49d758118366132a7..1050a6771639fbee1c6e512bc5187bed1c1892ac 100644
GIT binary patch
delta 323
zcmezNo$1*xrVUBTlQ($FPcBgwoLr<DJNc$!$mBc~_RUHvzHCSmVw2}<%-*b_{Xu}e
zx;itZwl;pUgiVwTl%1QJl9{NRoS#=xl%G?qTaurio|8J+QCV?vffLW<={BO1-#N=q
z-l``z`9gTt<onialVfa+;Rf~FMj^4qCOauBfc5d&Vd}eVCk$8n%q~m<#R0jcC8_9^
p$Jz^GST5&)FvQRS&5)e@`~q}CRyZIGncyWod4d<m=06U<ssO4Mf35%k

delta 204
zcmaF%i|N~UrVUBTOm+&B3zZcoD<()!zM!hU`MvTAHZ-xx@0I-~`>C^SuF(D<F!_Rw
z*yL6l7a%P@nZ;Ila<zrRWQWME$qtTelfT#+Pwuya$oJccPd;piD!<uYc=B2MFyY+P
zl*~lk+|rU%-IDzD^qf>ByU9@w@<?V$PEK%ysmsaFFF>e!>j+ji$wzvU569*lr(ab7
DDi%#I

diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js
index 9bcc4313a55fc5a8c31f1686072c280c9f8c1e82..49dc8128c17f465150675608502843f018635eef 100644
GIT binary patch
delta 192
zcmcb#m+{s<#tlbACyC2Xz9uR-SyNnZ^DogjMs_Y8$50nf|H=M>_M7L5e`kUzh?LCR
z%q1<yxLH$XEeCsbb!JL!ZT#eGDz<R8u<AxQn^8?{@-0<$B>p-$d%c<^oc%&=8Jyjx
p4j12iTzxecBiH64qc)b!Kh0hXF>+1T50&2h-!q40bB<q{006`UNIw7o

delta 140
zcmcb$kMYu8#tlbAnd}rMpOI4B%r92RxVcf>h8Zd_nP1Fza=$e1<V-PLApMGwYjdT{
zT8_zus$!E()YXCX#>tv$wv%(!)=gGYx8%xAP038u%`GiSom{UfKDk-Fbuzz(<z|14
k)m)o@8?~_j^*5To7MiRO%RAZDlV@|AR~|_0i(i@m0DQ<W+yDRo

diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js
index b9b5151f8ee76f74cf5e58e49d758118366132a7..1050a6771639fbee1c6e512bc5187bed1c1892ac 100644
GIT binary patch
delta 323
zcmezNo$1*xrVUBTlQ($FPcBgwoLr<DJNc$!$mBc~_RUHvzHCSmVw2}<%-*b_{Xu}e
zx;itZwl;pUgiVwTl%1QJl9{NRoS#=xl%G?qTaurio|8J+QCV?vffLW<={BO1-#N=q
z-l``z`9gTt<onialVfa+;Rf~FMj^4qCOauBfc5d&Vd}eVCk$8n%q~m<#R0jcC8_9^
p$Jz^GST5&)FvQRS&5)e@`~q}CRyZIGncyWod4d<m=06U<ssO4Mf35%k

delta 204
zcmaF%i|N~UrVUBTOm+&B3zZcoD<()!zM!hU`MvTAHZ-xx@0I-~`>C^SuF(D<F!_Rw
z*yL6l7a%P@nZ;Ila<zrRWQWME$qtTelfT#+Pwuya$oJccPd;piD!<uYc=B2MFyY+P
zl*~lk+|rU%-IDzD^qf>ByU9@w@<?V$PEK%ysmsaFFF>e!>j+ji$wzvU569*lr(ab7
DDi%#I

diff --git a/lib/editor/atto/plugins/media/yui/src/button/js/button.js b/lib/editor/atto/plugins/media/yui/src/button/js/button.js
index 19cc7193aa2..6204834e9ea 100644
--- a/lib/editor/atto/plugins/media/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/media/yui/src/button/js/button.js
@@ -169,7 +169,7 @@ var COMPONENTNAME = 'atto_media',
                     '<input name="mform_isexpanded_{{elementid}}_video-advanced-settings" type="hidden">' +
                     '<legend class="ftoggler">{{get_string "advancedsettings" component}}</legend>' +
                     '<div class="fcontainer">' +
-                        '{{> form_components.advanced_settings}}' +
+                        '{{renderPartial "form_components.advanced_settings" context=this id=CSS.VIDEO}}' +
                     '</div>' +
                 '</fieldset>' +
                 '<fieldset class="collapsible collapsed" id="{{elementid}}_video-tracks">' +
@@ -193,7 +193,7 @@ var COMPONENTNAME = 'atto_media',
                     '<input name="mform_isexpanded_{{elementid}}_audio-advanced-settings" type="hidden">' +
                     '<legend class="ftoggler">{{get_string "advancedsettings" component}}</legend>' +
                     '<div class="fcontainer">' +
-                        '{{> form_components.advanced_settings}}' +
+                        '{{renderPartial "form_components.advanced_settings" context=this id=CSS.AUDIO}}' +
                     '</div>' +
                 '</fieldset>' +
                 '<fieldset class="collapsible collapsed" id="{{elementid}}_audio-tracks">' +
@@ -267,21 +267,29 @@ var COMPONENTNAME = 'atto_media',
                 '<div class="{{CSS.ADVANCED_SETTINGS}}">' +
                     '<div class="form-check">' +
                         '<input type="checkbox" checked="true" class="form-check-input {{CSS.MEDIA_CONTROLS_TOGGLE}}"' +
-                        'id="media-controls-toggle"/>' +
-                        '<label class="form-check-label" for="media-controls-toggle">{{get_string "controls" component}}</label>' +
+                        'id="{{id}}_media-controls-toggle"/>' +
+                        '<label class="form-check-label" for="{{id}}_media-controls-toggle">' +
+                        '{{get_string "controls" component}}' +
+                        '</label>' +
                     '</div>' +
                     '<div class="form-check">' +
                         '<input type="checkbox" class="form-check-input {{CSS.MEDIA_AUTOPLAY_TOGGLE}}"' +
-                        'id="media-autoplay-toggle"/>' +
-                        '<label class="form-check-label" for="media-autoplay-toggle">{{get_string "autoplay" component}}</label>' +
+                        'id="{{id}}_media-autoplay-toggle"/>' +
+                        '<label class="form-check-label" for="{{id}}_media-autoplay-toggle">' +
+                        '{{get_string "autoplay" component}}' +
+                        '</label>' +
                     '</div>' +
                     '<div class="form-check">' +
-                        '<input type="checkbox" class="form-check-input {{CSS.MEDIA_MUTE_TOGGLE}}" id="media-mute-toggle"/>' +
-                        '<label class="form-check-label" for="media-mute-toggle">{{get_string "mute" component}}</label>' +
+                        '<input type="checkbox" class="form-check-input {{CSS.MEDIA_MUTE_TOGGLE}}" id="{{id}}_media-mute-toggle"/>' +
+                        '<label class="form-check-label" for="{{id}}_media-mute-toggle">' +
+                        '{{get_string "mute" component}}' +
+                        '</label>' +
                     '</div>' +
                     '<div class="form-check">' +
-                        '<input type="checkbox" class="form-check-input {{CSS.MEDIA_LOOP_TOGGLE}}" id="media-loop-toggle"/>' +
-                        '<label class="form-check-label" for="media-loop-toggle">{{get_string "loop" component}}</label>' +
+                        '<input type="checkbox" class="form-check-input {{CSS.MEDIA_LOOP_TOGGLE}}" id="{{id}}_media-loop-toggle"/>' +
+                        '<label class="form-check-label" for="{{id}}_media-loop-toggle">' +
+                        '{{get_string "loop" component}}' +
+                        '</label>' +
                     '</div>' +
                 '</div>',
             TRACK_TABS: '' +
-- 
2.17.1