MDL-68542 editor-atto: Change the bold tag to <strong>.
authorJayChurchward <jay@churchward.ca>
Mon, 27 Apr 2020 21:12:19 +0000 (17:12 -0400)
committerJayChurchward <jay@churchward.ca>
Thu, 30 Apr 2020 15:29:22 +0000 (11:29 -0400)
lib/editor/atto/plugins/bold/tests/behat/bold.feature
lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js
lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js
lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js
lib/editor/atto/plugins/bold/yui/src/button/js/button.js
lib/editor/atto/tests/behat/customtoolbar.feature
lib/editor/atto/tests/behat/disablecontrol.feature

index 98b369b..fe5b861 100644 (file)
@@ -15,7 +15,7 @@ Feature: Atto bold button
     And I set the field "Text editor" to "Plain text area"
     And I press "Save changes"
     And I click on "Edit profile" "link" in the "region-main" "region"
-    Then I should see "<b>Badger</b>"
+    Then I should see "<strong>Badger</strong>"
 
   @javascript
   Scenario: Unbold some text
@@ -31,5 +31,5 @@ Feature: Atto bold button
     And I set the field "Text editor" to "Plain text area"
     And I press "Save changes"
     And I click on "Edit profile" "link" in the "region-main" "region"
-    Then I should not see "<b>Mouse</b>"
+    Then I should not see "<strong>Mouse</strong>"
     And I should see "Mouse"
index 3736b77..c1ae54d 100644 (file)
Binary files a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js and b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js differ
index f71bf58..31c9d63 100644 (file)
Binary files a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js and b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js differ
index 3736b77..c1ae54d 100644 (file)
Binary files a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js and b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js differ
index 7567ffe..3215bfe 100644 (file)
 
 Y.namespace('M.atto_bold').Button = Y.Base.create('button', Y.M.editor_atto.EditorPlugin, [], {
     initializer: function() {
-        this.addBasicButton({
-            exec: 'bold',
+        var bold;
+
+        this.addButton({
+            callback: this._toggleBold,
+            icon: 'e/bold',
+            buttonName: bold,
+            inlineFormat: true,
 
             // Key code for the keyboard shortcut which triggers this button:
             keys: '66',
 
             // Watch the following tags and add/remove highlighting as appropriate:
-            tags: 'b, strong'
+            tags: 'strong, b'
         });
+    },
+    /**
+     * Toggle the bold setting.
+     *
+     * @method _toggleBold
+     * @param {EventFacade} e
+     */
+    _toggleBold: function() {
+        var host = this.get('host');
+
+        // Use the "bold" command for simplicity. This will toggle <strong> tags off as well.
+        document.execCommand('bold', false, null);
+
+        // Then change all <b> tags to <strong> tags. This will change any existing <b> tags as well.
+        host.changeToCSS('b', 'bf-editor-bold-strong');
+        host.changeToTags('bf-editor-bold-strong', 'strong');
     }
 });
index 97f8df0..02f5665 100644 (file)
@@ -20,7 +20,7 @@ Feature: Atto editor with customised toolbar
   Scenario: Confirm that both editors have different toolbars but still function
     Then ".atto_link_button" "css_element" should exist in the ".normaldiv" "css_element"
     And ".atto_link_button" "css_element" should not exist in the ".specialdiv" "css_element"
-    And ".atto_bold_button_bold" "css_element" should exist in the ".normaldiv" "css_element"
+    And ".atto_bold_button" "css_element" should exist in the ".normaldiv" "css_element"
     And ".atto_italic_button_italic" "css_element" should exist in the ".normaldiv" "css_element"
-    And ".atto_bold_button_bold" "css_element" should exist in the ".specialdiv" "css_element"
+    And ".atto_bold_button" "css_element" should exist in the ".specialdiv" "css_element"
     And ".atto_italic_button_italic" "css_element" should exist in the ".specialdiv" "css_element"
index 491e6e1..a3a6590 100644 (file)
@@ -21,7 +21,7 @@ Feature: Atto with enable/disable function.
     When I set the field "mycontrol" to "Disable"
     Then the "disabled" attribute of "button.atto_collapse_button" "css_element" should contain "disabled"
     And the "disabled" attribute of "button.atto_title_button" "css_element" should contain "disabled"
-    And the "disabled" attribute of "button.atto_bold_button_bold" "css_element" should contain "disabled"
+    And the "disabled" attribute of "button.atto_bold_button" "css_element" should contain "disabled"
     And the "disabled" attribute of "button.atto_italic_button_italic" "css_element" should contain "disabled"
     And the "disabled" attribute of "button.atto_unorderedlist_button_insertUnorderedList" "css_element" should contain "disabled"
     And the "disabled" attribute of "button.atto_orderedlist_button_insertOrderedList" "css_element" should contain "disabled"
@@ -35,7 +35,7 @@ Feature: Atto with enable/disable function.
     When I set the field "mycontrol" to "Enable"
     Then "button.atto_collapse_button[disabled]" "css_element" should not exist
     And "button.atto_title_button[disabled]" "css_element" should not exist
-    And "button.atto_bold_button_bold[disabled]" "css_element" should not exist
+    And "button.atto_bold_button[disabled]" "css_element" should not exist
     And "button.atto_italic_button_italic[disabled]" "css_element" should not exist
     And "button.atto_unorderedlist_button_insertUnorderedList[disabled]" "css_element" should not exist
     And "button.atto_orderedlist_button_insertOrderedList[disabled]" "css_element" should not exist