for first dropbutton action and move.
+ $primary.unwrap().addClass('button dropbutton__action').each(function() {
+ $(this).parent().before(this);
+ });
// Identify the secondary actions.
- var $secondary = this.$actions.slice(1);
- $secondary.addClass('secondary-action');
+ var $secondary = this.$actions.slice(1).find('a');
+ $secondary.addClass('dropbutton__action');
// Add toggle link.
$primary.after(Drupal.theme('dropbuttonToggle', options));
// Bind mouse events.
this.$dropbutton
- .addClass('dropbutton-multiple')
+ .addClass('dropbutton--multiple')
.on({
/**
@@ -122,7 +125,10 @@
});
}
else {
- this.$dropbutton.addClass('dropbutton-single');
+ //TODO route through button theming
+ this.$dropbutton.addClass('dropbutton--single');
+ var $action = this.$actions.slice(0, 1).find('a');
+ $action.unwrap().unwrap().addClass('button dropbutton__action');
}
}
@@ -152,8 +158,8 @@
*/
toggle: function (show) {
var isBool = typeof show === 'boolean';
- show = isBool ? show : !this.$dropbutton.hasClass('open');
- this.$dropbutton.toggleClass('open', show);
+ show = isBool ? show : !this.$dropbutton.hasClass('is-open');
+ this.$dropbutton.toggleClass('is-open', show);
},
/**
@@ -216,7 +222,7 @@
* A string representing a DOM fragment.
*/
dropbuttonToggle: function (options) {
- return '
';
+ return '';
}
});
diff --git a/core/modules/book/src/Tests/BookTest.php b/core/modules/book/src/Tests/BookTest.php
index bfd3ae3..d786024 100644
--- a/core/modules/book/src/Tests/BookTest.php
+++ b/core/modules/book/src/Tests/BookTest.php
@@ -692,7 +692,7 @@ public function testAdminBookNodeListing() {
$this->drupalGet('admin/structure/book/' . $this->book->id());
$this->assertText($this->book->label(), 'The book title is displayed on the administrative book listing page.');
- $elements = $this->xpath('//table//ul[@class="dropbutton"]/li/a');
+ $elements = $this->xpath('//table//div[@class="dropbutton"]//a');
$this->assertEqual((string) $elements[0], 'View', 'View link is found from the list.');
}
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php b/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
index 5faa85c..a41c06e 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
@@ -200,7 +200,7 @@ protected function doTestTranslationOverview() {
$elements = $this->xpath('//table//a[@href=:href]', array(':href' => $view_path));
$this->assertEqual((string) $elements[0], $entity->getTranslation($langcode)->label(), format_string('Label correctly shown for %language translation.', array('%language' => $langcode)));
$edit_path = $entity->url('edit-form', array('language' => $language));
- $elements = $this->xpath('//table//ul[@class="dropbutton"]/li/a[@href=:href]', array(':href' => $edit_path));
+ $elements = $this->xpath('//table//div[@class="dropbutton"]//a[@href=:href]', array(':href' => $edit_path));
$this->assertEqual((string) $elements[0], t('Edit'), format_string('Edit link correct for %language translation.', array('%language' => $langcode)));
}
}
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index 3b2ac3e..075cdb2 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -150,7 +150,7 @@ function manageFieldsPage($type = '') {
// Assert entity operations for all fields.
$number_of_links = 3;
$number_of_links_found = 0;
- $operation_links = $this->xpath('//ul[@class = "dropbutton"]/li/a');
+ $operation_links = $this->xpath('//div[@class = "dropbutton"]//a');
$url = base_path() . "admin/structure/types/manage/$type/fields/node.$type.body";
foreach ($operation_links as $link) {
diff --git a/core/modules/language/config/optional/tour.tour.language.yml b/core/modules/language/config/optional/tour.tour.language.yml
index 7cca3e5..3c0dbf3 100644
--- a/core/modules/language/config/optional/tour.tour.language.yml
+++ b/core/modules/language/config/optional/tour.tour.language.yml
@@ -42,7 +42,7 @@ tips:
body: '
Operations are provided for editing and deleting your languages.
You can edit the name and the direction of the language.
Deleted languages can be added back at a later time. Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. Note that you cannot delete the default language of the site.
'
weight: 5
attributes:
- data-class: dropbutton-wrapper
+ data-class: dropbutton
language-continue:
id: language-continue
plugin: text
diff --git a/core/modules/node/src/Tests/AssertButtonsTrait.php b/core/modules/node/src/Tests/AssertButtonsTrait.php
index 96eb6c8..8742f94 100644
--- a/core/modules/node/src/Tests/AssertButtonsTrait.php
+++ b/core/modules/node/src/Tests/AssertButtonsTrait.php
@@ -35,7 +35,7 @@ public function assertButtons($buttons, $dropbutton = TRUE) {
$this->assertTrue(empty($save_button));
// Dropbutton elements.
- $elements = $this->xpath('//div[@class="dropbutton-wrapper"]//input[@type="submit"]');
+ $elements = $this->xpath('//div[@class="dropbutton"]//input[@type="submit"]');
$this->assertEqual($count, count($elements));
foreach ($elements as $element) {
$value = isset($element['value']) ? (string) $element['value'] : '';
@@ -46,7 +46,7 @@ public function assertButtons($buttons, $dropbutton = TRUE) {
else {
// Assert there is a save button.
$this->assertTrue(!empty($save_button));
- $this->assertNoRaw('dropbutton-wrapper');
+ $this->assertNoRaw('dropbutton');
}
}
}
diff --git a/core/modules/system/templates/dropbutton-wrapper.html.twig b/core/modules/system/templates/dropbutton-wrapper.html.twig
index ca0ff7e..b07aa29 100644
--- a/core/modules/system/templates/dropbutton-wrapper.html.twig
+++ b/core/modules/system/templates/dropbutton-wrapper.html.twig
@@ -14,10 +14,8 @@
#}
{% if children %}
{% spaceless %}
-