Merge branch '1.11'

ezpublishlegacy · Sep 25, 2017 · 68f2d12 · 68f2d12
2 parents febec35 + 4ef8b0a
commit 68f2d12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Resources/public/js/views/ez-locationviewview.js b/Resources/public/js/views/ez-locationviewview.js
@@ -325,15 +325,15 @@ YUI.add('ez-locationviewview', function (Y) {
                             contentType: this.get('contentType'),
                             config: this.get('config'),
                             languageCode: this.get('languageCode'),
-                            priority: 1000,
+                            priority: 4000,
                             selected: true,
                             bubbleTargets: this,
                         }),
                         new Y.eZ.LocationViewDetailsTabView({
                             content: this.get('content'),
                             location: this.get('location'),
                             config: this.get('config'),
-                            priority: 2000,
+                            priority: 3000,
                             selected: false,
                             bubbleTargets: this,
                         }),
@@ -348,15 +348,15 @@ YUI.add('ez-locationviewview', function (Y) {
                             content: this.get('content'),
                             location: this.get('location'),
                             config: this.get('config'),
-                            priority: 3000,
+                            priority: 2000,
                             selected: false,
                             bubbleTargets: this,
                         }),
                         new Y.eZ.LocationViewRelationsTabView({
                             content: this.get('content'),
                             contentType: this.get('contentType'),
                             config: this.get('config'),
-                            priority: 4000,
+                            priority: 1000,
                             selected: false,
                             bubbleTargets: this,
                         }),

diff --git a/Tests/js/views/assets/ez-locationviewview-tests.js b/Tests/js/views/assets/ez-locationviewview-tests.js
@@ -378,7 +378,7 @@ YUI.add('ez-locationviewview-tests', function (Y) {
 
         "Should set the priority of the view tab view": function () {
             Assert.areSame(
-                1000,
+                4000,
                 this.view.get('tabs')[0].get('priority'),
                 'The priority should have been set to the view tab view'
             );
@@ -429,7 +429,7 @@ YUI.add('ez-locationviewview-tests', function (Y) {
 
         "Should set the priority of the details tab view": function () {
             Assert.areSame(
-                2000,
+                3000,
                 this.view.get('tabs')[1].get('priority'),
                 'The priority should have been set to the details tab view'
             );