Rammanojpotla has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381409 )

Change subject: Vector: Page actions in dropdown expand if space allow
......................................................................

Vector: Page actions in dropdown expand if space allow

Page actions in dropdown expands if space allows and move back
to dropdown on screens with lesser resolutions

Bug: T24986
Change-Id: I3b2a9d0297a3d28309200e50bad6b275e42dd202
---
M VectorTemplate.php
M vector.js
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/09/381409/1

diff --git a/VectorTemplate.php b/VectorTemplate.php
index 7ed0675..691a886 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -49,6 +49,8 @@
                                unset( $this->data['action_urls'][$mode] );
                        }
                }
+               $this->data['view_urls'] = 
array_merge($this->data['view_urls'],$this->data['action_urls']);
+               unset($this->data['action_urls']);
                $this->data['pageLanguage'] =
                        
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
 
diff --git a/vector.js b/vector.js
index 9d4c48a..8284168 100644
--- a/vector.js
+++ b/vector.js
@@ -95,10 +95,9 @@
 
                                // If there's an overlap, collapse.
                                if ( $.collapsibleTabs.calculateTabDistance() < 
0 ) {
-                                       // But only if the width of the tab to 
collapse is smaller than the width of the dropdown
                                        // we would have to insert. An example 
language where this happens is Lithuanian (lt).
                                        if ( $cactions.hasClass( 'emptyPortlet' 
) ) {
-                                               return $tabContainer.children( 
'li.collapsible:last' ).width() > initialCactionsWidth();
+                                               return true;
                                        } else {
                                                return true;
                                        }

-- 
To view, visit https://gerrit.wikimedia.org/r/381409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b2a9d0297a3d28309200e50bad6b275e42dd202
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Rammanojpotla <rammanojpotla1...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to