From 27598cf9b892299e967d22adf1f29d17ddf1a630 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 10:02:02 +0100
Subject: [PATCH 01/40] Removed a useless div in shell.html.twig

---
 Resources/views/PlatformUI/shell.html.twig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/views/PlatformUI/shell.html.twig b/Resources/views/PlatformUI/shell.html.twig
index 6c8eb67d2..bddafa504 100644
--- a/Resources/views/PlatformUI/shell.html.twig
+++ b/Resources/views/PlatformUI/shell.html.twig
@@ -38,7 +38,6 @@
             <div class="ez-view-container pure-u"></div>
         </div>
         <div class="ez-notification-container"></div>
-        <div class="ez-errorview-container is-hidden pure-u"></div>
     </div>
 
     <noscript>

From 56b4684731e88b9eedde37934960f1ea6e51f839 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 10:34:29 +0100
Subject: [PATCH 02/40] CS trailing spaces

---
 Resources/public/js/apps/ez-platformuiapp.js           |  2 +-
 .../ez-universaldiscoveryselectedview.js               |  4 ++--
 Tests/js/apps/assets/ez-platformuiapp-tests.js         |  2 +-
 Tests/js/views/assets/ez-rawcontentview-tests.js       |  4 ++--
 .../assets/ez-universaldiscoveryselectedview-tests.js  | 10 +++++-----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Resources/public/js/apps/ez-platformuiapp.js b/Resources/public/js/apps/ez-platformuiapp.js
index 4e2a4c635..20d71c29c 100644
--- a/Resources/public/js/apps/ez-platformuiapp.js
+++ b/Resources/public/js/apps/ez-platformuiapp.js
@@ -1184,7 +1184,7 @@ YUI.add('ez-platformuiapp', function (Y) {
                 readOnly: true,
                 value: ['en'],
             },
-            
+
             /**
              * Boolean that determine if the app routing is enabled
              *
diff --git a/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js b/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js
index abb266da8..4635ae12e 100644
--- a/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js
+++ b/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js
@@ -53,7 +53,7 @@ YUI.add('ez-universaldiscoveryselectedview', function (Y) {
             this._errorHandlingMethod = function () {
                 this._set('imageState', STATE_IMAGE_ERROR);
             };
-            
+
             this.after('contentStructChange', function (e) {
                 this._setConfirmButtonState(e.newVal);
                 if ( this.get('contentStruct') && this.get('contentStruct').content ) {
@@ -347,7 +347,7 @@ YUI.add('ez-universaldiscoveryselectedview', function (Y) {
             imageField : {
                 value: null
             },
-            
+
             /**
              * The variation identifier to use to display the image
              *
diff --git a/Tests/js/apps/assets/ez-platformuiapp-tests.js b/Tests/js/apps/assets/ez-platformuiapp-tests.js
index 5c59e092d..3c799fb6b 100644
--- a/Tests/js/apps/assets/ez-platformuiapp-tests.js
+++ b/Tests/js/apps/assets/ez-platformuiapp-tests.js
@@ -1758,7 +1758,7 @@ YUI.add('ez-platformuiapp-tests', function (Y) {
 
         "Should deletes views handling middleware if routingEnabled attribute is false": function () {
             this.app.set('routingEnabled', false);
-            
+
             Y.Object.each(this.app.get('routes'), function(route) {
                 Y.Assert.areSame(
                     0,
diff --git a/Tests/js/views/assets/ez-rawcontentview-tests.js b/Tests/js/views/assets/ez-rawcontentview-tests.js
index 82b887b82..285cb47b2 100644
--- a/Tests/js/views/assets/ez-rawcontentview-tests.js
+++ b/Tests/js/views/assets/ez-rawcontentview-tests.js
@@ -76,7 +76,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
 
         _getContentMock: function () {
             var mock = new Y.Test.Mock(), that = this;
-            
+
             Y.Mock.expect(mock, {
                 method: 'toJSON',
                 returns: this.contentJson
@@ -140,7 +140,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                     that.contentJson, variables.content,
                     "The content should available in the template"
                 );
-                
+
                 return origTpl.apply(this, arguments);
             };
             this.view.render();
diff --git a/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js b/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js
index 34efca55b..228fe0760 100644
--- a/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js
+++ b/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js
@@ -29,7 +29,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
                 returns: translations,
             });
         };
-    
+
     renderTest = new Y.Test.Case({
         name: 'eZ Universal Discovery Selected render tests',
 
@@ -40,7 +40,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
         "Should use the template": function () {
             var templateCalled = false,
                 origTpl = this.view.template;
-            
+
             this.view.template = function () {
                 templateCalled = true;
                 return origTpl.apply(this, arguments);
@@ -55,7 +55,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
                 translations = ['LYO-69', 'FRA-fr'],
                 location, contentInfo, type, content, currentVersion,
                 tplLocation = {}, tplContentInfo = {}, tplType = {}, tplContent = {};
-                
+
             location = new Mock();
             content = new Mock();
             contentInfo = new Mock();
@@ -125,7 +125,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
 
         "Should pass false as the contentInfo, location and type if no content struct is set": function () {
             var origTpl = this.view.template;
-            
+
             this.view.template = function (variables) {
                 Assert.isFalse(variables.content, "The content variable should be false");
                 Assert.isFalse(variables.contentInfo, "The content variable should be false");
@@ -489,7 +489,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
 
         "Should add loaded image state class on the container when image is loaded": function () {
             var container = this.view.get('container');
-            
+
             this.view._set('imageState', "image-loading");
             Assert.isTrue(container.hasClass('is-state-image-loading'), 'Container should have "is-state-image-loading" class');
 

From ff1f01837a9ed8e9028be0fd27abf3afd3abbbff Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 10:55:46 +0100
Subject: [PATCH 03/40] EZP-26322: Added the `forceRendering` flag on side
 views

---
 Resources/public/js/apps/ez-platformuiapp.js  |  6 +++-
 .../js/apps/assets/ez-platformuiapp-tests.js  | 36 ++++++++++++++++++-
 Tests/js/apps/ez-platformuiapp.html           |  1 +
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/Resources/public/js/apps/ez-platformuiapp.js b/Resources/public/js/apps/ez-platformuiapp.js
index 20d71c29c..2d351c952 100644
--- a/Resources/public/js/apps/ez-platformuiapp.js
+++ b/Resources/public/js/apps/ez-platformuiapp.js
@@ -30,10 +30,14 @@ YUI.add('ez-platformuiapp', function (Y) {
          * hash which contains the following properties:
          *
          *   * `type`: a reference to the constructor of a view
+         *   * `service`: a reference to the constructor of a view service
          *   * `container`: a selector to the node that will receive the
          *      rendered view
          *   * `hideClass`: a class to add on the application container to hide
          *     the rendered side view when it's not needed.
+         *   * `forceRendering`: if set to true, the side view will be rendered
+         *      each time time it becomes visible. Otherwise, it is rendered
+         *      only after its creation.
          *
          * The lifecycle of the side views is handled by the `handleSideViews`
          * method based on the meta information available in the route.
@@ -607,7 +611,7 @@ YUI.add('ez-platformuiapp', function (Y) {
             service.addTarget(this);
             service.load(function () {
                 view.setAttrs(service.getViewParameters());
-                if ( createView ) {
+                if ( createView || viewInfo.forceRendering ) {
                     view.render();
                     container.one(viewInfo.container).append(
                         view.get('container')
diff --git a/Tests/js/apps/assets/ez-platformuiapp-tests.js b/Tests/js/apps/assets/ez-platformuiapp-tests.js
index 3c799fb6b..5f31d7ffe 100644
--- a/Tests/js/apps/assets/ez-platformuiapp-tests.js
+++ b/Tests/js/apps/assets/ez-platformuiapp-tests.js
@@ -957,7 +957,19 @@ YUI.add('ez-platformuiapp-tests', function (Y) {
                     type: Y.View,
                     service: Y.eZ.ViewService,
                     container: '.sideview2'
-                }
+                },
+                sideView3: {
+                    hideClass: 'is-sideview3-hidden',
+                    type: Y.Base.create('sideView3', Y.View, [], {
+                        render: function () {
+                            sideViewsTest.sideView3Rendered = true;
+                            return this;
+                        },
+                    }),
+                    service: Y.eZ.ViewService,
+                    container: '.sideview3',
+                    forceRendering: true,
+                },
             };
         },
 
@@ -1205,6 +1217,28 @@ YUI.add('ez-platformuiapp-tests', function (Y) {
                 "The instance of the sideView service should have been deleted"
             );
         },
+
+        "Should rerender a side view with forceRendering flag": function () {
+            var req = {
+                    route: {
+                        sideViews: {
+                            sideView3: true,
+                        }
+                    }
+                };
+
+            this.app.handleSideViews(req, {}, function () {});
+            Assert.isTrue(
+                this.sideView3Rendered,
+                "The side view should have been rendered"
+            );
+            this.sideView3Rendered = false;
+            this.app.handleSideViews(req, {}, function () {});
+            Assert.isTrue(
+                this.sideView3Rendered,
+                "The side view should have been rerendered"
+            );
+        },
     });
 
     reverseRoutingTest = new Y.Test.Case({
diff --git a/Tests/js/apps/ez-platformuiapp.html b/Tests/js/apps/ez-platformuiapp.html
index aaa5bad4e..a26767a03 100644
--- a/Tests/js/apps/ez-platformuiapp.html
+++ b/Tests/js/apps/ez-platformuiapp.html
@@ -13,6 +13,7 @@
 <div class="app-sideviews">
     <div class="sideview1"></div>
     <div class="sideview2"></div>
+    <div class="sideview3"></div>
     <div class="view-container"></div>
     <div class="ez-errorview-container is-hidden"></div>
 </div>

From 3fb394048b22f6b34c85314b47b9aefb4a7383e9 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 12:19:32 +0100
Subject: [PATCH 04/40] EZP-26322: Changes RawContentView and
 LanguageSwitcherView to not require their parameters

---
 .../js/views/ez-languageswitcherview.js       |  17 +-
 .../public/js/views/ez-rawcontentview.js      |  87 ++--
 .../views/assets/ez-rawcontentview-tests.js   | 375 +++++++++---------
 Tests/js/views/ez-rawcontentview.html         |  10 +-
 4 files changed, 248 insertions(+), 241 deletions(-)

diff --git a/Resources/public/js/views/ez-languageswitcherview.js b/Resources/public/js/views/ez-languageswitcherview.js
index 57be574d5..2a1148544 100644
--- a/Resources/public/js/views/ez-languageswitcherview.js
+++ b/Resources/public/js/views/ez-languageswitcherview.js
@@ -12,7 +12,7 @@ YUI.add('ez-languageswitcherview', function (Y) {
     Y.namespace('eZ');
 
     /**
-     * The raw content view
+     * The Language Switcher View
      *
      * @namespace eZ
      * @class LanguageSwitcherView
@@ -112,33 +112,24 @@ YUI.add('ez-languageswitcherview', function (Y) {
              *
              * @attribute content
              * @type Y.eZ.Content
-             * @writeOnce
              */
-            content: {
-                writeOnce: "initOnly",
-            },
+            content: {},
 
             /**
              * The current location
              *
              * @attribute location
              * @type Y.eZ.Location
-             * @writeOnce
              */
-            location: {
-                writeOnce: "initOnly",
-            },
+            location: {},
 
             /**
              * Language code of language currently active for the current location
              *
              * @attribute languageCode
              * @type String
-             * @writeOnce
              */
-            languageCode: {
-                writeOnce: "initOnly"
-            }
+            languageCode: {}
         }
     });
 });
diff --git a/Resources/public/js/views/ez-rawcontentview.js b/Resources/public/js/views/ez-rawcontentview.js
index 89ae33d49..7e9ae0b23 100644
--- a/Resources/public/js/views/ez-rawcontentview.js
+++ b/Resources/public/js/views/ez-rawcontentview.js
@@ -34,12 +34,40 @@ YUI.add('ez-rawcontentview', function (Y) {
         },
 
         initializer: function () {
-            this._setFieldViews();
+            /**
+             * The field views instances for the current content
+             *
+             * @property _fieldViews
+             * @protected
+             * @default []
+             * @type Array of {eZ.FieldView}
+             */
+            this._fieldViews = [];
+            if ( this.get('contentType') ) {
+                this._setFieldViews();
+            }
+            this.after('contentTypeChange', this._setFieldViews);
             this.after('activeChange', function (e) {
                 Y.Array.each(this._fieldViews, function (v) {
                     v.set('active', e.newVal);
                 });
             });
+            this.on(
+                ['contentChange', 'locationChange', 'languageCodeChange'],
+                this._forwardToLanguageSwitcherView
+            );
+        },
+
+        /**
+         * Attribute change event handler. It makes sure the attribute new value
+         * is set on the language switcher view.
+         *
+         * @method _forwardToLanguageSwitcherView
+         * @protected
+         * @param {EventFacade} e
+         */
+        _forwardToLanguageSwitcherView: function (e) {
+            this.get('languageSwitcherView').set(e.attrName, e.newVal);
         },
 
         /**
@@ -90,9 +118,9 @@ YUI.add('ez-rawcontentview', function (Y) {
         _setFieldViews: function () {
             var definitions = this.get('contentType').get('fieldDefinitions'),
                 content = this.get('content'),
-                views = [],
                 config = this.get('config');
 
+            this._destroyFieldViews();
             Y.Object.each(definitions, function (def) {
                 var View, fieldView,
                     field = content.getField(def.identifier);
@@ -105,23 +133,11 @@ YUI.add('ez-rawcontentview', function (Y) {
                         config: config,
                     });
                     fieldView.addTarget(this);
-                    views.push(
-                        fieldView
-                    );
+                    this._fieldViews.push(fieldView);
                 } else {
                     console.warn('Content doesn\'t contain field "' + def.identifier + '"');
                 }
             }, this);
-
-            /**
-             * The field views instances for the current content
-             *
-             * @property _fieldViews
-             * @protected
-             * @default []
-             * @type Array of {eZ.FieldView}
-             */
-            this._fieldViews = views;
         },
 
         /**
@@ -164,56 +180,55 @@ YUI.add('ez-rawcontentview', function (Y) {
             });
         },
 
-        destructor: function () {
+        /**
+         * Destroys the field views
+         *
+         * @method _destroyFieldViews
+         * @private
+         */
+        _destroyFieldViews: function () {
             Y.Array.each(this._fieldViews, function (view) {
-                view.destroy();
+                view.destroy({remove: true});
             });
+            this._fieldViews = [];
+        },
+
+        destructor: function () {
+            this._destroyFieldViews();
         },
     }, {
         ATTRS: {
             /**
-             * The location being rendered
+             * The location of the Content item being rendered
              *
              * @attribute location
              * @type Y.eZ.Location
-             * @writeOnce
              */
-            location: {
-                writeOnce: "initOnly",
-            },
+            location: {},
 
             /**
-             * The content associated the current location
+             * The rendered Content item
              *
              * @attribute content
              * @type Y.eZ.Content
-             * @writeOnce
              */
-            content: {
-                writeOnce: "initOnly",
-            },
+            content: {},
 
             /**
-             * The content type of the content at the current location
+             * The Content Type of the Content item
              *
              * @attribute contentType
              * @type Y.eZ.ContentType
-             * @writeOnce
              */
-            contentType: {
-                writeOnce: "initOnly",
-            },
+            contentType: {},
 
             /**
              * Language code of language currently active for the current location
              *
              * @attribute languageCode
              * @type String
-             * @writeOnce
              */
-            languageCode: {
-                writeOnce: "initOnly"
-            },
+            languageCode: {},
 
             /**
              * The language switcher view instance
diff --git a/Tests/js/views/assets/ez-rawcontentview-tests.js b/Tests/js/views/assets/ez-rawcontentview-tests.js
index 285cb47b2..454d2f04b 100644
--- a/Tests/js/views/assets/ez-rawcontentview-tests.js
+++ b/Tests/js/views/assets/ez-rawcontentview-tests.js
@@ -3,7 +3,8 @@
  * For full copyright and license information view LICENSE file distributed with this source code.
  */
 YUI.add('ez-rawcontentview-tests', function (Y) {
-    var viewTest, destroyTest, eventTest, configFieldViewTest, incosistencyFieldsTest,
+    var viewTest, destroyTest, eventTest, configFieldViewTest, inconsistencyFieldsTest,
+        languageSwitcherViewTest, contentTypeChangeTest,
         Assert = Y.Assert, Mock = Y.Mock,
         _getContentTypeMock = function (fieldDefinitions, fieldGroups) {
             var mock = new Y.Test.Mock();
@@ -18,17 +19,31 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 returns: fieldGroups,
             });
             return mock;
+        },
+        _getContentMock = function (contentJson) {
+            var content = new Mock();
+
+            Mock.expect(content, {
+                method: 'toJSON',
+                returns: contentJson
+            });
+            Mock.expect(content, {
+                method: 'getField',
+                args: [Mock.Value.String],
+                run: Y.bind(function (id) {
+                    return this.fields[id];
+                }, this),
+            });
+            return content;
         };
 
+
     viewTest = new Y.Test.Case({
         name: "eZ Raw Content View test",
 
         setUp: function () {
             this.contentJson = {};
             this.languageCode = "eng-GB";
-            this.currentVersion = {
-                "languageCodes": "eng-GB,ger-DE,pol-PL,fre-FR"
-            };
             this.fieldDefinitions = [{
                 fieldGroup: 'content',
                 fieldType: 'something',
@@ -41,8 +56,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             this.fieldGroups = [{fieldGroupName: 'content'}, {fieldGroupName: 'meta'}];
             this.fields = {'id1': {fieldValue: 'value1'}, 'id2': {fieldValue: 'value2'}};
 
-            this.currentVersion = this._getVersionMock();
-            this.location = this._getLocationMock();
+            this.location = {};
             this.content = this._getContentMock();
             this.contentType = this._getContentTypeMock();
             this.config = {};
@@ -52,7 +66,8 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 content: this.content,
                 contentType: this.contentType,
                 languageCode: this.languageCode,
-                config: this.config
+                config: this.config,
+                languageSwitcherView: new Y.View(),
             });
         },
 
@@ -60,52 +75,8 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             this.view.destroy();
         },
 
-        _getVersionMock: function () {
-            var mock = new Y.Test.Mock();
-
-            Y.Mock.expect(mock, {
-                method: 'getTranslationsList',
-            });
-            Y.Mock.expect(mock, {
-                method: 'get',
-                args: ['languageCodes'],
-                returns: this.currentVersion.languageCodes
-            });
-            return mock;
-        },
-
         _getContentMock: function () {
-            var mock = new Y.Test.Mock(), that = this;
-
-            Y.Mock.expect(mock, {
-                method: 'toJSON',
-                returns: this.contentJson
-            });
-            Y.Mock.expect(mock, {
-                method: 'getField',
-                args: [Y.Mock.Value.String],
-                run: function (id) {
-                    return that.fields[id];
-                }
-            });
-            Y.Mock.expect(mock, {
-                method: 'get',
-                args: ['currentVersion'],
-                returns: that.currentVersion
-            });
-            return mock;
-        },
-
-        _getLocationMock: function () {
-            var mock = new Y.Test.Mock(),
-                locationJSON = {};
-
-            Y.Mock.expect(mock, {
-                method: "toJSON",
-                args: [],
-                returns: locationJSON,
-            });
-            return mock;
+            return _getContentMock.call(this, this.contentJson);
         },
 
         _getContentTypeMock: function () {
@@ -166,11 +137,14 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
 
         "Should collapse/uncollapse the raw content view": function () {
             var container = this.view.get('container'),
-                groups = container.one('.ez-fieldgroups'),
-                title = container.one('.ez-raw-content-title'),
-                initialHeight = parseInt(groups.getComputedStyle('height'), 10),
+                groups, title, initialHeight,
                 that = this;
 
+            this.view.render();
+            groups = container.one('.ez-fieldgroups');
+            title = container.one('.ez-raw-content-title');
+            initialHeight = parseInt(groups.getComputedStyle('height'), 10);
+
             title.simulateGesture('tap', function () {
                 that.resume(function () {
                     this.wait(function () {
@@ -205,9 +179,11 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
 
         "Should collapse/uncollapse the field groups": function () {
             var container = this.view.get('container'),
-                fieldGroups = container.all('.ez-fieldgroup'),
+                fieldGroups,
                 that = this;
 
+            this.view.render();
+            fieldGroups = container.all('.ez-fieldgroup');
             fieldGroups.each(function (group) {
                 var name = group.previous('a'),
                     initialHeight = parseInt(group.getComputedStyle('height'), 10);
@@ -257,37 +233,89 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 that.wait();
             });
         },
+    });
+
+    languageSwitcherViewTest = new Y.Test.Case({
+        name: 'eZ Raw Content View languageSwitcherView test',
+
+        setUp: function () {
+            Y.eZ.LanguageSwitcherView = Y.View;
+            this.view = new Y.eZ.RawContentView({
+                content: {},
+                location: {},
+                languageCode: 'fre-FR',
+            });
+        },
+
+        tearDown: function () {
+            this.view.destroy();
+            delete Y.eZ.LanguageSwitcherView;
+        },
 
         "Should instantiate LanguageSwitcherView with proper parameters": function () {
+            var switcher = this.view.get('languageSwitcherView');
+
             Y.Assert.areSame(
                 this.view.get('content'),
-                this.view.get('languageSwitcherView').get('content'),
-                'The content should have been set to languageSwitcherView'
+                switcher.get('content'),
+                'The content should have been set on languageSwitcherView'
             );
             Y.Assert.areSame(
                 this.view.get('location'),
-                this.view.get('languageSwitcherView').get('location'),
-                'The location should have been set to languageSwitcherView'
+                switcher.get('location'),
+                'The location should have been set on languageSwitcherView'
             );
             Y.Assert.areSame(
                 this.view.get('languageCode'),
-                this.view.get('languageSwitcherView').get('languageCode'),
-                'The location should have been set to languageSwitcherView'
+                switcher.get('languageCode'),
+                'The location should have been set on languageSwitcherView'
             );
-        }
+        },
+
+        "Should set the raw content view as a bubble target of the language switcher": function () {
+            var bubble = false,
+                event = 'whatever';
+
+            this.view.on('*:' + event, function () {
+                bubble = true;
+            });
+            this.view.get('languageSwitcherView').fire(event);
+
+            Assert.isTrue(
+                bubble,
+                "The raw content view should be a bubble target of the language switcher"
+            );
+        },
+
+        _testForwardAttribute: function (attrName, value) {
+            this.view.set(attrName, value);
+
+            Assert.areSame(
+                value, this.view.get('languageSwitcherView').get(attrName)
+            );
+        },
+
+        "Should receive the new value of the content attribute": function () {
+            this._testForwardAttribute('content', {});
+        },
+
+        "Should receive the new value of the location attribute": function () {
+            this._testForwardAttribute('location', {});
+        },
+
+        "Should receive the new value of the languageCode attribute": function () {
+            this._testForwardAttribute('languageCode', 'eng-GB');
+        },
     });
 
     eventTest = new Y.Test.Case({
-        name: "eZ Raw Content View test",
+        name: "eZ Raw Content View events test",
 
         setUp: function () {
             var that = this;
 
             this.contentJson = {};
             this.languageCode = "eng-GB";
-            this.currentVersion = {
-                "languageCodes": "eng-GB,ger-DE,pol-PL,fre-FR"
-            };
             this.fieldDefinitions = [{
                 fieldGroup: 'content',
                 fieldType: 'something',
@@ -300,8 +328,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             this.fieldGroups = [{fieldGroupName: 'content'}, {fieldGroupName: 'meta'}];
             this.fields = {'id1': {fieldValue: 'value1'}, 'id2': {fieldValue: 'value2'}};
 
-            this.currentVersion = this._getVersionMock();
-            this.location = this._getLocationMock();
+            this.location = {};
             this.content = this._getContentMock();
             this.contentType = this._getContentTypeMock();
             that = this;
@@ -311,14 +338,6 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                     something: 'hello'
                 }
             };
-            this.view = new Y.eZ.RawContentView({
-                container: '.container',
-                location: this.location,
-                content: this.content,
-                contentType: this.contentType,
-                languageCode: this.languageCode,
-                config: this.config
-            });
             this.eventFacade = {Something: 'something'};
             this.activeChangeCalled = 0;
             this.activeChangeNewVal = null;
@@ -345,6 +364,16 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                     })
                 );
             });
+
+            this.view = new Y.eZ.RawContentView({
+                container: '.container',
+                location: this.location,
+                content: this.content,
+                contentType: this.contentType,
+                languageCode: this.languageCode,
+                config: this.config,
+                languageSwitcherView: new Y.View(),
+            });
         },
 
         tearDown: function () {
@@ -358,54 +387,8 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             });
         },
 
-        _initializer :function () {},
-
-        _getVersionMock: function () {
-            var mock = new Y.Test.Mock();
-
-            Y.Mock.expect(mock, {
-                method: 'getTranslationsList',
-            });
-            Y.Mock.expect(mock, {
-                method: 'get',
-                args: ['languageCodes'],
-                returns: this.currentVersion.languageCodes
-            });
-            return mock;
-        },
-
         _getContentMock: function () {
-            var mock = new Y.Test.Mock(), that = this;
-
-            Y.Mock.expect(mock, {
-                method: 'toJSON',
-                returns: this.contentJson
-            });
-            Y.Mock.expect(mock, {
-                method: 'getField',
-                args: [Y.Mock.Value.String],
-                run: function (id) {
-                    return that.fields[id];
-                }
-            });
-            Y.Mock.expect(mock, {
-                method: 'get',
-                args: ['currentVersion'],
-                returns: that.currentVersion
-            });
-            return mock;
-        },
-
-        _getLocationMock: function () {
-            var mock = new Y.Test.Mock(),
-                locationJSON = {};
-
-            Y.Mock.expect(mock, {
-                method: "toJSON",
-                args: [],
-                returns: locationJSON,
-            });
-            return mock;
+            return _getContentMock.call(this, this.contentJson);
         },
 
         _getContentTypeMock: function () {
@@ -415,18 +398,6 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
         "Should catch the fieldView's events": function () {
             var eventCount = 0, that = this;
 
-            this.view = new Y.eZ.RawContentView({
-                container: '.container',
-                location: this.location,
-                content: this.content,
-                contentType: this.contentType,
-                languageCode: this.languageCode,
-                config: {
-                    fieldViews: {
-                        something: 'hello'
-                    }
-                },
-            });
             this.view.on('*:fireSomething', function(e) {
                 eventCount++;
                 Y.Assert.areSame(
@@ -446,20 +417,6 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
         },
 
         "Should forward the active flag to the field sub views": function () {
-
-            this.view = new Y.eZ.RawContentView({
-                container: '.container',
-                location: this.location,
-                content: this.content,
-                contentType: this.contentType,
-                languageCode: this.languageCode,
-                config: {
-                    fieldViews: {
-                        ezthing: 'hello'
-                    }
-                },
-            });
-
             this.view.set('active', true);
 
             Y.Assert.isTrue(
@@ -490,14 +447,16 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             }];
             this.fieldGroups = [{fieldGroupName: 'content'}, {fieldGroupName: 'meta'}];
             this.fields = {'id1': {fieldValue: 'value1'}, 'id2': {fieldValue: 'value2'}};
+        },
 
+        destroy: function () {
+            this.view.destroy();
         },
 
         "Should destroy the field views": function () {
             var somethingDestroyed = false,
                 somethingElseDestroyed = false,
-                content = new Y.Mock(),
-                that = this;
+                content = _getContentMock.call(this, {});
 
             Y.eZ.FieldView.registerFieldView('something', Y.Base.create('somethingView', Y.eZ.FieldView, [], {
                 destructor: function () {
@@ -510,14 +469,6 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 }
             }));
 
-            Y.Mock.expect(content, {
-                method: 'getField',
-                args: [Y.Mock.Value.String],
-                run: function (id) {
-                    return that.fields[id];
-                }
-            });
-
             this.view = new Y.eZ.RawContentView({
                 content: content,
                 contentType: _getContentTypeMock(this.fieldDefinitions, this.fieldGroups),
@@ -526,6 +477,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                         ezthing: 'hello'
                     }
                 },
+                languageSwitcherView: new Y.View(),
             });
             this.view.destroy();
 
@@ -541,8 +493,10 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
         name: "eZ Raw Content View config field view test",
 
         setUp: function () {
-            var content = new Mock(),
-                fields = {'id1': {fieldValue: 'value1'}};
+            var content;
+
+            this.fields = {'id1': {fieldValue: 'value1'}};
+            content = _getContentMock.call(this, {});
 
             this.fieldDefinitions = [{
                 fieldGroup: 'content',
@@ -552,13 +506,6 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             this.fieldGroups = [{fieldGroupName: 'content'}];
 
             this.config = {};
-            Mock.expect(content, {
-                method: 'getField',
-                args: [Mock.Value.String],
-                run: function (id) {
-                    return fields[id];
-                }
-            });
 
             Y.eZ.FieldView.registerFieldView('something', Y.Base.create('somethingView', Y.eZ.FieldView, [], {
                 initializer: function () {
@@ -570,6 +517,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 content: content,
                 contentType: _getContentTypeMock(this.fieldDefinitions, this.fieldGroups),
                 config: this.config,
+                languageSwitcherView: new Y.View(),
             });
         },
 
@@ -587,13 +535,11 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
         },
     });
 
-    incosistencyFieldsTest = new Y.Test.Case({
-        name: "eZ Raw Content View incosistency fields test",
+    inconsistencyFieldsTest = new Y.Test.Case({
+        name: "eZ Raw Content View inconsistency fields test",
 
         setUp: function () {
-            var fields = {};
-
-            this.content = new Mock();
+            this.fields = {};
             this.fieldType = 'something';
             this.fieldDefinitions = [{
                 fieldGroup: 'content',
@@ -602,13 +548,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             }];
             this.fieldGroups = [{fieldGroupName: 'content'}, {fieldGroupName: 'meta'}];
 
-            Mock.expect(this.content, {
-                method: 'getField',
-                args: [Mock.Value.String],
-                run: function (id) {
-                    return fields[id];
-                }
-            });
+            this.content = _getContentMock.call(this, {});
 
             Y.eZ.FieldView.registerFieldView(this.fieldType, Y.Base.create('somethingView', Y.eZ.FieldView, [], {
                 initializer: function () {
@@ -626,15 +566,84 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             this.view = new Y.eZ.RawContentView({
                 content: this.content,
                 contentType: _getContentTypeMock(this.fieldDefinitions, this.fieldGroups),
-                config: {}
+                config: {},
+                languageSwitcherView: new Y.View(),
             });
         }
     });
 
+    contentTypeChangeTest = new Y.Test.Case({
+        name: "eZ Raw Content View contentTypeChange test",
+
+        setUp: function () {
+            this.fieldDefinitions = [{
+                fieldGroup: 'content',
+                fieldType: 'something',
+                identifier: 'id1',
+            }, {
+                fieldGroup: 'meta',
+                fieldType: 'somethingelse',
+                identifier: 'id2',
+            }];
+            this.fieldGroups = [{fieldGroupName: 'content'}, {fieldGroupName: 'meta'}];
+            this.fields = {'id1': {fieldValue: 'value1'}, 'id2': {fieldValue: 'value2'}};
+            this.fieldViewsInitialized = {};
+
+            this.location = {};
+            this.content = _getContentMock.call(this, {});
+            this.contentType = this._getContentTypeMock();
+
+            Y.Array.each(this.fieldDefinitions, function (def) {
+                Y.eZ.FieldView.registerFieldView(
+                    def.fieldType ,
+                    Y.Base.create(def.fieldType + 'TestView', Y.eZ.FieldView, [], {
+                        initializer: Y.bind(function () {
+                            this.fieldViewsInitialized[def.identifier] = true;
+                        }, this),
+                    })
+                );
+            }, this);
+
+            this.view = new Y.eZ.RawContentView({
+                container: '.container',
+                location: this.location,
+                content: this.content,
+                languageCode: this.languageCode,
+                languageSwitcherView: new Y.View(),
+            });
+        },
+
+        tearDown: function () {
+            this.view.destroy();
+            Y.Array.each(this.fieldDefinitions, function (def) {
+                Y.eZ.FieldView.registerFieldView(
+                    def.fieldType , undefined
+                );
+            });
+        },
+
+        _getContentTypeMock: function () {
+            return _getContentTypeMock(this.fieldDefinitions, this.fieldGroups);
+        },
+
+        "Should initialize the field views": function () {
+            this.view.set('contentType', this.contentType);
+
+            this.fieldDefinitions.forEach(function (def) {
+                Assert.isTrue(
+                    this.fieldViewsInitialized[def.identifier],
+                    "The field views for the content type should have been initialized"
+                );
+            }, this);
+        },
+    });
+
     Y.Test.Runner.setName("eZ Raw Content View tests");
     Y.Test.Runner.add(viewTest);
+    Y.Test.Runner.add(languageSwitcherViewTest);
     Y.Test.Runner.add(eventTest);
     Y.Test.Runner.add(destroyTest);
     Y.Test.Runner.add(configFieldViewTest);
-    Y.Test.Runner.add(incosistencyFieldsTest);
+    Y.Test.Runner.add(inconsistencyFieldsTest);
+    Y.Test.Runner.add(contentTypeChangeTest);
 }, '', {requires: ['test', 'node-event-simulate', 'ez-rawcontentview']});
diff --git a/Tests/js/views/ez-rawcontentview.html b/Tests/js/views/ez-rawcontentview.html
index 350d571bb..bda68c3f4 100644
--- a/Tests/js/views/ez-rawcontentview.html
+++ b/Tests/js/views/ez-rawcontentview.html
@@ -41,7 +41,7 @@
         filter: loaderFilter,
         modules: {
             "ez-rawcontentview": {
-                requires: ['ez-templatebasedview', 'ez-fieldview', 'ez-languageswitcherview', 'ez-accordion-element', 'event-tap'],
+                requires: ['ez-templatebasedview', 'ez-fieldview', 'ez-accordion-element', 'event-tap'],
                 fullpath: "../../../Resources/public/js/views/ez-rawcontentview.js"
             },
             "ez-templatebasedview": {
@@ -64,14 +64,6 @@
                 requires: ['transition'],
                 fullpath: "../../../Resources/public/js/extensions/ez-accordion-element.js"
             },
-            "ez-languageswitcherview": {
-                requires: ['ez-templatebasedview', 'ez-expandable', 'event-tap'],
-                fullpath: "../../../Resources/public/js/views/ez-languageswitcherview.js"
-            },
-            "ez-expandable": {
-                requires: ['view'],
-                fullpath: "../../../Resources/public/js/extensions/ez-expandable.js"
-            }
         }
     }).use('ez-rawcontentview-tests', function (Y) {
         Y.Test.Runner.run();

From b7dcea349583fa12164adfa235cbd99532ad3443 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 14:23:20 +0100
Subject: [PATCH 05/40] EZP-26322: Added the ContentPeekView and corresponding
 view service

---
 Resources/config/css.yml                      |   2 +
 Resources/config/yui.yml                      |   9 +
 .../public/css/theme/views/contentpeek.css    |  51 +++++
 Resources/public/css/views/contentpeek.css    |  58 ++++++
 .../public/js/views/ez-contentpeekview.js     | 135 ++++++++++++++
 .../services/ez-contentpeekviewservice.js     |  26 +++
 Resources/public/templates/contentpeek.hbt    |   7 +
 .../views/assets/ez-contentpeekview-tests.js  | 176 ++++++++++++++++++
 Tests/js/views/ez-contentpeekview.html        |  56 ++++++
 .../assets/ez-contentpeekviewservice-tests.js |  33 ++++
 .../services/ez-contentpeekviewservice.html   |  44 +++++
 11 files changed, 597 insertions(+)
 create mode 100644 Resources/public/css/theme/views/contentpeek.css
 create mode 100644 Resources/public/css/views/contentpeek.css
 create mode 100644 Resources/public/js/views/ez-contentpeekview.js
 create mode 100644 Resources/public/js/views/services/ez-contentpeekviewservice.js
 create mode 100644 Resources/public/templates/contentpeek.hbt
 create mode 100644 Tests/js/views/assets/ez-contentpeekview-tests.js
 create mode 100644 Tests/js/views/ez-contentpeekview.html
 create mode 100644 Tests/js/views/services/assets/ez-contentpeekviewservice-tests.js
 create mode 100644 Tests/js/views/services/ez-contentpeekviewservice.html

diff --git a/Resources/config/css.yml b/Resources/config/css.yml
index 0adb58316..312841591 100644
--- a/Resources/config/css.yml
+++ b/Resources/config/css.yml
@@ -14,6 +14,7 @@ system:
             # layout stylesheets
                 - 'bundles/ezplatformui/css/layout.css'
                 - 'bundles/ezplatformui/css/views/navigationhub.css'
+                - 'bundles/ezplatformui/css/views/contentpeek.css'
                 - 'bundles/ezplatformui/css/views/confirmbox.css'
                 - 'bundles/ezplatformui/css/views/languageselectionbox.css'
                 - 'bundles/ezplatformui/css/views/notificationhub.css'
@@ -115,6 +116,7 @@ system:
                 - 'bundles/ezplatformui/css/theme/views/error.css'
                 - 'bundles/ezplatformui/css/theme/views/loginform.css'
                 - 'bundles/ezplatformui/css/theme/views/bar.css'
+                - 'bundles/ezplatformui/css/theme/views/contentpeek.css'
                 - 'bundles/ezplatformui/css/theme/views/confirmbox.css'
                 - 'bundles/ezplatformui/css/theme/views/languageselectionbox.css'
                 - 'bundles/ezplatformui/css/theme/views/notificationhub.css'
diff --git a/Resources/config/yui.yml b/Resources/config/yui.yml
index fc0dd4cd1..9f66c7074 100644
--- a/Resources/config/yui.yml
+++ b/Resources/config/yui.yml
@@ -298,6 +298,9 @@ system:
                 ez-universaldiscoveryviewservice:
                     requires: ['ez-viewservice', 'ez-sideviewservice', 'ez-imagevariationloadplugin', 'ez-universaldiscoverycontenttreeplugin']
                     path: "%ez_platformui.public_dir%/js/views/services/ez-universaldiscoveryviewservice.js"
+                ez-contentpeekviewservice:
+                    requires: ['ez-viewservice', 'ez-sideviewservice']
+                    path: "%ez_platformui.public_dir%/js/views/services/ez-contentpeekviewservice.js"
                 ez-confirmboxviewservice:
                     requires: ['ez-viewservice', 'ez-sideviewservice']
                     path: "%ez_platformui.public_dir%/js/views/services/ez-confirmboxviewservice.js"
@@ -575,6 +578,12 @@ system:
                 universaldiscoveryselectedview-ez-template:
                     type: 'template'
                     path: "%ez_platformui.public_dir%/templates/universaldiscovery/selected.hbt"
+                ez-contentpeekview:
+                    requires: ['ez-templatebasedview', 'ez-rawcontentview', 'contentpeekview-ez-template']
+                    path: "%ez_platformui.public_dir%/js/views/ez-contentpeekview.js"
+                contentpeekview-ez-template:
+                    type: 'template'
+                    path: "%ez_platformui.public_dir%/templates/contentpeek.hbt"
                 ez-confirmboxview:
                     requires: ['ez-templatebasedview', 'confirmboxview-ez-template']
                     path: "%ez_platformui.public_dir%/js/views/ez-confirmboxview.js"
diff --git a/Resources/public/css/theme/views/contentpeek.css b/Resources/public/css/theme/views/contentpeek.css
new file mode 100644
index 000000000..db973dd8f
--- /dev/null
+++ b/Resources/public/css/theme/views/contentpeek.css
@@ -0,0 +1,51 @@
+/**
+ * Copyright (C) eZ Systems AS. All rights reserved.
+ * For full copyright and license information view LICENSE file distributed with this source code.
+ */
+
+.is-contentpeek-hidden .ez-contentpeek-container {
+    display: flex;
+
+    background: rgba(0, 0, 0, 0);
+    -webkit-transform: translateY(-110%);
+            transform: translateY(-110%);
+}
+
+.ez-contentpeek-container {
+    background: rgba(0, 0, 0, 0.6);
+
+    -webkit-transform: translateY(0);
+            transform: translateY(0);
+    -webkit-transition: all 0.3s;
+            transition: all 0.3s;
+}
+
+.ez-view-contentpeekview {
+    background: #fafafa;
+    border: 1px solid #aaa;
+}
+
+.ez-view-contentpeekview .ez-contentpeek-header {
+    font-size: 2em;
+}
+
+.ez-view-contentpeekview .ez-contentpeek-header:before {
+    float: left;
+    width: 2.4rem;
+}
+
+.ez-view-contentpeekview .ez-contentpeek-close {
+    color: #aaa;
+    cursor: pointer;
+}
+
+.ez-view-contentpeekview .ez-contentpeek-name {
+    font-size: 1em;
+    font-weight: bold;
+}
+
+.ez-view-contentpeekview .ez-contentpeek-contenttype {
+    color: #737373;
+    margin-left: 2.4rem;
+    font-size: 55%;
+}
diff --git a/Resources/public/css/views/contentpeek.css b/Resources/public/css/views/contentpeek.css
new file mode 100644
index 000000000..ccce34ecf
--- /dev/null
+++ b/Resources/public/css/views/contentpeek.css
@@ -0,0 +1,58 @@
+/**
+ * Copyright (C) eZ Systems AS. All rights reserved.
+ * For full copyright and license information view LICENSE file distributed with this source code.
+ */
+
+.ez-contentpeek-container {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    z-index: 21000;
+    padding: 2% 5%;
+    box-sizing: border-box;
+}
+
+.is-contentpeek-hidden .ez-contentpeek-container {
+    display: none;
+}
+
+.ez-contentpeek-container .ez-view-contentpeekview {
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    padding: 2em;
+}
+
+.ez-view-contentpeekview {
+    display: flex;
+    flex-direction: column;
+}
+
+.ez-view-contentpeekview .ez-contentpeek-header {
+    flex: 0;
+}
+
+.ez-view-contentpeekview .ez-rawcontentview-container {
+    overflow: auto;
+    flex: 1;
+    margin-top: 1em;
+}
+
+.ez-view-contentpeekview .ez-view-rawcontentview {
+    margin-top: 0;
+}
+
+.ez-view-contentpeekview .ez-contentpeek-close {
+    display: block;
+    float: right;
+}
+
+.ez-view-contentpeekview .ez-contentpeek-name {
+    margin: 0;
+}
+
+.ez-view-contentpeekview .ez-contentpeek-contenttype {
+    margin: 0;
+}
diff --git a/Resources/public/js/views/ez-contentpeekview.js b/Resources/public/js/views/ez-contentpeekview.js
new file mode 100644
index 000000000..22dad5e86
--- /dev/null
+++ b/Resources/public/js/views/ez-contentpeekview.js
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) eZ Systems AS. All rights reserved.
+ * For full copyright and license information view LICENSE file distributed with this source code.
+ */
+YUI.add('ez-contentpeekview', function (Y) {
+    "use strict";
+    /**
+     * Provide the content peek view
+     *
+     * @module ez-contentpeekview
+     */
+    Y.namespace('eZ');
+
+    /**
+     * The content peek view
+     *
+     * @namespace eZ
+     * @class ContentPeekView
+     * @constructor
+     * @extends eZ.TemplateBasedView
+     */
+    Y.eZ.ContentPeekView = Y.Base.create('contentPeekView', Y.eZ.TemplateBasedView, [], {
+        events: {
+            '.ez-contentpeek-close': {
+                'tap': '_closeContentPeek',
+            },
+        },
+
+        initializer: function () {
+            this.on(
+                ['contentChange', 'locationChange', 'contentTypeChange', 'languageCodeChange'],
+                this._forwardToRawContentView
+            );
+        },
+
+        /**
+         * Attribute change event handler. It sets the same value on the raw
+         * content view.
+         *
+         * @method _forwardToRawContentView
+         * @protected
+         * @param {EventFacade} e
+         */
+        _forwardToRawContentView: function (e) {
+            this.get('rawContentView').set(e.attrName, e.newVal);
+        },
+
+        /**
+         * Closes the Content Peek side view by firing the `contentPeekClose`
+         * event
+         *
+         * @method _closeContentPeek
+         * @protected
+         */
+        _closeContentPeek: function (e) {
+            e.preventDefault();
+            /**
+             * Fired to close the content peek side view
+             *
+             * @event contentPeekClose
+             */
+            this.fire('contentPeekClose');
+        },
+
+        render: function () {
+            var container = this.get('container');
+
+            container.setHTML(this.template({
+                content: this.get('content').toJSON(),
+                contentType: this.get('contentType').toJSON(),
+            }));
+            container.one('.ez-rawcontentview-container').append(
+                this.get('rawContentView').render().get('container')
+            );
+            return this;
+        }
+    }, {
+        ATTRS: {
+            /**
+             * The Content item being displayed
+             *
+             * @attribute content
+             * @type {eZ.Content}
+             * @required
+             */
+            content: {},
+
+            /**
+             * The Location of the Content item being displayed
+             *
+             * @attribute location
+             * @type {eZ.Location}
+             * @required
+             */
+            location: {},
+
+            /**
+             * The Content Type of the Content item being displayed
+             *
+             * @attribute contentType
+             * @type {eZ.ContentType}
+             * @required
+             */
+            contentType: {},
+
+            /**
+             * The language code in which the Contenti item is displayed
+             *
+             * @attribute languageCode
+             * @type {String}
+             * @required
+             */
+            languageCode: {},
+
+            /**
+             * The raw content view instance
+             *
+             * @attribute rawContentView
+             * @type {eZ.RawContentView}
+             */
+            rawContentView: {
+                valueFn: function () {
+                    return new Y.eZ.RawContentView({
+                        content: this.get('content'),
+                        location: this.get('location'),
+                        contentType: this.get('contentType'),
+                        languageCode: this.get('languageCode'),
+                        config: this.get('config'),
+                        bubbleTargets: this,
+                    });
+                },
+            },
+        }
+    });
+});
diff --git a/Resources/public/js/views/services/ez-contentpeekviewservice.js b/Resources/public/js/views/services/ez-contentpeekviewservice.js
new file mode 100644
index 000000000..e0a85019a
--- /dev/null
+++ b/Resources/public/js/views/services/ez-contentpeekviewservice.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) eZ Systems AS. All rights reserved.
+ * For full copyright and license information view LICENSE file distributed with this source code.
+ */
+YUI.add('ez-contentpeekviewservice', function (Y) {
+    "use strict";
+    /**
+     * Provides the content peek view service class
+     *
+     * @method ez-contentpeekviewservice
+     */
+
+    /**
+     * The content peek view service
+     *
+     * @namespace eZ
+     * @class ContentPeekViewService
+     * @constructor
+     * @extends eZ.ViewService
+     */
+    Y.eZ.ContentPeekViewService = Y.Base.create('contentPeekViewService', Y.eZ.ViewService, [Y.eZ.SideViewService], {
+        _getViewParameters: function () {
+            return this.get('parameters');
+        }
+    });
+});
diff --git a/Resources/public/templates/contentpeek.hbt b/Resources/public/templates/contentpeek.hbt
new file mode 100644
index 000000000..40f183e5d
--- /dev/null
+++ b/Resources/public/templates/contentpeek.hbt
@@ -0,0 +1,7 @@
+<header class="ez-contentpeek-header ez-contenttype-icon ez-contenttype-icon-{{ contentType.identifier }}">
+    <a href="#" class="ez-contentpeek-close" data-icon="&#xe62a;"></a>
+    <h1 class="ez-contentpeek-name">{{ content.name }}</h1>
+    <p class="ez-contentpeek-contenttype">{{ translate_property contentType.names }}</p>
+</header>
+
+<div class="ez-rawcontentview-container"></div>
diff --git a/Tests/js/views/assets/ez-contentpeekview-tests.js b/Tests/js/views/assets/ez-contentpeekview-tests.js
new file mode 100644
index 000000000..ef72a03eb
--- /dev/null
+++ b/Tests/js/views/assets/ez-contentpeekview-tests.js
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) eZ Systems AS. All rights reserved.
+ * For full copyright and license information view LICENSE file distributed with this source code.
+ */
+YUI.add('ez-contentpeekview-tests', function (Y) {
+    var renderTest, closeContentPeekTest, forwardAttributeToRawContentView,
+        Assert = Y.Assert, Mock = Y.Mock,
+        _getModelMock = function (toJSON) {
+            var mock = new Mock();
+
+            Mock.expect(mock, {
+                method: 'toJSON',
+                returns: toJSON,
+            });
+            return mock;
+        };
+
+    renderTest = new Y.Test.Case({
+        name: "eZ Content Peek View render test",
+
+        setUp: function () {
+            var RawContentView;
+
+            RawContentView = Y.Base.create('rawContentView', Y.View, [], {
+                render: function () {
+                    renderTest.rawContentViewRendered = true;
+                    return this;
+                },
+            });
+            this.rawContentView = new RawContentView();
+            this.contentJSON = {};
+            this.contentTypeJSON = {};
+            this.view = new Y.eZ.ContentPeekView({
+                content: _getModelMock(this.contentJSON),
+                contentType: _getModelMock(this.contentTypeJSON),
+                rawContentView: this.rawContentView,
+            });
+        },
+
+        tearDown: function () {
+            this.view.destroy();
+            this.rawContentView.destroy();
+            delete this.view;
+            delete this.rawContentView;
+        },
+
+        "Should use a template": function () {
+            var templateCalled = false,
+                origTpl;
+
+            origTpl = this.view.template;
+            this.view.template = function () {
+                templateCalled = true;
+                return origTpl.apply(this, arguments);
+            };
+            this.view.render();
+            Assert.isTrue(templateCalled, "The template should have used to render the view");
+        },
+
+        "Test available variables in the template": function () {
+            var origTpl = this.view.template;
+
+            this.view.template = Y.bind(function (variables) {
+                Assert.isObject(variables, "The template should receive some variables");
+                Assert.areEqual(2, Y.Object.keys(variables).length, "The template should receive 2 variables");
+
+                Assert.areSame(
+                    this.contentJSON, variables.content,
+                    "The content should be available in the template"
+                );
+                Assert.areSame(
+                    this.contentTypeJSON, variables.contentType,
+                    "The contentType should be available in the template"
+                );
+                return origTpl.apply(this.view, arguments);
+            }, this);
+            this.view.render();
+        },
+
+        "Should render the RawContentView in its container": function () {
+            this.view.render();
+
+            Assert.isTrue(
+                this.rawContentViewRendered,
+                "The raw content view should have been rendered"
+            );
+            Assert.isTrue(
+                this.view.get('container').one('.ez-rawcontentview-container').contains(
+                    this.rawContentView.get('container')
+                ),
+                "The raw content view container should have been added"
+            );
+        },
+    });
+
+    closeContentPeekTest = new Y.Test.Case({
+        name: "eZ Content Peek View close content peek test",
+
+        setUp: function () {
+            this.contentJSON = {};
+            this.contentTypeJSON = {};
+            this.view = new Y.eZ.ContentPeekView({
+                container: '.container',
+                content: _getModelMock(this.contentJSON),
+                contentType: _getModelMock(this.contentTypeJSON),
+                rawContentView: new Y.View(),
+            });
+            this.view.render();
+        },
+
+        tearDown: function () {
+            this.view.destroy();
+            delete this.view;
+        },
+
+        "Should fire the `contentPeekClose` event": function () {
+            var container = this.view.get('container'),
+                close = container.one('a');
+
+            container.once('tap', function (e) {
+                Assert.isTrue(
+                    !!e.prevented,
+                    "The tap event should have been prevented"
+                );
+            });
+            this.view.on('contentPeekClose', this.next(function () {}));
+            close.simulateGesture('tap');
+            this.wait();
+        },
+    });
+
+    forwardAttributeToRawContentView = new Y.Test.Case({
+        name: "eZ Content Peek View forward attribute test",
+
+        setUp: function () {
+            this.view = new Y.eZ.ContentPeekView({
+                rawContentView: new Y.View(),
+            });
+        },
+
+        tearDown: function () {
+            this.view.destroy();
+            delete this.view;
+        },
+
+        _testForwardAttribute: function (attrName, value) {
+            this.view.set(attrName, value);
+
+            Assert.areSame(
+                value, this.view.get('rawContentView').get(attrName),
+                "The attribute " + attrName + " should be set on the raw content view"
+            );
+        },
+
+        "Should forward the content attribute value": function () {
+            this._testForwardAttribute('content', {});
+        },
+
+        "Should forward the contentType attribute value": function () {
+            this._testForwardAttribute('contentType', {});
+        },
+
+        "Should forward the location attribute value": function () {
+            this._testForwardAttribute('location', {});
+        },
+
+        "Should forward the languageCode attribute value": function () {
+            this._testForwardAttribute('languageCode', 'fre-FR');
+        },
+    });
+
+    Y.Test.Runner.setName("eZ Content Peek View tests");
+    Y.Test.Runner.add(renderTest);
+    Y.Test.Runner.add(closeContentPeekTest);
+    Y.Test.Runner.add(forwardAttributeToRawContentView);
+}, '', {requires: ['test', 'node-event-simulate', 'ez-contentpeekview']});
diff --git a/Tests/js/views/ez-contentpeekview.html b/Tests/js/views/ez-contentpeekview.html
new file mode 100644
index 000000000..081e71a6e
--- /dev/null
+++ b/Tests/js/views/ez-contentpeekview.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<html>
+<head>
+<title>eZ Content Peek view tests</title>
+</head>
+<body>
+
+<div class="container"></div>
+
+<script type="text/x-handlebars-template" id="contentpeekview-ez-template">
+    <a href="#" class="ez-contentpeek-close">Close</a>
+    <div class="ez-rawcontentview-container"></div>
+</script>
+
+<script type="text/javascript" src="../../../Resources/public/vendors/yui3/build/yui/yui.js"></script>
+<script type="text/javascript" src="./assets/ez-contentpeekview-tests.js"></script>
+<script>
+    var filter = (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'raw',
+        loaderFilter;
+
+    if (filter == 'coverage'){
+        loaderFilter = {
+            searchExp : "/Resources/public/js/",
+            replaceStr: "/Tests/instrument/Resources/public/js/"
+        };
+    } else {
+        loaderFilter = filter;
+    }
+
+    YUI({
+        coverage: ['ez-contentpeekview'],
+        filter: loaderFilter,
+        modules: {
+            "ez-contentpeekview": {
+                requires: ['ez-templatebasedview', 'event-tap'],
+                fullpath: "../../../Resources/public/js/views/ez-contentpeekview.js"
+            },
+            "ez-templatebasedview": {
+                requires: ['ez-view', 'handlebars', 'template'],
+                fullpath: "../../../Resources/public/js/views/ez-templatebasedview.js"
+            },
+            "ez-view": {
+                requires: ['view', 'base-pluginhost', 'ez-pluginregistry'],
+                fullpath: "../../../Resources/public/js/views/ez-view.js"
+            },
+            "ez-pluginregistry": {
+                requires: ['array-extras'],
+                fullpath: "../../../../Resources/public/js/services/ez-pluginregistry.js"
+            },
+        }
+    }).use('ez-contentpeekview-tests', function (Y) {
+        Y.Test.Runner.run();
+    });
+</script>
+</body>
+</html>
diff --git a/Tests/js/views/services/assets/ez-contentpeekviewservice-tests.js b/Tests/js/views/services/assets/ez-contentpeekviewservice-tests.js
new file mode 100644
index 000000000..298285c50
--- /dev/null
+++ b/Tests/js/views/services/assets/ez-contentpeekviewservice-tests.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) eZ Systems AS. All rights reserved.
+ * For full copyright and license information view LICENSE file distributed with this source code.
+ */
+YUI.add('ez-contentpeekviewservice-tests', function (Y) {
+    var getViewParametersTest;
+
+    getViewParametersTest = new Y.Test.Case({
+        name: "eZ Content Peek View Service getViewParameters test",
+
+        setUp: function () {
+            this.service = new Y.eZ.ContentPeekViewService();
+        },
+
+        tearDown: function () {
+            this.service.destroy();
+            delete this.service;
+        },
+
+        "Should return the parameters object": function () {
+            this.service.set('parameters', {param: 'param'});
+
+            Y.Assert.areEqual(
+                'param',
+                this.service.getViewParameters().param,
+                "getViewParameters should return the parameters object"
+            );
+        },
+    });
+
+    Y.Test.Runner.setName("eZ Content Peek View Service tests");
+    Y.Test.Runner.add(getViewParametersTest);
+}, '', {requires: ['test', 'ez-contentpeekviewservice']});
diff --git a/Tests/js/views/services/ez-contentpeekviewservice.html b/Tests/js/views/services/ez-contentpeekviewservice.html
new file mode 100644
index 000000000..55a48f462
--- /dev/null
+++ b/Tests/js/views/services/ez-contentpeekviewservice.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<html>
+<head>
+<title>eZ Content Peek View Service tests</title>
+</head>
+<body>
+
+<script type="text/javascript" src="../../../../Resources/public/vendors/yui3/build/yui/yui.js"></script>
+<script type="text/javascript" src="./assets/ez-contentpeekviewservice-tests.js"></script>
+<script>
+    var filter = (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'raw',
+        loaderFilter;
+    if (filter == 'coverage'){
+        loaderFilter = {
+            searchExp : "/Resources/public/js/",
+            replaceStr: "/Tests/instrument/Resources/public/js/"
+        };
+    } else {
+        loaderFilter = filter;
+    }
+
+    YUI({
+        coverage: ['ez-contentpeekviewservice'],
+        filter: loaderFilter,
+        modules: {
+            "ez-contentpeekviewservice": {
+                requires: ['ez-viewservice', 'ez-sideviewservice'],
+                fullpath: "../../../../Resources/public/js/views/services/ez-contentpeekviewservice.js"
+            },
+            "ez-sideviewservice": {
+                requires: ['base'],
+                fullpath: "../../../../Resources/public/js/extensions/ez-sideviewservice.js"
+            },
+            "ez-viewservice": {
+                requires: ['view'],
+                fullpath: "../../../../Resources/public/js/views/services/ez-viewservice.js"
+            },
+        }
+    }).use('ez-contentpeekviewservice-tests', function (Y) {
+        Y.Test.Runner.run();
+    });
+</script>
+</body>
+</html>

From 3731a6bb75aff91159ac95b231d07dddccb54db9 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 14:59:53 +0100
Subject: [PATCH 06/40] EZP-26322: Configured the ContentPeekView side view

---
 Resources/config/yui.yml                      |  6 ++
 Resources/public/js/apps/ez-platformuiapp.js  |  7 ++
 .../js/apps/plugins/ez-contentpeekplugin.js   | 47 +++++++++++
 Resources/views/PlatformUI/shell.html.twig    |  3 +-
 .../assets/ez-contentpeekplugin-tests.js      | 78 +++++++++++++++++++
 .../js/apps/plugins/ez-contentpeekplugin.html | 42 ++++++++++
 6 files changed, 182 insertions(+), 1 deletion(-)
 create mode 100644 Resources/public/js/apps/plugins/ez-contentpeekplugin.js
 create mode 100644 Tests/js/apps/plugins/assets/ez-contentpeekplugin-tests.js
 create mode 100644 Tests/js/apps/plugins/ez-contentpeekplugin.html

diff --git a/Resources/config/yui.yml b/Resources/config/yui.yml
index 9f66c7074..933c2b61a 100644
--- a/Resources/config/yui.yml
+++ b/Resources/config/yui.yml
@@ -194,6 +194,8 @@ system:
                         - 'ez-discoverybarview'
                         - 'ez-universaldiscoveryviewservice'
                         - 'ez-universaldiscoveryview'
+                        - 'ez-contentpeekviewservice'
+                        - 'ez-contentpeekview'
                         - 'ez-confirmboxviewservice'
                         - 'ez-confirmboxview'
                         - 'ez-languageselectionboxviewservice'
@@ -206,6 +208,7 @@ system:
                         - 'ez-registerlanguagehelpersplugin'
                         - 'ez-domstateplugin'
                         - 'ez-universaldiscoveryplugin'
+                        - 'ez-contentpeekplugin'
                         - 'ez-confirmboxplugin'
                         - 'ez-languageselectionboxplugin'
                         - 'ez-notificationhubplugin'
@@ -1244,6 +1247,9 @@ system:
                 ez-notificationhubplugin:
                     requires: ['plugin', 'base', 'ez-pluginregistry']
                     path: "%ez_platformui.public_dir%/js/apps/plugins/ez-notificationhubplugin.js"
+                ez-contentpeekplugin:
+                    requires: ['plugin', 'base', 'ez-pluginregistry']
+                    path: "%ez_platformui.public_dir%/js/apps/plugins/ez-contentpeekplugin.js"
                 ez-confirmboxplugin:
                     requires: ['plugin', 'base', 'ez-pluginregistry']
                     path: "%ez_platformui.public_dir%/js/apps/plugins/ez-confirmboxplugin.js"
diff --git a/Resources/public/js/apps/ez-platformuiapp.js b/Resources/public/js/apps/ez-platformuiapp.js
index 2d351c952..ee4cbcf7e 100644
--- a/Resources/public/js/apps/ez-platformuiapp.js
+++ b/Resources/public/js/apps/ez-platformuiapp.js
@@ -64,6 +64,13 @@ YUI.add('ez-platformuiapp', function (Y) {
                 container: '.ez-universaldiscovery-container',
                 hideClass: 'is-universaldiscovery-hidden',
             },
+            contentPeek: {
+                type: Y.eZ.ContentPeekView,
+                service: Y.eZ.ContentPeekViewService,
+                container: '.ez-contentpeek-container',
+                hideClass: 'is-contentpeek-hidden',
+                forceRendering: true,
+            },
             confirmBox: {
                 type: Y.eZ.ConfirmBoxView,
                 service: Y.eZ.ConfirmBoxViewService,
diff --git a/Resources/public/js/apps/plugins/ez-contentpeekplugin.js b/Resources/public/js/apps/plugins/ez-contentpeekplugin.js
new file mode 100644
index 000000000..cc3d49940
--- /dev/null
+++ b/Resources/public/js/apps/plugins/ez-contentpeekplugin.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) eZ Systems AS. All rights reserved.
+ * For full copyright and license information view LICENSE file distributed with this source code.
+ */
+YUI.add('ez-contentpeekplugin', function (Y) {
+    "use strict";
+    /**
+     * Provides the content peek plugin
+     *
+     * @module ez-contentpeekplugin
+     */
+    Y.namespace('eZ.Plugin');
+
+    /**
+     * The content peek plugin. It's a plugin for the application to set up the
+     * `contentPeekOpen` and `contentPeekClose` event handlers.
+     *
+     * @namespace eZ.Plugin
+     * @class ContentPeek
+     * @constructor
+     * @extends Plugin.Base
+     */
+    Y.eZ.Plugin.ContentPeek = Y.Base.create('contentPeekPlugin', Y.Plugin.Base, [], {
+        initializer: function () {
+            var app = this.get('host');
+
+            app.on('*:contentPeekOpen', function (e) {
+                var config = e.config;
+
+                if ( !config.languageCode ) {
+                    config.languageCode = config.content.get('mainLanguageCode');
+                }
+                app.showSideView('contentPeek', e.config);
+            });
+
+            app.on('*:contentPeekClose', function (e) {
+                app.hideSideView('contentPeek');
+            });
+        },
+    }, {
+        NS: 'contentPeek',
+    });
+
+    Y.eZ.PluginRegistry.registerPlugin(
+        Y.eZ.Plugin.ContentPeek, ['platformuiApp']
+    );
+});
diff --git a/Resources/views/PlatformUI/shell.html.twig b/Resources/views/PlatformUI/shell.html.twig
index bddafa504..a277d2be4 100644
--- a/Resources/views/PlatformUI/shell.html.twig
+++ b/Resources/views/PlatformUI/shell.html.twig
@@ -28,8 +28,9 @@
 </head>
 <body class="ez-platformui-app-body yui3-skin-platformui">
     <div class="ez-loading-message"><em>{{ 'loading.application'|trans }}</em></div>
-    <div class="ez-platformui-app pure is-menu-hidden is-navigation-hidden is-universaldiscovery-hidden is-confirmbox-hidden is-languageselectionbox-hidden">
+    <div class="ez-platformui-app pure is-menu-hidden is-navigation-hidden is-universaldiscovery-hidden is-contentpeek-hidden is-confirmbox-hidden is-languageselectionbox-hidden">
         <div class="ez-universaldiscovery-container"></div>
+        <div class="ez-contentpeek-container"></div>
         <div class="ez-confirmbox-container"></div>
         <div class="ez-languageselectionbox-container"></div>
         <div class="ez-navigation-container"></div>
diff --git a/Tests/js/apps/plugins/assets/ez-contentpeekplugin-tests.js b/Tests/js/apps/plugins/assets/ez-contentpeekplugin-tests.js
new file mode 100644
index 000000000..f531cef54
--- /dev/null
+++ b/Tests/js/apps/plugins/assets/ez-contentpeekplugin-tests.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) eZ Systems AS. All rights reserved.
+ * For full copyright and license information view LICENSE file distributed with this source code.
+ */
+YUI.add('ez-contentpeekplugin-tests', function (Y) {
+    var registerTest, eventsTest,
+        Assert = Y.Assert, Mock = Y.Mock;
+
+    eventsTest = new Y.Test.Case({
+        name: 'eZ Content Peek Plugin events tests',
+
+        setUp: function () {
+            this.app = new Mock(new Y.Base());
+            this.plugin = new Y.eZ.Plugin.ContentPeek({
+                host: this.app,
+            });
+        },
+
+        tearDown: function () {
+            this.plugin.destroy();
+            delete this.plugin;
+            this.app.destroy();
+            delete this.app;
+        },
+
+        "Should show the content peek side view": function () {
+            var eventConfig = {
+                    languageCode: 'fre-FR',
+                };
+
+            Mock.expect(this.app, {
+                method: 'showSideView',
+                args: ['contentPeek', eventConfig]
+            });
+            this.app.fire('whatever:contentPeekOpen', {config: eventConfig});
+            Mock.verify(this.app);
+        },
+
+        "Should set the languageCode based on the content main language": function () {
+            var content = new Y.Base(),
+                mainLanguageCode = 'fre-FR',
+                eventConfig = {
+                    content: content,
+                };
+            
+            content.set('mainLanguageCode', mainLanguageCode);
+            Mock.expect(this.app, {
+                method: 'showSideView',
+                args: ['contentPeek', eventConfig],
+                run: function (name, config) {
+                    Assert.areEqual(
+                        mainLanguageCode, config.languageCode,
+                        "The languageCode should be set with the content main language code"
+                    );
+                },
+            });
+            this.app.fire('whatever:contentPeekOpen', {config: eventConfig});
+            Mock.verify(this.app);
+        },
+
+        "Should hide the content peek side view": function () {
+            Mock.expect(this.app, {
+                method: 'hideSideView',
+                args: ['contentPeek']
+            });
+            this.app.fire('whatever:contentPeekClose');
+            Mock.verify(this.app);
+        },
+    });
+
+    registerTest = new Y.Test.Case(Y.eZ.Test.PluginRegisterTest);
+    registerTest.Plugin = Y.eZ.Plugin.ContentPeek;
+    registerTest.components = ['platformuiApp'];
+
+    Y.Test.Runner.setName("eZ Content Peek Plugin tests");
+    Y.Test.Runner.add(eventsTest);
+    Y.Test.Runner.add(registerTest);
+}, '', {requires: ['test', 'base', 'ez-contentpeekplugin', 'ez-pluginregister-tests']});
diff --git a/Tests/js/apps/plugins/ez-contentpeekplugin.html b/Tests/js/apps/plugins/ez-contentpeekplugin.html
new file mode 100644
index 000000000..eda0c5308
--- /dev/null
+++ b/Tests/js/apps/plugins/ez-contentpeekplugin.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+<title>eZ Content Peek Plugin tests</title>
+</head>
+<body>
+
+<script type="text/javascript" src="../../../../Resources/public/vendors/yui3/build/yui/yui.js"></script>
+<script type="text/javascript" src="../../assets/pluginregister-tests.js"></script>
+<script type="text/javascript" src="./assets/ez-contentpeekplugin-tests.js"></script>
+<script>
+    var filter = (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'raw',
+        loaderFilter;
+
+    if (filter == 'coverage'){
+        loaderFilter = {
+            searchExp : "/Resources/public/js/",
+            replaceStr: "/Tests/instrument/Resources/public/js/"
+        };
+    } else {
+        loaderFilter = filter;
+    }
+
+    YUI({
+        coverage: ['ez-contentpeekplugin'],
+        filter: loaderFilter,
+        modules: {
+            "ez-contentpeekplugin": {
+                requires: ['plugin', 'base', 'ez-pluginregistry'],
+                fullpath: "../../../../Resources/public/js/apps/plugins/ez-contentpeekplugin.js"
+            },
+            "ez-pluginregistry": {
+                requires: ['array-extras'],
+                fullpath: "../../../../Resources/public/js/services/ez-pluginregistry.js"
+            },
+        }
+    }).use('ez-contentpeekplugin-tests', function (Y) {
+        Y.Test.Runner.run();
+    });
+</script>
+</body>
+</html>

From 9161756acee69b37cde9c3b926556ab1364680fa Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 15:22:57 +0100
Subject: [PATCH 07/40] EZP-26322: Open the content peek view when clicking the
 selected content visual

---
 .../views/universaldiscovery/selected.css     | 15 +++++-
 .../css/views/universaldiscovery/selected.css | 15 ++++++
 .../ez-universaldiscoveryselectedview.js      | 34 +++++++++++++-
 .../templates/universaldiscovery/selected.hbt |  2 +-
 ...ez-universaldiscoveryselectedview-tests.js | 47 +++++++++++++++++++
 .../ez-universaldiscoveryselectedview.html    |  2 +
 6 files changed, 112 insertions(+), 3 deletions(-)

diff --git a/Resources/public/css/theme/views/universaldiscovery/selected.css b/Resources/public/css/theme/views/universaldiscovery/selected.css
index d5be61bbb..5904b2fb9 100644
--- a/Resources/public/css/theme/views/universaldiscovery/selected.css
+++ b/Resources/public/css/theme/views/universaldiscovery/selected.css
@@ -42,12 +42,25 @@
 }
 
 .ez-view-universaldiscoveryselectedview.is-state-no-image .ez-ud-selected-visual:before,
-.ez-view-universaldiscoveryselectedview.is-state-image-loading .ez-ud-selected-visual:before {
+.ez-view-universaldiscoveryselectedview.is-state-image-loading .ez-ud-selected-visual:before,
+.ez-view-universaldiscoveryselectedview .ez-ud-selected-visual:after {
     display: block;
     text-align: center;
     line-height: 7rem;
 }
 
+.ez-view-universaldiscoveryselectedview .ez-ud-selected-visual:after {
+    opacity: 0;
+    transition: all ease 0.3s;
+    color: #fff;
+    content: "\e607";
+}
+
+.ez-view-universaldiscoveryselectedview .ez-ud-selected-visual:hover:after {
+    opacity: 1;
+    background: rgba(0, 0, 0, 0.5);
+}
+
 .ez-view-universaldiscoveryselectedview.is-state-image-loading .ez-ud-selected-visual:before {
     content: "\e61c";
     color: #ddd;
diff --git a/Resources/public/css/views/universaldiscovery/selected.css b/Resources/public/css/views/universaldiscovery/selected.css
index 0d3858b2c..88450818a 100644
--- a/Resources/public/css/views/universaldiscovery/selected.css
+++ b/Resources/public/css/views/universaldiscovery/selected.css
@@ -72,6 +72,21 @@
     display: none;
 }
 
+.ez-view-universaldiscoveryselectedview .ez-ud-selected-visual {
+    cursor: pointer;
+    position: relative;
+}
+
+.ez-view-universaldiscoveryselectedview .ez-ud-selected-visual:after {
+    content: "";
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
 .ez-view-universaldiscoveryselectedview.is-state-image-error .ez-asynchronousview-error {
     display: block;
 }
diff --git a/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js b/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js
index 4635ae12e..fbd98c6ad 100644
--- a/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js
+++ b/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js
@@ -31,7 +31,10 @@ YUI.add('ez-universaldiscoveryselectedview', function (Y) {
         events: {
             '.ez-ud-selected-confirm': {
                 'tap': '_confirmSelected',
-            }
+            },
+            '.ez-ud-selected-visual': {
+                'tap': '_openContentPeekView',
+            },
         },
 
         initializer: function () {
@@ -71,6 +74,35 @@ YUI.add('ez-universaldiscoveryselectedview', function (Y) {
             });
         },
 
+        /**
+         * Opens the ContentPeekView by firing the `contentPeekOpen` event.
+         *
+         * @method _openContentPeekView
+         * @protected
+         * @param {EventFacade} e tap event facade
+         */
+        _openContentPeekView: function (e) {
+            var struct = this.get('contentStruct');
+
+            e.preventDefault();
+            /**
+             * Fired to open the content peek view.
+             *
+             * @event contentPeekOpen
+             * @param {Object} config
+             * @param {eZ.Content} config.content
+             * @param {eZ.Location} config.location
+             * @param {eZ.ContentType} config.contentType
+             */
+            this.fire('contentPeekOpen', {
+                config: {
+                    content: struct.content,
+                    location: struct.location,
+                    contentType: struct.contentType,
+                },
+            });
+        },
+
         /**
          * Detect if the content has an image and set the view state accordingly
          *
diff --git a/Resources/public/templates/universaldiscovery/selected.hbt b/Resources/public/templates/universaldiscovery/selected.hbt
index 7559695ae..057e4f9ce 100644
--- a/Resources/public/templates/universaldiscovery/selected.hbt
+++ b/Resources/public/templates/universaldiscovery/selected.hbt
@@ -4,7 +4,7 @@
         <div class="ez-ud-pane-content ez-asynchronousview">
             <p class="ez-ud-selected-contenttype ez-contenttype-icon ez-contenttype-icon-{{ contentType.identifier }}"> {{ translate_property contentType.names }}</p>
 
-            <div class="ez-ud-selected-visual ez-contenttype-icon ez-contenttype-icon-{{ contentType.identifier }}">
+            <div class="ez-ud-selected-visual ez-font-icon ez-contenttype-icon ez-contenttype-icon-{{ contentType.identifier }}">
                 <img alt="" class="ez-ud-selected-image">
             </div>
 
diff --git a/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js b/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js
index 228fe0760..0f6825b2a 100644
--- a/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js
+++ b/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js
@@ -4,6 +4,7 @@
  */
 YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
     var renderTest, domEventTest, startAnimationTest, confirmButtonStateTest, imageTest,
+        openContentPeekTest,
         Assert = Y.Assert, Mock = Y.Mock,
         _configureMock = function (type, content, currentVersion, translations, imageFieldTab) {
             Mock.expect(type, {
@@ -510,10 +511,56 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
         },
     });
 
+    openContentPeekTest = new Y.Test.Case({
+        name: 'eZ Universal Discovery Selected open content peek tests',
+
+        setUp: function () {
+            var contentType = new Mock(),
+                content = new Mock(),
+                location = new Mock(),
+                currentVersion = new Mock();
+
+            this.view = new Y.eZ.UniversalDiscoverySelectedView({
+                container: '.container',
+            });
+
+            _configureMock(contentType, content, currentVersion, ['fre-FR'], []);
+            Mock.expect(location, {
+                method: 'toJSON',
+                returns: {},
+            });
+            this.view.set('contentStruct', {
+                contentType: contentType,
+                content: content,
+                location: location,
+            });
+        },
+
+        tearDown: function () {
+            this.view.destroy();
+        },
+
+        "Should fire the content peek": function () {
+            var container = this.view.get('container'),
+                visual = container.one('.ez-ud-selected-visual');
+
+            container.once('tap', function (e) {
+                Assert.isTrue(
+                    !!e.prevented,
+                    "The tap event should have been prevented"
+                );
+            });
+            this.view.on('contentPeekOpen', this.next(function () {}));
+            visual.simulateGesture('tap');
+            this.wait();
+        },
+    });
+
     Y.Test.Runner.setName("eZ Universal Discovery Selected View tests");
     Y.Test.Runner.add(renderTest);
     Y.Test.Runner.add(domEventTest);
     Y.Test.Runner.add(startAnimationTest);
     Y.Test.Runner.add(confirmButtonStateTest);
     Y.Test.Runner.add(imageTest);
+    Y.Test.Runner.add(openContentPeekTest);
 }, '', {requires: ['test', 'node-style', 'node-event-simulate', 'ez-universaldiscoveryselectedview']});
diff --git a/Tests/js/views/universaldiscovery/ez-universaldiscoveryselectedview.html b/Tests/js/views/universaldiscovery/ez-universaldiscoveryselectedview.html
index 4bace5c7d..e734df4d0 100644
--- a/Tests/js/views/universaldiscovery/ez-universaldiscoveryselectedview.html
+++ b/Tests/js/views/universaldiscovery/ez-universaldiscoveryselectedview.html
@@ -10,7 +10,9 @@
 <script type="text/x-handlebars-template" id="universaldiscoveryselectedview-ez-template">
 template
 <div class="ez-ud-selected-animation"></div>
+<div class="ez-ud-selected-visual">
     <img alt="" class="ez-ud-selected-image">
+</div>
 <button class="ez-ud-selected-confirm">Confirm</button>
 </script>
 

From b43d215cc986daa3d520f687e3726542b967cbfe Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 15:33:54 +0100
Subject: [PATCH 08/40] EZP-26322: Make sure image fields are correctly
 rendered in the content peek view

---
 .../views/services/plugins/ez-imagevariationloadplugin.js  | 7 +++++--
 .../plugins/assets/ez-imagevariationloadplugin-tests.js    | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Resources/public/js/views/services/plugins/ez-imagevariationloadplugin.js b/Resources/public/js/views/services/plugins/ez-imagevariationloadplugin.js
index 49baa1786..2d9b52831 100644
--- a/Resources/public/js/views/services/plugins/ez-imagevariationloadplugin.js
+++ b/Resources/public/js/views/services/plugins/ez-imagevariationloadplugin.js
@@ -70,7 +70,10 @@ YUI.add('ez-imagevariationloadplugin', function (Y) {
     });
 
     Y.eZ.PluginRegistry.registerPlugin(
-        Y.eZ.Plugin.ImageVariationLoad,
-        ['locationViewViewService', 'universalDiscoveryViewService', 'contentEditViewService', 'contentCreateViewService']
+        Y.eZ.Plugin.ImageVariationLoad, [
+            'locationViewViewService', 'universalDiscoveryViewService',
+            'contentEditViewService', 'contentCreateViewService',
+            'contentPeekViewService'
+        ]
     );
 });
diff --git a/Tests/js/views/services/plugins/assets/ez-imagevariationloadplugin-tests.js b/Tests/js/views/services/plugins/assets/ez-imagevariationloadplugin-tests.js
index 6ae1886fa..4f55f9646 100644
--- a/Tests/js/views/services/plugins/assets/ez-imagevariationloadplugin-tests.js
+++ b/Tests/js/views/services/plugins/assets/ez-imagevariationloadplugin-tests.js
@@ -212,7 +212,10 @@ YUI.add('ez-imagevariationloadplugin-tests', function (Y) {
 
     registerTest = new Y.Test.Case(Y.eZ.Test.PluginRegisterTest);
     registerTest.Plugin = Y.eZ.Plugin.ImageVariationLoad;
-    registerTest.components = ['locationViewViewService', 'universalDiscoveryViewService', 'contentEditViewService', 'contentCreateViewService'];
+    registerTest.components = [
+        'locationViewViewService', 'universalDiscoveryViewService', 'contentEditViewService',
+        'contentCreateViewService', 'contentPeekViewService'
+    ];
 
     Y.Test.Runner.setName("eZ Image Variation Load Plugin tests");
     Y.Test.Runner.add(defaultCallbackTest);

From 31842c4f45c613c602ab8b28936d7f8d1868560f Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 15:37:48 +0100
Subject: [PATCH 09/40] EZP-26322: Make sure embed are resolved when RichText
 field is rendered in the content peek view

---
 .../public/js/views/services/plugins/ez-searchplugin.js      | 2 +-
 .../views/services/plugins/assets/ez-searchplugin-tests.js   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Resources/public/js/views/services/plugins/ez-searchplugin.js b/Resources/public/js/views/services/plugins/ez-searchplugin.js
index 30d4dff8c..495330369 100644
--- a/Resources/public/js/views/services/plugins/ez-searchplugin.js
+++ b/Resources/public/js/views/services/plugins/ez-searchplugin.js
@@ -455,7 +455,7 @@ YUI.add('ez-searchplugin', function (Y) {
         Y.eZ.Plugin.Search, [
             'locationViewViewService', 'universalDiscoveryViewService',
             'contentEditViewService', 'contentCreateViewService',
-            'dashboardBlocksViewService'
+            'dashboardBlocksViewService', 'contentPeekViewService',
         ]
     );
 });
diff --git a/Tests/js/views/services/plugins/assets/ez-searchplugin-tests.js b/Tests/js/views/services/plugins/assets/ez-searchplugin-tests.js
index 96e82d894..f5fc5b32d 100644
--- a/Tests/js/views/services/plugins/assets/ez-searchplugin-tests.js
+++ b/Tests/js/views/services/plugins/assets/ez-searchplugin-tests.js
@@ -1108,7 +1108,10 @@ YUI.add('ez-searchplugin-tests', function (Y) {
 
     registerTest = new Y.Test.Case(Y.eZ.Test.PluginRegisterTest);
     registerTest.Plugin = Y.eZ.Plugin.Search;
-    registerTest.components = ['locationViewViewService', 'dashboardBlocksViewService'];
+    registerTest.components = [
+        'locationViewViewService', 'universalDiscoveryViewService', 'contentEditViewService',
+        'contentCreateViewService', 'dashboardBlocksViewService', 'contentPeekViewService',
+    ];
 
     Y.Test.Runner.setName("eZ Search Plugin Tests");
     Y.Test.Runner.add(contentSearchTests);

From 1987d45c846017f5a4276ab22e3bbced9363f235 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Thu, 17 Nov 2016 08:05:31 +0100
Subject: [PATCH 10/40] EZP-26322: Hide the language switcher in the content
 peek as mutli-language content handling is completely wrong for now

---
 Resources/public/css/views/contentpeek.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Resources/public/css/views/contentpeek.css b/Resources/public/css/views/contentpeek.css
index ccce34ecf..2ed03c366 100644
--- a/Resources/public/css/views/contentpeek.css
+++ b/Resources/public/css/views/contentpeek.css
@@ -56,3 +56,7 @@
 .ez-view-contentpeekview .ez-contentpeek-contenttype {
     margin: 0;
 }
+
+.ez-view-contentpeekview .ez-language-switcher-container {
+    display: none;
+}

From 6364b328cb0403f6bdcf597034f0972f839e9335 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Thu, 17 Nov 2016 11:52:44 +0100
Subject: [PATCH 11/40] EZP-26322: Make sure the visual hint of the peek view
 is vertically centered

---
 .../views/universaldiscovery/selected.css     | 20 ++++++++++++++++---
 .../css/views/universaldiscovery/selected.css |  5 +++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Resources/public/css/theme/views/universaldiscovery/selected.css b/Resources/public/css/theme/views/universaldiscovery/selected.css
index 5904b2fb9..f02eaa5df 100644
--- a/Resources/public/css/theme/views/universaldiscovery/selected.css
+++ b/Resources/public/css/theme/views/universaldiscovery/selected.css
@@ -39,26 +39,40 @@
 
 .ez-view-universaldiscoveryselectedview .ez-ud-selected-visual {
     font-size: 4em;
+    background: #fff;
+    transition: background ease 0.3s;
 }
 
 .ez-view-universaldiscoveryselectedview.is-state-no-image .ez-ud-selected-visual:before,
-.ez-view-universaldiscoveryselectedview.is-state-image-loading .ez-ud-selected-visual:before,
-.ez-view-universaldiscoveryselectedview .ez-ud-selected-visual:after {
+.ez-view-universaldiscoveryselectedview.is-state-image-loading .ez-ud-selected-visual:before {
     display: block;
     text-align: center;
     line-height: 7rem;
 }
 
 .ez-view-universaldiscoveryselectedview .ez-ud-selected-visual:after {
+    text-align: center;
     opacity: 0;
     transition: all ease 0.3s;
     color: #fff;
     content: "\e607";
 }
 
+.ez-view-universaldiscoveryselectedview .ez-ud-selected-visual:hover {
+    background: rgba(50, 50, 50, 0.4);
+}
+
+.ez-view-universaldiscoveryselectedview .ez-ud-selected-visual .ez-ud-selected-image {
+    opacity: 1;
+    transition: opacity ease 0.3s;
+}
+
+.ez-view-universaldiscoveryselectedview .ez-ud-selected-visual:hover .ez-ud-selected-image {
+    opacity: 0.5;
+}
+
 .ez-view-universaldiscoveryselectedview .ez-ud-selected-visual:hover:after {
     opacity: 1;
-    background: rgba(0, 0, 0, 0.5);
 }
 
 .ez-view-universaldiscoveryselectedview.is-state-image-loading .ez-ud-selected-visual:before {
diff --git a/Resources/public/css/views/universaldiscovery/selected.css b/Resources/public/css/views/universaldiscovery/selected.css
index 88450818a..96efe697d 100644
--- a/Resources/public/css/views/universaldiscovery/selected.css
+++ b/Resources/public/css/views/universaldiscovery/selected.css
@@ -81,10 +81,11 @@
     content: "";
     display: block;
     position: absolute;
-    top: 0;
+    text-align: center;
+    top: 50%;
+    transform: translateY(-50%);
     left: 0;
     width: 100%;
-    height: 100%;
 }
 
 .ez-view-universaldiscoveryselectedview.is-state-image-error .ez-asynchronousview-error {

From ccce4cd7e5af6e8596d088abd7a03cd1e0c581b2 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Thu, 17 Nov 2016 14:48:00 +0100
Subject: [PATCH 12/40] EZP-26614: Change loadFieldRelatedContent and
 loadObjectRelations event handlers to expect a source content

---
 .../plugins/ez-objectrelationloadplugin.js    |  15 ++-
 .../plugins/ez-objectrelationsloadplugin.js   |  15 ++-
 .../ez-objectrelationloadplugin-tests.js      | 102 ++++++++++--------
 .../ez-objectrelationsloadplugin-tests.js     |  86 +++++++++++----
 .../plugins/ez-objectrelationloadplugin.html  |  14 +--
 5 files changed, 152 insertions(+), 80 deletions(-)

diff --git a/Resources/public/js/views/services/plugins/ez-objectrelationloadplugin.js b/Resources/public/js/views/services/plugins/ez-objectrelationloadplugin.js
index 6b4c59400..d8f798026 100644
--- a/Resources/public/js/views/services/plugins/ez-objectrelationloadplugin.js
+++ b/Resources/public/js/views/services/plugins/ez-objectrelationloadplugin.js
@@ -36,9 +36,18 @@ YUI.add('ez-objectrelationloadplugin', function (Y) {
         _loadFieldRelatedContent: function (e) {
             var loadOptions = {api: this.get('host').get('capi')},
                 relatedContent = this.get('relatedContent'),
-                contentDestination = this.get('host').get('content').relations(
-                    'ATTRIBUTE', e.fieldDefinitionIdentifier
-                ).shift();
+                sourceContent = e.content,
+                contentDestination;
+
+            if ( !sourceContent ) {
+                console.log('[DEPRECATED] loadFieldRelatedContent event without a source content is deprecated');
+                console.log('[DEPRECATED] Please provide a source Content item in the event facade under the `content` identifier');
+                console.log('[DEPRECATED] This feature will be removed from PlatformUI 2.0');
+                sourceContent = this.get('host').get('content');
+            }
+            contentDestination = sourceContent.relations(
+                'ATTRIBUTE', e.fieldDefinitionIdentifier
+            ).shift();
 
             relatedContent.set('id', contentDestination.destination);
             relatedContent.load(loadOptions, function (error) {
diff --git a/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js b/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js
index 83e4f6948..b3ffdd1d3 100644
--- a/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js
+++ b/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js
@@ -46,9 +46,8 @@ YUI.add('ez-objectrelationsloadplugin', function (Y) {
                 stack = new Y.Parallel(),
                 loadedRelation = {},
                 loadingError = false,
-                contentDestinations = this.get('host').get('content').relations(
-                    e.relationType, e.fieldDefinitionIdentifier
-                ),
+                sourceContent = e.content,
+                contentDestinations,
                 end = stack.add(function (error, struct) {
                     if (error) {
                         e.target.set("loadingError", true);
@@ -58,6 +57,16 @@ YUI.add('ez-objectrelationsloadplugin', function (Y) {
                     }
                 });
 
+            if ( !sourceContent ) {
+                console.log('[DEPRECATED] loadObjectRelations event without a source content is deprecated');
+                console.log('[DEPRECATED] Please provide a source Content item in the event facade under the `content` identifier');
+                console.log('[DEPRECATED] This feature will be removed from PlatformUI 2.0');
+                sourceContent = this.get('host').get('content');
+            }
+            contentDestinations = sourceContent.relations(
+                e.relationType, e.fieldDefinitionIdentifier
+            );
+
             Y.Array.each(contentDestinations, function (value) {
                 if (!loadedRelation[value.destination]) {
                     loadedRelation[value.destination] = true;
diff --git a/Tests/js/views/services/plugins/assets/ez-objectrelationloadplugin-tests.js b/Tests/js/views/services/plugins/assets/ez-objectrelationloadplugin-tests.js
index 2541acb7a..c63a7384e 100644
--- a/Tests/js/views/services/plugins/assets/ez-objectrelationloadplugin-tests.js
+++ b/Tests/js/views/services/plugins/assets/ez-objectrelationloadplugin-tests.js
@@ -4,25 +4,23 @@
  */
 YUI.add('ez-objectrelationloadplugin-tests', function (Y) {
     var tests, registerTest,
-        Assert = Y.Assert;
+        Assert = Y.Assert, Mock = Y.Mock;
 
     tests = new Y.Test.Case({
         name: "eZ Object Relation Load Plugin event tests",
 
         setUp: function () {
+            Y.eZ.Content = function () {};
             this.relatedContent = new Y.Mock();
             this.destinationHref = "/my/content/24";
             this.fieldDefinitionIdentifier = 'super_attribut_relation';
             this.relationId = 42;
 
-            this.fields = {};
-            this.fields[this.fieldDefinitionIdentifier] = {fieldValue: {destinationContentHref: this.destinationHref}};
-            this.content = new Y.eZ.Content();
-            this.content.set('fields', this.fields);
-
-            Y.Mock.expect(this.relatedContent, {
-                method: 'set',
-                args: ['id', this.destinationHref],
+            this.content = new Mock();
+            Mock.expect(this.content, {
+                method: 'relations',
+                args: ['ATTRIBUTE', this.fieldDefinitionIdentifier],
+                returns: [{destination: this.destinationHref}],
             });
 
             this.capi = {};
@@ -34,7 +32,6 @@ YUI.add('ez-objectrelationloadplugin-tests', function (Y) {
             this.view.addTarget(this.service);
 
             this.service.set('capi', this.capi);
-            this.service.set('content', this.content);
 
             this.plugin = new Y.eZ.Plugin.ObjectRelationLoad({
                 host: this.service,
@@ -43,6 +40,7 @@ YUI.add('ez-objectrelationloadplugin-tests', function (Y) {
         },
 
         tearDown: function () {
+            delete Y.eZ.Content;
             this.plugin.destroy();
             this.view.destroy();
             this.service.destroy();
@@ -52,27 +50,34 @@ YUI.add('ez-objectrelationloadplugin-tests', function (Y) {
             delete this.relatedContent;
         },
 
-        "Should load the related content on `loadFieldRelatedContent` event": function () {
-            var that = this,
-                initialLoadingError = this.view.get('loadingError');
-
-            Y.Mock.expect(this.relatedContent, {
+        _mockRelatedContent: function (loadError) {
+            Mock.expect(this.relatedContent, {
+                method: 'set',
+                args: ['id', this.destinationHref],
+            });
+            Mock.expect(this.relatedContent, {
                 method: 'load',
-                args: [Y.Mock.Value.Object, Y.Mock.Value.Function],
-                run: function (options, callback) {
+                args: [Mock.Value.Object, Mock.Value.Function],
+                run: Y.bind(function (options, callback) {
                     Assert.areSame(
-                        that.capi,
+                        this.capi,
                         options.api,
                         'the CAPI should be passed in the options'
                     );
-                    callback();
-                }
+                    callback(loadError);
+                }, this),
             });
+        },
 
-            this.view.fire(
-                'loadFieldRelatedContent',
-                {fieldDefinitionIdentifier: this.fieldDefinitionIdentifier}
-            );
+        "Should load the related content on `loadFieldRelatedContent` event": function () {
+            var initialLoadingError = this.view.get('loadingError');
+
+            this._mockRelatedContent(false);
+            this.view.fire('loadFieldRelatedContent', {
+                fieldDefinitionIdentifier: this.fieldDefinitionIdentifier,
+                content: this.content,
+            });
+            Mock.verify(this.content);
             Assert.areSame(
                 this.relatedContent,
                 this.view.get('destinationContent'),
@@ -86,27 +91,38 @@ YUI.add('ez-objectrelationloadplugin-tests', function (Y) {
             Y.Mock.verify(this.relatedContent);
         },
 
-        "Should handle loading error while loading related content": function () {
-            var that = this,
-                initialDest = this.view.get('destinationContent');
+        "Should pick the source content from the view service `content` attribute": function () {
+            var initialLoadingError = this.view.get('loadingError');
 
-            Y.Mock.expect(this.relatedContent, {
-                method: 'load',
-                args: [Y.Mock.Value.Object, Y.Mock.Value.Function],
-                run: function (options, callback) {
-                    Assert.areSame(
-                        that.capi,
-                        options.api,
-                        'the CAPI should be passed in the options'
-                    );
-                    callback(true);
-                }
-            });
+            this.service.set('content', this.content);
+            this._mockRelatedContent(false);
 
-            this.view.fire(
-                'loadFieldRelatedContent',
-                {fieldDefinitionIdentifier: this.fieldDefinitionIdentifier}
+            this.view.fire('loadFieldRelatedContent', {
+                fieldDefinitionIdentifier: this.fieldDefinitionIdentifier,
+            });
+            Mock.verify(this.content);
+            Assert.areSame(
+                this.relatedContent,
+                this.view.get('destinationContent'),
+                "The view should get the related content"
             );
+            Assert.areSame(
+                initialLoadingError,
+                this.view.get('loadingError'),
+                "The loadingError should stay the same"
+            );
+            Mock.verify(this.relatedContent);
+        },
+
+        "Should handle loading error while loading related content": function () {
+            var initialDest = this.view.get('destinationContent');
+
+            this._mockRelatedContent(true);
+
+            this.view.fire('loadFieldRelatedContent', {
+                fieldDefinitionIdentifier: this.fieldDefinitionIdentifier,
+                content: this.content,
+            });
             Assert.areSame(
                 initialDest,
                 this.view.get('destinationContent'),
@@ -124,4 +140,4 @@ YUI.add('ez-objectrelationloadplugin-tests', function (Y) {
     Y.Test.Runner.setName("eZ Object Relation Load Plugin tests");
     Y.Test.Runner.add(tests);
     Y.Test.Runner.add(registerTest);
-}, '', {requires: ['test', 'view', 'base', 'ez-objectrelationloadplugin', 'ez-contentmodel', 'ez-pluginregister-tests']});
+}, '', {requires: ['test', 'view', 'base', 'ez-objectrelationloadplugin', 'ez-pluginregister-tests']});
diff --git a/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js b/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js
index 4f6dcc60f..5be043a96 100644
--- a/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js
+++ b/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js
@@ -3,8 +3,8 @@
  * For full copyright and license information view LICENSE file distributed with this source code.
  */
 YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
-    var tests, testsContentStructs, registerTest,
-        Assert = Y.Assert;
+    var tests, testsContentStructs, registerTest, noSourceContentTest,
+        Assert = Y.Assert, Mock = Y.Mock;
 
     tests = new Y.Test.Case({
         name: "eZ Object Relations Load Plugin event tests",
@@ -38,8 +38,8 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
                 host: this.service,
             });
 
-            this.service.set('content', new Y.Mock());
-            Y.Mock.expect(this.service.get('content'), {
+            this.content = new Mock();
+            Mock.expect(this.content, {
                 method: 'relations',
                 args: ['ATTRIBUTE', this.fieldDefId],
                 returns: this.contentDestinations
@@ -87,10 +87,11 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
                 callback();
             };
 
-            this.view.fire(
-                'whatever:loadObjectRelations',
-                {relationType: 'ATTRIBUTE', fieldDefinitionIdentifier: that.fieldDefId}
-            );
+            this.view.fire('whatever:loadObjectRelations', {
+                relationType: 'ATTRIBUTE',
+                content: this.content,
+                fieldDefinitionIdentifier: this.fieldDefId,
+            });
 
             Assert.isArray(this.view.get('relatedContents'), 'the view should have an array of contents');
 
@@ -123,10 +124,11 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
                 callback(true);
             };
 
-            this.view.fire(
-                'whatever:loadObjectRelations',
-                {relationType: 'ATTRIBUTE', fieldDefinitionIdentifier: that.fieldDefId}
-            );
+            this.view.fire('whatever:loadObjectRelations', {
+                relationType: 'ATTRIBUTE',
+                content: this.content,
+                fieldDefinitionIdentifier: this.fieldDefId,
+            });
 
             Assert.isArray(this.view.get('relatedContents'), 'the view should have an array of contents');
 
@@ -152,10 +154,11 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
                 callback(this.id == that.destination1);
             };
 
-            this.view.fire(
-                'whatever:loadObjectRelations',
-                {relationType: 'ATTRIBUTE', fieldDefinitionIdentifier: that.fieldDefId}
-            );
+            this.view.fire('whatever:loadObjectRelations', {
+                relationType: 'ATTRIBUTE',
+                content: this.content,
+                fieldDefinitionIdentifier: this.fieldDefId,
+            });
 
             Assert.isArray(this.view.get('relatedContents'), 'the view should have an array of contents');
 
@@ -220,8 +223,8 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
                 host: this.service,
             });
 
-            this.service.set('content', new Y.Mock());
-            Y.Mock.expect(this.service.get('content'), {
+            this.content = new Mock();
+            Mock.expect(this.content, {
                 method: 'relations',
                 args: ['ATTRIBUTE', this.fieldDefId],
                 returns: this.contentDestinations
@@ -301,6 +304,7 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
 
             this.view.fire('whatever:loadObjectRelations', {
                 relationType: 'ATTRIBUTE',
+                content: this.content,
                 fieldDefinitionIdentifier: that.fieldDefId,
                 loadLocationPath: true,
             });
@@ -361,6 +365,7 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
 
             this.view.fire('whatever:loadObjectRelations', {
                 relationType: 'ATTRIBUTE',
+                content: this.content,
                 fieldDefinitionIdentifier: that.fieldDefId,
                 loadLocation: true,
             });
@@ -400,6 +405,7 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
 
             this.view.fire('whatever:loadObjectRelations', {
                 relationType: 'ATTRIBUTE',
+                content: this.content,
                 fieldDefinitionIdentifier: that.fieldDefId,
                 loadLocationPath: true,
             });
@@ -448,6 +454,7 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
 
             this.view.fire('whatever:loadObjectRelations', {
                 relationType: 'ATTRIBUTE',
+                content: this.content,
                 fieldDefinitionIdentifier: that.fieldDefId,
                 loadLocationPath: true,
             });
@@ -505,6 +512,7 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
 
             this.view.fire('whatever:loadObjectRelations', {
                 relationType: 'ATTRIBUTE',
+                content: this.content,
                 fieldDefinitionIdentifier: that.fieldDefId,
                 loadLocationPath: true,
             });
@@ -521,6 +529,47 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
         },
     });
 
+    noSourceContentTest = new Y.Test.Case({
+        name: "eZ Object Relations Load Plugin no source content tests",
+
+        setUp: function () {
+            this.fieldDefId = 69;
+
+            this.service = new Y.Base();
+
+            this.view = new Y.View();
+            this.view.addTarget(this.service);
+
+            this.plugin = new Y.eZ.Plugin.ObjectRelationsLoad({
+                host: this.service,
+            });
+
+            this.content = new Mock();
+            Mock.expect(this.content, {
+                method: 'relations',
+                args: ['ATTRIBUTE', this.fieldDefId],
+                returns: [],
+            });
+            this.service.set('content', this.content);
+            this.plugin.set('contentModelConstructor', this.Content);
+        },
+
+        tearDown: function () {
+            this.service.destroy();
+            this.view.destroy();
+            this.plugin.destroy();
+        },
+
+        "Should pick the source content from the view service `content` attribute": function () {
+            this.view.fire('whatever:loadObjectRelations', {
+                relationType: 'ATTRIBUTE',
+                fieldDefinitionIdentifier: this.fieldDefId,
+            });
+
+            Mock.verify(this.content);
+        },
+    });
+
     registerTest = new Y.Test.Case(Y.eZ.Test.PluginRegisterTest);
     registerTest.Plugin = Y.eZ.Plugin.ObjectRelationsLoad;
     registerTest.components = ['locationViewViewService'];
@@ -528,5 +577,6 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
     Y.Test.Runner.setName("eZ Object Relation List Load Plugin tests");
     Y.Test.Runner.add(tests);
     Y.Test.Runner.add(testsContentStructs);
+    Y.Test.Runner.add(noSourceContentTest);
     Y.Test.Runner.add(registerTest);
 }, '', {requires: ['test', 'view', 'base', 'array-extras', 'ez-objectrelationsloadplugin', 'ez-pluginregister-tests']});
diff --git a/Tests/js/views/services/plugins/ez-objectrelationloadplugin.html b/Tests/js/views/services/plugins/ez-objectrelationloadplugin.html
index 49155848d..8bfb0f6c8 100644
--- a/Tests/js/views/services/plugins/ez-objectrelationloadplugin.html
+++ b/Tests/js/views/services/plugins/ez-objectrelationloadplugin.html
@@ -25,7 +25,7 @@
         filter: loaderFilter,
         modules: {
             "ez-objectrelationloadplugin": {
-                requires: ['ez-viewservicebaseplugin', 'ez-pluginregistry', 'ez-contentmodel'],
+                requires: ['ez-viewservicebaseplugin', 'ez-pluginregistry'],
                 fullpath: "../../../../../Resources/public/js/views/services/plugins/ez-objectrelationloadplugin.js"
             },
             "ez-viewservicebaseplugin": {
@@ -36,18 +36,6 @@
                 requires: ['array-extras'],
                 fullpath: "../../../../../Resources/public/js/services/ez-pluginregistry.js"
             },
-            "ez-contentmodel": {
-                requires: ['ez-restmodel', 'array-extras', 'ez-contentinfo-base'],
-                fullpath: "../../../../../Resources/public/js/models/ez-contentmodel.js"
-            },
-            "ez-restmodel": {
-                requires: ['model'],
-                fullpath: "../../../../../Resources/public/js/models/ez-restmodel.js"
-            },
-            "ez-contentinfo-base": {
-                requires: ['ez-restmodel'],
-                fullpath: "../../../../../Resources/public/js/models/extensions/ez-contentinfo-base.js"
-            },
         }
     }).use('ez-objectrelationloadplugin-tests', function (Y) {
         Y.Test.Runner.run();

From 52cf5a3038447bbe7bb04e6839eafe716313d183 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Thu, 17 Nov 2016 15:01:34 +0100
Subject: [PATCH 13/40] EZP-26614: Changed Relation edit view to not use the
 deprecated behaviour of 'loadFieldRelatedContent' event

---
 .../js/views/fields/ez-relation-editview.js       |  3 ++-
 .../fields/assets/ez-relation-editview-tests.js   | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Resources/public/js/views/fields/ez-relation-editview.js b/Resources/public/js/views/fields/ez-relation-editview.js
index 1e8c207af..5686b173e 100644
--- a/Resources/public/js/views/fields/ez-relation-editview.js
+++ b/Resources/public/js/views/fields/ez-relation-editview.js
@@ -67,7 +67,8 @@ YUI.add('ez-relation-editview', function (Y) {
         _fireLoadFieldRelatedContent: function () {
             if ( !this._isFieldEmpty() ) {
                 this.fire('loadFieldRelatedContent', {
-                    fieldDefinitionIdentifier: this.get('fieldDefinition').identifier
+                    fieldDefinitionIdentifier: this.get('fieldDefinition').identifier,
+                    content: this.get('content'),
                 });
             }
         },
diff --git a/Tests/js/views/fields/assets/ez-relation-editview-tests.js b/Tests/js/views/fields/assets/ez-relation-editview-tests.js
index e8b20daa9..41af03876 100644
--- a/Tests/js/views/fields/assets/ez-relation-editview-tests.js
+++ b/Tests/js/views/fields/assets/ez-relation-editview-tests.js
@@ -166,17 +166,22 @@ YUI.add('ez-relation-editview-tests', function (Y) {
         },
 
         "Should fire the loadFieldRelatedContent event": function () {
-            var loadContentEvent = false,
-                that = this;
+            var loadContentEvent = false;
 
-            this.view.on('loadFieldRelatedContent', function (e) {
+            this.view.on('loadFieldRelatedContent', Y.bind(function (e) {
                 Y.Assert.areSame(
-                    that.fieldDefinitionIdentifier,
+                    this.fieldDefinitionIdentifier,
                     e.fieldDefinitionIdentifier,
                     "fieldDefinitionIdentifier is the same than the one in the field"
                 );
+                Y.Assert.areSame(
+                    this.content,
+                    e.content,
+                    "The content should be provided in the event facade"
+                );
+
                 loadContentEvent = true;
-            });
+            }, this));
             this.view.set('active', true);
 
             Y.Assert.isTrue(loadContentEvent, "loadContentEvent should be called when changing active value");

From 81f5b2e9dc2c14e0c7b273c700d7012124d342df Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Thu, 17 Nov 2016 15:02:18 +0100
Subject: [PATCH 14/40] EZP-26614: Changed Relations edit view to not use the
 deprecated behaviour of 'loadObjectRelations' event

---
 .../views/fields/ez-relationlist-editview.js  |  3 ++-
 .../assets/ez-relationlist-editview-tests.js  | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Resources/public/js/views/fields/ez-relationlist-editview.js b/Resources/public/js/views/fields/ez-relationlist-editview.js
index 346d5baae..a106e232b 100644
--- a/Resources/public/js/views/fields/ez-relationlist-editview.js
+++ b/Resources/public/js/views/fields/ez-relationlist-editview.js
@@ -102,7 +102,8 @@ YUI.add('ez-relationlist-editview', function (Y) {
             if ( !this._isFieldEmpty() ) {
                 this.fire('loadObjectRelations', {
                     relationType: 'ATTRIBUTE',
-                    fieldDefinitionIdentifier: this.get('fieldDefinition').identifier
+                    fieldDefinitionIdentifier: this.get('fieldDefinition').identifier,
+                    content: this.get('content'),
                 });
             }
         },
diff --git a/Tests/js/views/fields/assets/ez-relationlist-editview-tests.js b/Tests/js/views/fields/assets/ez-relationlist-editview-tests.js
index 9b02eaee3..6cbbce384 100644
--- a/Tests/js/views/fields/assets/ez-relationlist-editview-tests.js
+++ b/Tests/js/views/fields/assets/ez-relationlist-editview-tests.js
@@ -601,10 +601,12 @@ YUI.add('ez-relationlist-editview-tests', function (Y) {
                 isRequired: false
             };
             this.field = {fieldValue: {destinationContentIds: [45, 42]}};
+            this.content = {};
 
             this.view = new Y.eZ.RelationListEditView({
                 field: this.field,
                 fieldDefinition: this.fieldDefinition,
+                content: this.content,
             });
         },
 
@@ -614,20 +616,25 @@ YUI.add('ez-relationlist-editview-tests', function (Y) {
         },
 
         "Should fire the loadObjectRelations event": function () {
-            var loadContentEvent = false,
-                that = this;
+            var loadContentEvent = false;
 
-            this.view.on('loadObjectRelations', function (e) {
+            this.view.on('loadObjectRelations', Y.bind(function (e) {
                 Y.Assert.areSame(
-                    that.fieldDefinitionIdentifier,
+                    this.fieldDefinitionIdentifier,
                     e.fieldDefinitionIdentifier,
                     "fieldDefinitionIdentifier is the same than the one in the field"
                 );
+                Y.Assert.areSame(
+                    this.content,
+                    e.content,
+                    "The content should be provided in the event facade"
+                );
+
                 loadContentEvent = true;
-            });
+            }, this));
             this.view.set('active', true);
 
-            Y.Assert.isTrue(loadContentEvent, "loadContentEvent should be called when changing active value");
+            Y.Assert.isTrue(loadContentEvent, "loadObjectRelations event should be fired when getting active");
         },
 
         "Should NOT fire the loadObjectRelations event if field is empty": function () {

From da48abaf1acddee0a567b0bec5a9b62b1b6bf7c7 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Thu, 17 Nov 2016 15:08:07 +0100
Subject: [PATCH 15/40] EZP-26614: Changed field views to receive the Content
 and Content Type

---
 Resources/public/js/views/ez-fieldview.js     | 16 +++++++++++
 .../public/js/views/ez-rawcontentview.js      |  2 ++
 .../views/assets/ez-rawcontentview-tests.js   | 28 +++++++++++++++----
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/Resources/public/js/views/ez-fieldview.js b/Resources/public/js/views/ez-fieldview.js
index 7a9585af3..67a6fb97a 100644
--- a/Resources/public/js/views/ez-fieldview.js
+++ b/Resources/public/js/views/ez-fieldview.js
@@ -120,6 +120,22 @@ YUI.add('ez-fieldview', function (Y) {
              * @type {}
              */
             field: {},
+
+            /**
+             * The Content item the field belongs to
+             *
+             * @attribute content
+             * @type {eZ.Content}
+             */
+            content: {},
+
+            /**
+             * The Content Type of the Content item
+             *
+             * @attribute contentType
+             * @type {eZ.ContentType}
+             */
+            contentType: {},
         },
 
         /**
diff --git a/Resources/public/js/views/ez-rawcontentview.js b/Resources/public/js/views/ez-rawcontentview.js
index 7e9ae0b23..a6b47954b 100644
--- a/Resources/public/js/views/ez-rawcontentview.js
+++ b/Resources/public/js/views/ez-rawcontentview.js
@@ -130,6 +130,8 @@ YUI.add('ez-rawcontentview', function (Y) {
                     fieldView = new View({
                         fieldDefinition: def,
                         field: field,
+                        content: this.get('content'),
+                        contentType: this.get('contentType'),
                         config: config,
                     });
                     fieldView.addTarget(this);
diff --git a/Tests/js/views/assets/ez-rawcontentview-tests.js b/Tests/js/views/assets/ez-rawcontentview-tests.js
index 454d2f04b..fb4869e4e 100644
--- a/Tests/js/views/assets/ez-rawcontentview-tests.js
+++ b/Tests/js/views/assets/ez-rawcontentview-tests.js
@@ -3,7 +3,7 @@
  * For full copyright and license information view LICENSE file distributed with this source code.
  */
 YUI.add('ez-rawcontentview-tests', function (Y) {
-    var viewTest, destroyTest, eventTest, configFieldViewTest, inconsistencyFieldsTest,
+    var viewTest, destroyTest, eventTest, fieldViewParametersTest, inconsistencyFieldsTest,
         languageSwitcherViewTest, contentTypeChangeTest,
         Assert = Y.Assert, Mock = Y.Mock,
         _getContentTypeMock = function (fieldDefinitions, fieldGroups) {
@@ -489,8 +489,8 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
         },
     });
 
-    configFieldViewTest= new Y.Test.Case({
-        name: "eZ Raw Content View config field view test",
+    fieldViewParametersTest= new Y.Test.Case({
+        name: "eZ Raw Content View field view parameters test",
 
         setUp: function () {
             var content;
@@ -509,7 +509,9 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
 
             Y.eZ.FieldView.registerFieldView('something', Y.Base.create('somethingView', Y.eZ.FieldView, [], {
                 initializer: function () {
-                    configFieldViewTest.fieldViewConfig = this.get('config');
+                    fieldViewParametersTest.fieldViewConfig = this.get('config');
+                    fieldViewParametersTest.fieldViewContent = this.get('content');
+                    fieldViewParametersTest.fieldViewContentType = this.get('contentType');
                 },
             }));
 
@@ -533,6 +535,22 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 "The field view should receive the configration from the raw content view"
             );
         },
+
+        "Should pass the content to the field view": function () {
+            Assert.areSame(
+                this.view.get('content'),
+                this.fieldViewContent,
+                "The field view should receive the content from the raw content view"
+            );
+        },
+
+        "Should pass the contentType to the field view": function () {
+            Assert.areSame(
+                this.view.get('contentType'),
+                this.fieldViewContentType,
+                "The field view should receive the contentType from the raw contentType view"
+            );
+        },
     });
 
     inconsistencyFieldsTest = new Y.Test.Case({
@@ -643,7 +661,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
     Y.Test.Runner.add(languageSwitcherViewTest);
     Y.Test.Runner.add(eventTest);
     Y.Test.Runner.add(destroyTest);
-    Y.Test.Runner.add(configFieldViewTest);
+    Y.Test.Runner.add(fieldViewParametersTest);
     Y.Test.Runner.add(inconsistencyFieldsTest);
     Y.Test.Runner.add(contentTypeChangeTest);
 }, '', {requires: ['test', 'node-event-simulate', 'ez-rawcontentview']});

From 84de9903dccaa41f3ca6903626f634ada2c4afbe Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Thu, 17 Nov 2016 15:18:06 +0100
Subject: [PATCH 16/40] EZP-26614: Changed Relation view to not use the
 deprecated behaviour of 'loadFieldRelatedContent' event

---
 .../public/js/views/fields/ez-relation-view.js    |  3 ++-
 .../views/fields/assets/ez-relation-view-tests.js | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Resources/public/js/views/fields/ez-relation-view.js b/Resources/public/js/views/fields/ez-relation-view.js
index 0b25c34b1..8f45a898b 100644
--- a/Resources/public/js/views/fields/ez-relation-view.js
+++ b/Resources/public/js/views/fields/ez-relation-view.js
@@ -45,7 +45,8 @@ YUI.add('ez-relation-view', function (Y) {
         _fireLoadFieldRelatedContent: function () {
             if (!this._isFieldEmpty()) {
                 this.fire('loadFieldRelatedContent', {
-                    fieldDefinitionIdentifier: this.get('fieldDefinition').identifier
+                    fieldDefinitionIdentifier: this.get('fieldDefinition').identifier,
+                    content: this.get('content'),
                 });
             }
         },
diff --git a/Tests/js/views/fields/assets/ez-relation-view-tests.js b/Tests/js/views/fields/assets/ez-relation-view-tests.js
index 95f137bca..473cc19e0 100644
--- a/Tests/js/views/fields/assets/ez-relation-view-tests.js
+++ b/Tests/js/views/fields/assets/ez-relation-view-tests.js
@@ -158,6 +158,7 @@ YUI.add('ez-relation-view-tests', function (Y) {
             this.view = new Y.eZ.RelationView({
                 fieldDefinition: this.fieldDefinition,
                 field: this.field,
+                content: {},
             });
         },
 
@@ -166,18 +167,22 @@ YUI.add('ez-relation-view-tests', function (Y) {
         },
 
         "Should fire the loadFieldRelatedContent when getting active": function () {
-            var loadContentEvent = false,
-                that = this;
+            var loadContentEvent = false;
 
-            this.view.once('loadFieldRelatedContent', function (e) {
+            this.view.once('loadFieldRelatedContent', Y.bind(function (e) {
                 loadContentEvent = true;
                 Assert.areSame(
-                    that.fieldDefinitionIdentifier,
+                    this.fieldDefinitionIdentifier,
                     e.fieldDefinitionIdentifier,
                     "fieldDefinitionIdentifier should be available in the event facade"
                 );
+                Assert.areSame(
+                    this.view.get('content'),
+                    e.content,
+                    "The loadFieldRelatedContent event facade should contain the content"
+                );
 
-            });
+            }, this));
             this.view.set('active', true);
 
             Assert.isTrue(

From 69570315e2935de574f0cca9326d71ef889cff8b Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Thu, 17 Nov 2016 15:19:46 +0100
Subject: [PATCH 17/40] EZP-26614: Changed the Relations view to not use the
 deprecated behaviour of 'loadObjectRelations' event

---
 .../js/views/fields/ez-relationlist-view.js       |  3 ++-
 .../fields/assets/ez-relationlist-view-tests.js   | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Resources/public/js/views/fields/ez-relationlist-view.js b/Resources/public/js/views/fields/ez-relationlist-view.js
index 602be40fd..9d55a85ee 100644
--- a/Resources/public/js/views/fields/ez-relationlist-view.js
+++ b/Resources/public/js/views/fields/ez-relationlist-view.js
@@ -48,7 +48,8 @@ YUI.add('ez-relationlist-view', function (Y) {
             if (!this._isFieldEmpty()){
                 this.fire('loadObjectRelations', {
                     relationType: 'ATTRIBUTE',
-                    fieldDefinitionIdentifier: this.get('fieldDefinition').identifier
+                    fieldDefinitionIdentifier: this.get('fieldDefinition').identifier,
+                    content: this.get('content'),
                 });
             }
         },
diff --git a/Tests/js/views/fields/assets/ez-relationlist-view-tests.js b/Tests/js/views/fields/assets/ez-relationlist-view-tests.js
index 687464a5d..7e9bf58a9 100644
--- a/Tests/js/views/fields/assets/ez-relationlist-view-tests.js
+++ b/Tests/js/views/fields/assets/ez-relationlist-view-tests.js
@@ -36,6 +36,7 @@ YUI.add('ez-relationlist-view-tests', function (Y) {
                 this.view = new Y.eZ.RelationListView({
                     fieldDefinition: this.fieldDefinition,
                     field: this.field,
+                    content: {},
                 });
 
                 Y.one('.app').append(this.view.get('container'));
@@ -47,17 +48,21 @@ YUI.add('ez-relationlist-view-tests', function (Y) {
             },
 
             "Should fire the loadObjectRelations event": function () {
-                var loadContentsEvent = false,
-                    that = this;
+                var loadContentsEvent = false;
 
-                this.view.on('loadObjectRelations', function (e) {
+                this.view.on('loadObjectRelations', Y.bind(function (e) {
                     loadContentsEvent = true;
                     Y.Assert.areSame(
-                        that.fieldDefinitionIdentifier,
+                        this.fieldDefinitionIdentifier,
                         e.fieldDefinitionIdentifier,
                         "fieldDefinitionIdentifier is not the same than the one in the field"
                     );
-                });
+                    Y.Assert.areSame(
+                        this.view.get('content'),
+                        e.content,
+                        "The 'loadObjectRelations' event facade should contain the content"
+                    );
+                }, this));
                 this.view.set('active', true);
 
                 Y.Assert.isTrue(loadContentsEvent, "loadContentsEvent should be called when changing active value");

From 71ffd47abf401f17f1db8d0e75cfdaa019943427 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Wed, 16 Nov 2016 15:36:19 +0100
Subject: [PATCH 18/40] EZP-26614: Make sure Relation(s) fields are correctly
 rendered in the content peek view

---
 .../js/views/services/plugins/ez-objectrelationloadplugin.js  | 4 +++-
 .../js/views/services/plugins/ez-objectrelationsloadplugin.js | 4 +++-
 .../plugins/assets/ez-objectrelationloadplugin-tests.js       | 4 +++-
 .../plugins/assets/ez-objectrelationsloadplugin-tests.js      | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Resources/public/js/views/services/plugins/ez-objectrelationloadplugin.js b/Resources/public/js/views/services/plugins/ez-objectrelationloadplugin.js
index d8f798026..e7dfd4dc5 100644
--- a/Resources/public/js/views/services/plugins/ez-objectrelationloadplugin.js
+++ b/Resources/public/js/views/services/plugins/ez-objectrelationloadplugin.js
@@ -82,6 +82,8 @@ YUI.add('ez-objectrelationloadplugin', function (Y) {
     });
 
     Y.eZ.PluginRegistry.registerPlugin(
-        Y.eZ.Plugin.ObjectRelationLoad, ['locationViewViewService', 'contentEditViewService']
+        Y.eZ.Plugin.ObjectRelationLoad, [
+            'locationViewViewService', 'contentEditViewService', 'contentPeekViewService',
+        ]
     );
 });
diff --git a/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js b/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js
index b3ffdd1d3..0141ddf14 100644
--- a/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js
+++ b/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js
@@ -218,6 +218,8 @@ YUI.add('ez-objectrelationsloadplugin', function (Y) {
     });
 
     Y.eZ.PluginRegistry.registerPlugin(
-        Y.eZ.Plugin.ObjectRelationsLoad, ['locationViewViewService', 'contentEditViewService']
+        Y.eZ.Plugin.ObjectRelationsLoad, [
+            'locationViewViewService', 'contentEditViewService', 'contentPeekViewService',
+        ]
     );
 });
diff --git a/Tests/js/views/services/plugins/assets/ez-objectrelationloadplugin-tests.js b/Tests/js/views/services/plugins/assets/ez-objectrelationloadplugin-tests.js
index c63a7384e..f3b2a1245 100644
--- a/Tests/js/views/services/plugins/assets/ez-objectrelationloadplugin-tests.js
+++ b/Tests/js/views/services/plugins/assets/ez-objectrelationloadplugin-tests.js
@@ -135,7 +135,9 @@ YUI.add('ez-objectrelationloadplugin-tests', function (Y) {
 
     registerTest = new Y.Test.Case(Y.eZ.Test.PluginRegisterTest);
     registerTest.Plugin = Y.eZ.Plugin.ObjectRelationLoad;
-    registerTest.components = ['locationViewViewService'];
+    registerTest.components = [
+        'locationViewViewService', 'contentEditViewService', 'contentPeekViewService',
+    ];
 
     Y.Test.Runner.setName("eZ Object Relation Load Plugin tests");
     Y.Test.Runner.add(tests);
diff --git a/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js b/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js
index 5be043a96..8f5ec272d 100644
--- a/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js
+++ b/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js
@@ -572,7 +572,9 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
 
     registerTest = new Y.Test.Case(Y.eZ.Test.PluginRegisterTest);
     registerTest.Plugin = Y.eZ.Plugin.ObjectRelationsLoad;
-    registerTest.components = ['locationViewViewService'];
+    registerTest.components = [
+        'locationViewViewService', 'contentEditViewService', 'contentPeekViewService',
+    ];
 
     Y.Test.Runner.setName("eZ Object Relation List Load Plugin tests");
     Y.Test.Runner.add(tests);

From 0c403af5fc4591b87467ec762d4208899bb2d0ae Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 14:09:53 +0100
Subject: [PATCH 19/40] EZP-26613: Make sure we don't recreate the current
 version object

---
 Resources/public/js/models/ez-contentmodel.js | 20 ++++-
 .../js/models/assets/ez-contentmodel-tests.js | 77 +++++++++++--------
 2 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/Resources/public/js/models/ez-contentmodel.js b/Resources/public/js/models/ez-contentmodel.js
index cc8cf261c..273085fca 100644
--- a/Resources/public/js/models/ez-contentmodel.js
+++ b/Resources/public/js/models/ez-contentmodel.js
@@ -455,13 +455,27 @@ YUI.add('ez-contentmodel', function (Y) {
              */
             currentVersion: {
                 getter: function (value) {
-                    var version = new Y.eZ.Version();
+                    var version = this._currentVersion || new Y.eZ.Version();
 
-                    if ( value ) {
+                    if ( value && this._dirtyCurrentVersion ) {
                         version.setAttrs(version.parse({document: value}));
                     }
+                    /**
+                     * Holds the current version to avoid creating a new object
+                     * again and again
+                     *
+                     * @property _currentVersion
+                     * @protected
+                     * @type {eZ.Version}
+                     */
+                    this._currentVersion = version;
+                    this._dirtyCurrentVersion = false;
                     return version;
-                }
+                },
+                setter: function (value) {
+                    this._dirtyCurrentVersion = true;
+                    return value;
+                },
             }
         }
     });
diff --git a/Tests/js/models/assets/ez-contentmodel-tests.js b/Tests/js/models/assets/ez-contentmodel-tests.js
index a2179e937..40397a644 100644
--- a/Tests/js/models/assets/ez-contentmodel-tests.js
+++ b/Tests/js/models/assets/ez-contentmodel-tests.js
@@ -5,7 +5,7 @@
 YUI.add('ez-contentmodel-tests', function (Y) {
     var modelTest, relationsTest, createContent, deleteContent, loadResponse, copyTest,
         loadLocationsTest, addLocationTest, setMainLocationTest, hasTranslationTest,
-        getFieldsOfTypeTest, createDraftTest,
+        getFieldsOfTypeTest, createDraftTest, currentVersionTest,
         Assert = Y.Assert,
         Mock = Y.Mock;
 
@@ -230,36 +230,6 @@ YUI.add('ez-contentmodel-tests', function (Y) {
             Y.Mock.verify(this.serviceMock);
         },
 
-        "The current version should be instance of eZ.Version": function () {
-            var currentVersionStruct = loadResponse.Content.CurrentVersion;
-
-            this.model.set('currentVersion', currentVersionStruct);
-            Y.Assert.isInstanceOf(
-                Y.eZ.Version,
-                this.model.get('currentVersion'),
-                'Current version should be instance of eZ.Version'
-            );
-            Y.Assert.areEqual(
-                currentVersionStruct.Version.VersionInfo.versionNo,
-                this.model.get('currentVersion').get('versionNo'),
-                'Should instantiate current version with version no'
-            );
-            Y.Assert.areEqual(
-                currentVersionStruct.Version.VersionInfo.id,
-                this.model.get('currentVersion').get('versionId'),
-                'Should instantiate current version with version id'
-            );
-        },
-
-        "The current version should be instance of eZ.Version (not version)": function () {
-            this.model.set('currentVersion', undefined);
-            Y.Assert.isInstanceOf(
-                Y.eZ.Version,
-                this.model.get('currentVersion'),
-                'Current version should be instance of eZ.Version'
-            );
-        },
-
         "Should read the fields of the current version": function () {
             var m = this.model,
                 response = {
@@ -1275,6 +1245,50 @@ YUI.add('ez-contentmodel-tests', function (Y) {
         },
     });
 
+    currentVersionTest = new Y.Test.Case({
+        name: "eZ Content Model current version test",
+
+        setUp: function () {
+            this.model = new Y.eZ.Content();
+        },
+
+        tearDown: function () {
+            this.model.destroy();
+        },
+
+        "Should be instance of eZ.Version": function () {
+            Assert.isInstanceOf(
+                Y.eZ.Version, this.model.get('currentVersion'),
+                "The current version should be an instance of eZ.Version"
+            );
+        },
+
+        "Should keep the same instance": function () {
+            var version1 = this.model.get('currentVersion');
+
+            Assert.areSame(
+                version1, this.model.get('currentVersion'),
+                "The same object instance should reused"
+            );
+        },
+
+        "Should parse the attribute value": function () {
+            var currentVersionStruct = loadResponse.Content.CurrentVersion;
+
+            this.model.set('currentVersion', currentVersionStruct);
+            Assert.areEqual(
+                currentVersionStruct.Version.VersionInfo.versionNo,
+                this.model.get('currentVersion').get('versionNo'),
+                'Should instantiate current version with version no'
+            );
+            Assert.areEqual(
+                currentVersionStruct.Version.VersionInfo.id,
+                this.model.get('currentVersion').get('versionId'),
+                'Should instantiate current version with version id'
+            );
+        },
+    });
+
     Y.Test.Runner.setName("eZ Content Model tests");
     Y.Test.Runner.add(modelTest);
     Y.Test.Runner.add(relationsTest);
@@ -1287,4 +1301,5 @@ YUI.add('ez-contentmodel-tests', function (Y) {
     Y.Test.Runner.add(hasTranslationTest);
     Y.Test.Runner.add(getFieldsOfTypeTest);
     Y.Test.Runner.add(createDraftTest);
+    Y.Test.Runner.add(currentVersionTest);
 }, '', {requires: ['test', 'model-tests', 'ez-contentmodel', 'ez-restmodel']});

From 0acf9604385856d5b68be5a7c7aeb3fa191203b7 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 09:51:54 +0100
Subject: [PATCH 20/40] EZP-26613: Changed Content `fields` attribute to be a
 shortcut to currentVersion `fields` attribute

---
 Resources/public/js/models/ez-contentmodel.js | 23 +++--
 .../js/models/assets/ez-contentmodel-tests.js | 86 +++++++++++++------
 2 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/Resources/public/js/models/ez-contentmodel.js b/Resources/public/js/models/ez-contentmodel.js
index 273085fca..dbee639c0 100644
--- a/Resources/public/js/models/ez-contentmodel.js
+++ b/Resources/public/js/models/ez-contentmodel.js
@@ -23,7 +23,10 @@ YUI.add('ez-contentmodel', function (Y) {
     Y.eZ.Content = Y.Base.create('contentModel', Y.eZ.RestModel, [Y.eZ.ContentInfoBase], {
         /**
          * Override of the eZ.RestModel _parseStruct method to also read the
-         * fields of the current version
+         * fields of the current version and the relations. The fields parsing
+         * is deprecated and will be removed from PlatformUI 2.0. Also, this
+         * parsing is broken in case of a Content translated in several
+         * languages.
          *
          * @protected
          * @method _parseStruct
@@ -43,12 +46,16 @@ YUI.add('ez-contentmodel', function (Y) {
                     fieldDefinitionIdentifier: relation.SourceFieldDefinitionIdentifier
                 });
             });
+            attrs.relations = relations;
 
+            // the field parsing is deprecated, buggy and not really used in
+            // Content model as the `fields` attribute is now a shortcut to the
+            // field attribute of current version.
             Y.Array.each(struct.CurrentVersion.Version.Fields.field, function (field) {
                 fields[field.fieldDefinitionIdentifier] = field;
             });
-            attrs.relations = relations;
             attrs.fields = fields;
+
             attrs.currentVersion = struct.CurrentVersion;
             return attrs;
         },
@@ -161,7 +168,7 @@ YUI.add('ez-contentmodel', function (Y) {
          * @return {Object} or undefined if the field does not exists
          */
         getField: function (identifier) {
-            var fields = this.get('fields');
+            var fields = this.get('currentVersion').get('fields');
             return fields[identifier];
         },
 
@@ -426,14 +433,20 @@ YUI.add('ez-contentmodel', function (Y) {
         ATTRS: {
             /**
              * Fields in the current version of the content indexed by field
-             * definition identifier
+             * definition identifier. This is just shortcut to the fields in the
+             * current version.
              *
              * @attribute fields
              * @default {}
              * @type Object
              */
             fields: {
-                value: {}
+                getter: function () {
+                    return this.get('currentVersion').get('fields');
+                },
+                setter: function (value) {
+                    this.get('currentVersion').set('fields', value);
+                },
             },
 
             /**
diff --git a/Tests/js/models/assets/ez-contentmodel-tests.js b/Tests/js/models/assets/ez-contentmodel-tests.js
index 40397a644..8b0b989dd 100644
--- a/Tests/js/models/assets/ez-contentmodel-tests.js
+++ b/Tests/js/models/assets/ez-contentmodel-tests.js
@@ -5,7 +5,7 @@
 YUI.add('ez-contentmodel-tests', function (Y) {
     var modelTest, relationsTest, createContent, deleteContent, loadResponse, copyTest,
         loadLocationsTest, addLocationTest, setMainLocationTest, hasTranslationTest,
-        getFieldsOfTypeTest, createDraftTest, currentVersionTest,
+        getFieldsOfTypeTest, createDraftTest, currentVersionTest, fieldAttributeTest,
         Assert = Y.Assert,
         Mock = Y.Mock;
 
@@ -314,22 +314,17 @@ YUI.add('ez-contentmodel-tests', function (Y) {
         },
 
         "Should return the fields": function () {
-            var m = this.model,
-                fields = {
-                    'test': {'id': 42},
-                    'test2': {'id': 43}
-                };
-            m.set('fields', fields);
+            var m = this.model;
 
-            Y.Assert.areEqual(
-                fields.test.id,
-                m.getField('test').id
-            );
-            Y.Assert.areEqual(
-                fields.test2.id,
-                m.getField('test2').id
-            );
-            Y.Assert.isUndefined(
+            m.set('currentVersion', this.loadResponse.Content.CurrentVersion);
+
+            this.loadResponse.Content.CurrentVersion.Version.Fields.field.forEach(function (field) {
+                Assert.areEqual(
+                    field.id, m.getField(field.fieldDefinitionIdentifier).id,
+                    "The fields should be taken from the current version"
+                );
+            });
+            Assert.isUndefined(
                 m.getField('doesnotexist')
             );
         }
@@ -399,13 +394,15 @@ YUI.add('ez-contentmodel-tests', function (Y) {
 
         "Should return ATTRIBUTE relation list with a field identifier": function () {
             var fieldDefinitionIdentifier = 'attr2',
-                fields = {},
+                versionStruct,
                 destinationContentHref = "/my/content/42";
 
-            fields[fieldDefinitionIdentifier] = {
+            versionStruct = Y.merge(loadResponse.Content.CurrentVersion);
+            versionStruct.Version.Fields.field = [{
+                fieldDefinitionIdentifier: fieldDefinitionIdentifier,
                 fieldValue: {destinationContentHrefs: [destinationContentHref]}
-            };
-            this.model.set('fields', fields);
+            }];
+            this.model.set('currentVersion', versionStruct);
 
             this._testRelations(
                 [{destination: destinationContentHref}],
@@ -416,13 +413,16 @@ YUI.add('ez-contentmodel-tests', function (Y) {
 
         "Should return ATTRIBUTE relation with a field identifier": function () {
             var fieldDefinitionIdentifier = 'attr2',
-                fields = {},
+                versionStruct,
                 destinationContentHref = "/my/content/42";
 
-            fields[fieldDefinitionIdentifier] = {
+            versionStruct = Y.merge(loadResponse.Content.CurrentVersion);
+            versionStruct.Version.Fields.field = [{
+                fieldDefinitionIdentifier: fieldDefinitionIdentifier,
                 fieldValue: {destinationContentHref: destinationContentHref}
-            };
-            this.model.set('fields', fields);
+            }];
+            this.model.set('currentVersion', versionStruct);
+
 
             this._testRelations(
                 [{destination: destinationContentHref}],
@@ -481,11 +481,9 @@ YUI.add('ez-contentmodel-tests', function (Y) {
         name: "eZ Content Model create tests",
 
         setUp: function () {
-            var that = this,
-                currentVersionStruct = loadResponse.Content.CurrentVersion;
+            var that = this;
 
             this.model = new Y.eZ.Content();
-            this.model.set('currentVersion', currentVersionStruct);
 
             this.typeId = 'song';
             this.alwaysAvailable = true;
@@ -634,7 +632,7 @@ YUI.add('ez-contentmodel-tests', function (Y) {
                 Assert.areEqual(
                     0,
                     Y.Object.keys(content.get('fields')).length,
-                    "The response should not be provided"
+                    "The response should not be parsed"
                 );
             });
         },
@@ -1289,6 +1287,37 @@ YUI.add('ez-contentmodel-tests', function (Y) {
         },
     });
 
+    fieldAttributeTest = new Y.Test.Case({
+        name: "eZ Content Model field attribute test",
+
+        setUp: function () {
+            this.model = new Y.eZ.Content();
+        },
+
+        tearDown: function () {
+            this.model.destroy();
+        },
+
+        "Should return the `fields` attribute of the current version": function () {
+            Assert.areSame(
+                this.model.get('currentVersion').get('fields'),
+                this.model.get('fields'),
+                "The fields attribute should reference the current version field attribute"
+            );
+        },
+
+        "Should set the `fields` attribute of the current version": function () {
+            var fields = {};
+
+            this.model.set('fields', fields);
+
+            Assert.areSame(
+                fields, this.model.get('currentVersion').get('fields'),
+                "The fields attribute should be set on the current version"
+            );
+        },
+    });
+
     Y.Test.Runner.setName("eZ Content Model tests");
     Y.Test.Runner.add(modelTest);
     Y.Test.Runner.add(relationsTest);
@@ -1302,4 +1331,5 @@ YUI.add('ez-contentmodel-tests', function (Y) {
     Y.Test.Runner.add(getFieldsOfTypeTest);
     Y.Test.Runner.add(createDraftTest);
     Y.Test.Runner.add(currentVersionTest);
+    Y.Test.Runner.add(fieldAttributeTest);
 }, '', {requires: ['test', 'model-tests', 'ez-contentmodel', 'ez-restmodel']});

From 1ef6ad798f237db30f185521f0cb839fb7d5b932 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 10:40:08 +0100
Subject: [PATCH 21/40] EZP-26613: Changed Content#getField to use
 Version#getField

---
 Resources/public/js/models/ez-contentmodel.js |  5 +--
 .../js/models/assets/ez-contentmodel-tests.js | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/Resources/public/js/models/ez-contentmodel.js b/Resources/public/js/models/ez-contentmodel.js
index dbee639c0..aed1c15c1 100644
--- a/Resources/public/js/models/ez-contentmodel.js
+++ b/Resources/public/js/models/ez-contentmodel.js
@@ -168,8 +168,9 @@ YUI.add('ez-contentmodel', function (Y) {
          * @return {Object} or undefined if the field does not exists
          */
         getField: function (identifier) {
-            var fields = this.get('currentVersion').get('fields');
-            return fields[identifier];
+            var version = this.get('currentVersion');
+
+            return version.getField.apply(version, arguments);
         },
 
         /**
diff --git a/Tests/js/models/assets/ez-contentmodel-tests.js b/Tests/js/models/assets/ez-contentmodel-tests.js
index 8b0b989dd..944e31857 100644
--- a/Tests/js/models/assets/ez-contentmodel-tests.js
+++ b/Tests/js/models/assets/ez-contentmodel-tests.js
@@ -6,6 +6,7 @@ YUI.add('ez-contentmodel-tests', function (Y) {
     var modelTest, relationsTest, createContent, deleteContent, loadResponse, copyTest,
         loadLocationsTest, addLocationTest, setMainLocationTest, hasTranslationTest,
         getFieldsOfTypeTest, createDraftTest, currentVersionTest, fieldAttributeTest,
+        getFieldTest,
         Assert = Y.Assert,
         Mock = Y.Mock;
 
@@ -1318,6 +1319,36 @@ YUI.add('ez-contentmodel-tests', function (Y) {
         },
     });
 
+    getFieldTest = new Y.Test.Case({
+        name: "eZ Content Model getField test",
+
+        setUp: function () {
+            this.model = new Y.eZ.Content();
+        },
+
+        tearDown: function () {
+            this.model.destroy();
+        },
+
+        "Should call current version getField": function () {
+            var version = this.model.get('currentVersion'),
+                getFieldCalled = false,
+                origGetField = version.getField;
+
+            version.getField = function () {
+                getFieldCalled = true;
+                return origGetField.apply(version, arguments);
+            };
+
+            this.model.getField('whatever');
+            Assert.isTrue(
+                getFieldCalled,
+                "Current version getField method should have been called"
+            );
+        },
+    });
+
+
     Y.Test.Runner.setName("eZ Content Model tests");
     Y.Test.Runner.add(modelTest);
     Y.Test.Runner.add(relationsTest);
@@ -1332,4 +1363,5 @@ YUI.add('ez-contentmodel-tests', function (Y) {
     Y.Test.Runner.add(createDraftTest);
     Y.Test.Runner.add(currentVersionTest);
     Y.Test.Runner.add(fieldAttributeTest);
+    Y.Test.Runner.add(getFieldTest);
 }, '', {requires: ['test', 'model-tests', 'ez-contentmodel', 'ez-restmodel']});

From c58a2c7801ff121569c4142d1288341777052e07 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 14:42:18 +0100
Subject: [PATCH 22/40] EZP-26613: Changed Version model organize the field by
 language first

---
 Resources/public/js/models/ez-versionmodel.js | 73 +++++++++++++++++--
 .../js/models/assets/ez-contentmodel-tests.js |  2 +-
 .../js/models/assets/ez-versionmodel-tests.js | 52 ++++++++++++-
 3 files changed, 116 insertions(+), 11 deletions(-)

diff --git a/Resources/public/js/models/ez-versionmodel.js b/Resources/public/js/models/ez-versionmodel.js
index de887693c..e933b4d0e 100644
--- a/Resources/public/js/models/ez-versionmodel.js
+++ b/Resources/public/js/models/ez-versionmodel.js
@@ -155,18 +155,59 @@ YUI.add('ez-versionmodel', function (Y) {
          * @return {Object}
          */
         _parseStruct: function (struct, responseDoc) {
-            var attrs, fields = {};
+            var attrs, fields = responseDoc.Version.Fields.field;
 
             attrs = Y.eZ.RestModel.prototype._parseStruct.call(this, struct);
 
-            Y.Array.each(responseDoc.Version.Fields.field, function (field) {
-                fields[field.fieldDefinitionIdentifier] = field;
-            });
-            attrs.fields = fields;
+            attrs.fields = this._indexFieldsByIdentifier(fields);
+            attrs.fieldsByLanguage = this._indexFieldsByLanguages(fields);
             attrs.id = responseDoc.Version._href;
             return attrs;
         },
 
+        /**
+         * Indexes the given `fields` by identifier. This is buggy by design but
+         * kept for BC as the fields can be translated so the same identifier
+         * can appears several times in the REST response.
+         *
+         * @deprecated
+         * @method _indexFieldsByIdentifier
+         * @protected
+         * @param {Array} fields
+         * @return {Object}
+         */
+        _indexFieldsByIdentifier: function (fields) {
+            var fieldsByIdentifier = {};
+
+            fields.forEach(function (field) {
+                fieldsByIdentifier[field.fieldDefinitionIdentifier] = field;
+            });
+
+            return fieldsByIdentifier;
+        },
+
+        /**
+         * Indexes the given `fields` by language code and identifier.
+         *
+         * @method _indexFieldsByLanguages
+         * @protected
+         * @param {Array} fields
+         * @return {Object}
+         */
+        _indexFieldsByLanguages: function (fields) {
+            var fieldsByLanguage = {};
+
+            fields.forEach(function (field) {
+                var language = field.languageCode,
+                    identifier = field.fieldDefinitionIdentifier;
+
+                fieldsByLanguage[language] = fieldsByLanguage[language] || {};
+                fieldsByLanguage[language][identifier] = field;
+            });
+
+            return fieldsByLanguage;
+        },
+
         /**
          * Returns the field which identifier is in parameter
          *
@@ -209,7 +250,27 @@ YUI.add('ez-versionmodel', function (Y) {
              */
             fields: {
                 value: {}
-            }
+            },
+
+            /**
+             * The fields of the version by language code and field identifier,
+             * e.g
+             *      'fre-FR': {
+             *          'title': {},
+             *          'body': {},
+             *      }, {
+             *      'eng-GB': {
+             *          'title: {},
+             *          'body': {},
+             *      }
+             *
+             * @attribute fieldsByLanguage
+             * @type {Object}
+             * @default {}
+             */
+            fieldsByLanguage: {
+                value: {},
+            },
         }
     });
 });
diff --git a/Tests/js/models/assets/ez-contentmodel-tests.js b/Tests/js/models/assets/ez-contentmodel-tests.js
index 944e31857..d1c52d121 100644
--- a/Tests/js/models/assets/ez-contentmodel-tests.js
+++ b/Tests/js/models/assets/ez-contentmodel-tests.js
@@ -1180,7 +1180,7 @@ YUI.add('ez-contentmodel-tests', function (Y) {
         },
 
         "Should find the translation": function () {
-            this.content.set('currentVersion', {Version: {VersionInfo: {languageCodes: 'fre-FR'}, Fields: {field: {}}}});
+            this.content.set('currentVersion', {Version: {VersionInfo: {languageCodes: 'fre-FR'}, Fields: {field: []}}});
             Assert.isTrue(
                 this.content.hasTranslation('fre-FR'),
                 "The translation should have been found"
diff --git a/Tests/js/models/assets/ez-versionmodel-tests.js b/Tests/js/models/assets/ez-versionmodel-tests.js
index 4b0a64104..5e9b09aa1 100644
--- a/Tests/js/models/assets/ez-versionmodel-tests.js
+++ b/Tests/js/models/assets/ez-versionmodel-tests.js
@@ -40,14 +40,26 @@ YUI.add('ez-versionmodel-tests', function (Y) {
                             "id": 978,
                             "fieldDefinitionIdentifier": "name",
                             "languageCode": "eng-GB",
-                            "fieldValue": "T11"
+                            "fieldValue": "name"
                         },
                         {
                             "id": 979,
                             "fieldDefinitionIdentifier": "text",
                             "languageCode": "eng-GB",
                             "fieldValue": "Once and for all"
-                        }
+                        },
+                        {
+                            "id": 978,
+                            "fieldDefinitionIdentifier": "name",
+                            "languageCode": "fre-FR",
+                            "fieldValue": "nom"
+                        },
+                        {
+                            "id": 979,
+                            "fieldDefinitionIdentifier": "text",
+                            "languageCode": "fre-FR",
+                            "fieldValue": "Une bois fois pour toute"
+                        },
                     ]
                 },
                 "Relations": {
@@ -68,7 +80,7 @@ YUI.add('ez-versionmodel-tests', function (Y) {
             this.serviceMock = new Y.Mock();
             this.serviceLoad = 'loadContent';
             this.rootProperty = "Version.VersionInfo";
-            this.parsedAttributeNumber = Y.eZ.Version.ATTRS_REST_MAP.length + 1 + 2; // links + "manually" parsed fields
+            this.parsedAttributeNumber = Y.eZ.Version.ATTRS_REST_MAP.length + 1 + 3; // links + "manually" parsed fields + fields by languages
         },
 
         setUp: function () {
@@ -122,7 +134,7 @@ YUI.add('ez-versionmodel-tests', function (Y) {
             fields = res.fields;
 
             Y.Assert.areEqual(
-                this.loadResponse.Version.Fields.field.length,
+                this.loadResponse.Version.Fields.field.length / 2,
                 Y.Object.size(fields),
                 "The fields from the current version should all be imported"
             );
@@ -139,6 +151,38 @@ YUI.add('ez-versionmodel-tests', function (Y) {
             );
         },
 
+        "Should organized the field by language and field identifier": function () {
+            var m = this.model,
+                response = {
+                    document: this.loadResponse
+                },
+                fields, res;
+
+            res = m .parse(response);
+            fields = res.fieldsByLanguage;
+
+            Assert.areEqual(
+                2, Y.Object.size(fields),
+                "2 languages should be detected for the fields"
+            );
+            Assert.areEqual(
+                2, Y.Object.size(fields['fre-FR']),
+                "there should be 2 fields in French"
+            );
+            Assert.areEqual(
+                2, Y.Object.size(fields['eng-GB']),
+                "there should be 2 fields in French"
+            );
+            Assert.areEqual(
+                "name", fields['eng-GB'].name.fieldValue,
+                "The field should be organized by language and identifier"
+            );
+            Assert.areEqual(
+                "nom", fields['fre-FR'].name.fieldValue,
+                "The field should be organized by language and identifier"
+            );
+        },
+
         "Should return the fields": function () {
             var m = this.model,
                 fields = {

From 3091e863bab9f83ada7aee45b83e09aa64cd88ec Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 15:04:36 +0100
Subject: [PATCH 23/40] EZP-26613: Change Content#getField and Version#getField
 to have a language parameter

---
 Resources/public/js/models/ez-contentmodel.js | 12 ++-
 Resources/public/js/models/ez-versionmodel.js | 31 +++++++-
 .../js/models/assets/ez-contentmodel-tests.js | 41 +++++++++-
 .../js/models/assets/ez-versionmodel-tests.js | 77 +++++++++++++------
 4 files changed, 131 insertions(+), 30 deletions(-)

diff --git a/Resources/public/js/models/ez-contentmodel.js b/Resources/public/js/models/ez-contentmodel.js
index aed1c15c1..543a40bc8 100644
--- a/Resources/public/js/models/ez-contentmodel.js
+++ b/Resources/public/js/models/ez-contentmodel.js
@@ -161,15 +161,23 @@ YUI.add('ez-contentmodel', function (Y) {
         },
 
         /**
-         * Returns the field which identifier is in parameter
+         * Returns the field which identifier is in parameter. For BC,
+         * `languageCode` can be omitted but such case, `getField` falls back to
+         * a deprecated and buggy behaviour with a content available in
+         * several languages.
          *
          * @method getField
          * @param {String} identifier the field definition identifier
+         * @param {String} languageCode the language code in which the field
          * @return {Object} or undefined if the field does not exists
          */
-        getField: function (identifier) {
+        getField: function (identifier, languageCode) {
             var version = this.get('currentVersion');
 
+            if ( !languageCode ) {
+                console.log('[DEPRECATED] `Content#getField` call without language code is deprecated');
+                console.log('[DEPRECATED] Please specify a language code');
+            }
             return version.getField.apply(version, arguments);
         },
 
diff --git a/Resources/public/js/models/ez-versionmodel.js b/Resources/public/js/models/ez-versionmodel.js
index e933b4d0e..f0e2b3432 100644
--- a/Resources/public/js/models/ez-versionmodel.js
+++ b/Resources/public/js/models/ez-versionmodel.js
@@ -209,14 +209,39 @@ YUI.add('ez-versionmodel', function (Y) {
         },
 
         /**
-         * Returns the field which identifier is in parameter
+         * Returns the field which identifier is in parameter in the given
+         * language. For BC, `languageCode` can be omitted but such case,
+         * `getField` falls back to a deprecated and buggy behaviour with a
+         * version available in several languages.
          *
          * @method getField
          * @param {String} identifier the field definition identifier
+         * @param {String} languageCode the language code in which the field
+         * should be returned
          * @return {Object} or undefined if the field does not exists
          */
-        getField: function (identifier) {
-            return this.get('fields')[identifier];
+        getField: function (identifier, languageCode) {
+            var fields;
+
+            if ( !languageCode ) {
+                console.log('[DEPRECATED] `Version#getField` call without language code is deprecated');
+                console.log('[DEPRECATED] Please specify a language code');
+                return this.get('fields')[identifier];
+            }
+            fields = this._getFieldsIn(languageCode);
+            return fields ? fields[identifier] : undefined;
+        },
+
+        /**
+         * Returns the fields in the given language.
+         *
+         * @method _getFieldsIn
+         * @protected
+         * @param {String} languageCode
+         * @return {Object|undefined}
+         */
+        _getFieldsIn: function (languageCode) {
+            return this.get('fieldsByLanguage')[languageCode];
         },
 
         /**
diff --git a/Tests/js/models/assets/ez-contentmodel-tests.js b/Tests/js/models/assets/ez-contentmodel-tests.js
index d1c52d121..3a3bc2611 100644
--- a/Tests/js/models/assets/ez-contentmodel-tests.js
+++ b/Tests/js/models/assets/ez-contentmodel-tests.js
@@ -1333,21 +1333,56 @@ YUI.add('ez-contentmodel-tests', function (Y) {
         "Should call current version getField": function () {
             var version = this.model.get('currentVersion'),
                 getFieldCalled = false,
+                fieldIdentifier = 'whatever',
+                language = 'fre-FR',
                 origGetField = version.getField;
 
-            version.getField = function () {
+            version.getField = function (identifier, code) {
                 getFieldCalled = true;
+
+                Assert.areEqual(
+                    fieldIdentifier, identifier,
+                    "The identifier argument should be kept"
+                );
+                Assert.areEqual(
+                    language, code,
+                    "The language argument should be kept"
+                );
+
                 return origGetField.apply(version, arguments);
             };
 
-            this.model.getField('whatever');
+            this.model.getField(fieldIdentifier, language);
             Assert.isTrue(
                 getFieldCalled,
                 "Current version getField method should have been called"
             );
         },
-    });
 
+        "Should handle missing language code": function () {
+            var version = this.model.get('currentVersion'),
+                getFieldCalled = false,
+                fieldIdentifier = 'whatever',
+                origGetField = version.getField;
+
+            version.getField = function (identifier) {
+                getFieldCalled = true;
+
+                Assert.areEqual(
+                    fieldIdentifier, identifier,
+                    "The identifier argument should be kept"
+                );
+
+                return origGetField.apply(version, arguments);
+            };
+
+            this.model.getField(fieldIdentifier);
+            Assert.isTrue(
+                getFieldCalled,
+                "Current version getField method should have been called"
+            );
+        },
+    });
 
     Y.Test.Runner.setName("eZ Content Model tests");
     Y.Test.Runner.add(modelTest);
diff --git a/Tests/js/models/assets/ez-versionmodel-tests.js b/Tests/js/models/assets/ez-versionmodel-tests.js
index 5e9b09aa1..fbe97ed5a 100644
--- a/Tests/js/models/assets/ez-versionmodel-tests.js
+++ b/Tests/js/models/assets/ez-versionmodel-tests.js
@@ -4,7 +4,7 @@
  */
 YUI.add('ez-versionmodel-tests', function (Y) {
     var modelTest, createTest, updateTest, removeTest, hasTranslationTest,
-        isDraftTest, createdByTest, isCurrentVersionTest,
+        isDraftTest, createdByTest, isCurrentVersionTest, getFieldTest,
         restResponse = {
             "Version": {
                 "_media-type": "application/vnd.ez.api.Version+json",
@@ -183,27 +183,6 @@ YUI.add('ez-versionmodel-tests', function (Y) {
             );
         },
 
-        "Should return the fields": function () {
-            var m = this.model,
-                fields = {
-                    'test': {'id': 42},
-                    'test2': {'id': 43}
-                };
-            m.set('fields', fields);
-
-            Y.Assert.areEqual(
-                fields.test.id,
-                m.getField('test').id
-            );
-            Y.Assert.areEqual(
-                fields.test2.id,
-                m.getField('test2').id
-            );
-            Y.Assert.isUndefined(
-                m.getField('doesnotexist')
-            );
-        },
-
         "Should return array with translations": function () {
             var m = this.model,
                 languageCodes = 'eng-GB,pol-PL,ger-DE,fre-FR',
@@ -821,6 +800,59 @@ YUI.add('ez-versionmodel-tests', function (Y) {
         },
     });
 
+    getFieldTest = new Y.Test.Case({
+        name: "eZ Version Model getField test",
+
+        setUp: function () {
+            this.version = new Y.eZ.Version();
+        },
+
+        tearDown: function () {
+            this.version.destroy();
+            delete this.version;
+        },
+
+        "Should return the field in a given language": function () {
+            var patates = {fieldValue: 'Patates'};
+
+            this.version.set('fieldsByLanguage', {
+                'fre-FR': {name: patates, location: {}},
+                'eng-GB': {name: {fieldValue: 'Potatoes'}, location: {}},
+            });
+
+            Assert.areSame(
+                patates, this.version.getField('name', 'fre-FR'),
+                "The field in the given language should have been returned"
+            );
+        },
+
+        "Should handle non existing language": function () {
+            Assert.isUndefined(this.version.getField('name', 'nor-NO'));
+        },
+
+        // deprecated usage
+        "Should return the fields": function () {
+            var version = this.version,
+                fields = {
+                    'test': {'id': 42},
+                    'test2': {'id': 43}
+                };
+
+            version.set('fields', fields);
+            Assert.areEqual(
+                fields.test.id,
+                version.getField('test').id
+            );
+            Assert.areEqual(
+                fields.test2.id,
+                version.getField('test2').id
+            );
+            Assert.isUndefined(
+                version.getField('doesnotexist')
+            );
+        },
+    });
+
     Y.Test.Runner.setName("eZ Version Model tests");
     Y.Test.Runner.add(modelTest);
     Y.Test.Runner.add(createTest);
@@ -830,4 +862,5 @@ YUI.add('ez-versionmodel-tests', function (Y) {
     Y.Test.Runner.add(isDraftTest);
     Y.Test.Runner.add(createdByTest);
     Y.Test.Runner.add(isCurrentVersionTest);
+    Y.Test.Runner.add(getFieldTest);
 }, '', {requires: ['test', 'json', 'model-tests', 'ez-versionmodel', 'ez-restmodel']});

From 64e58be76ab24ad5569cb448a930d891c48c1f4c Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 15:09:13 +0100
Subject: [PATCH 24/40] EZP-26613: Deprecated Version.get('fields') and
 Content.get('fields')

---
 Resources/public/js/models/ez-contentmodel.js | 1 +
 Resources/public/js/models/ez-versionmodel.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Resources/public/js/models/ez-contentmodel.js b/Resources/public/js/models/ez-contentmodel.js
index 543a40bc8..c2937dae0 100644
--- a/Resources/public/js/models/ez-contentmodel.js
+++ b/Resources/public/js/models/ez-contentmodel.js
@@ -448,6 +448,7 @@ YUI.add('ez-contentmodel', function (Y) {
              * @attribute fields
              * @default {}
              * @type Object
+             * @deprecated
              */
             fields: {
                 getter: function () {
diff --git a/Resources/public/js/models/ez-versionmodel.js b/Resources/public/js/models/ez-versionmodel.js
index f0e2b3432..e63e7d78f 100644
--- a/Resources/public/js/models/ez-versionmodel.js
+++ b/Resources/public/js/models/ez-versionmodel.js
@@ -272,6 +272,7 @@ YUI.add('ez-versionmodel', function (Y) {
              * @attribute fields
              * @type Object
              * @default {}
+             * @deprecated
              */
             fields: {
                 value: {}

From 87a8692f6a57c10e312bc685a2325c8e7e5f5630 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 15:18:46 +0100
Subject: [PATCH 25/40] EZP-26613: Changed Content#getFieldsOfType to accept a
 language code

---
 Resources/public/js/models/ez-contentmodel.js | 12 +++--
 .../js/models/assets/ez-contentmodel-tests.js | 45 +++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/Resources/public/js/models/ez-contentmodel.js b/Resources/public/js/models/ez-contentmodel.js
index c2937dae0..65011a0ed 100644
--- a/Resources/public/js/models/ez-contentmodel.js
+++ b/Resources/public/js/models/ez-contentmodel.js
@@ -182,18 +182,24 @@ YUI.add('ez-contentmodel', function (Y) {
         },
 
         /**
-         * Returns the fields which field type has the given identifier.
+         * Returns the fields which field type has the given identifier. For BC,
+         * `languageCode` can be omitted.
          *
          * @method getFieldsOfType
          * @param {eZ.ContentType} contentType
          * @param {String} fieldTypeIdentifier
+         * @param {String} languageCode
          * @return {Array}
          */
-        getFieldsOfType: function (contentType, fieldTypeIdentifier) {
+        getFieldsOfType: function (contentType, fieldTypeIdentifier, languageCode) {
             var identifiers = contentType.getFieldDefinitionIdentifiers(fieldTypeIdentifier);
 
+            if ( !languageCode ) {
+                console.log('[DEPRECATED] `Content#getFieldsOfType` call without language code is deprecated');
+                console.log('[DEPRECATED] Please specify a language code');
+            }
             return Y.Array.map(identifiers, function (identifier) {
-                return this.getField(identifier);
+                return this.getField(identifier, languageCode);
             }, this);
         },
 
diff --git a/Tests/js/models/assets/ez-contentmodel-tests.js b/Tests/js/models/assets/ez-contentmodel-tests.js
index 3a3bc2611..7a0bc1587 100644
--- a/Tests/js/models/assets/ez-contentmodel-tests.js
+++ b/Tests/js/models/assets/ez-contentmodel-tests.js
@@ -1205,6 +1205,18 @@ YUI.add('ez-contentmodel-tests', function (Y) {
                     "image1": {fieldValue: {}},
                     "image2": {fieldValue: null},
                 },
+                "fieldsByLanguage": {
+                    "eng-GB": {
+                        "name": {fieldValue: "Too Many Sandwiches"},
+                        "image1": {fieldValue: {}},
+                        "image2": {fieldValue: null},
+                    },
+                    "fre-FR": {
+                        "name": {fieldValue: "Trop de sandwichs :-)"},
+                        "image1": {fieldValue: {}},
+                        "image2": {fieldValue: null},
+                    },
+                }
             });
         },
 
@@ -1213,6 +1225,39 @@ YUI.add('ez-contentmodel-tests', function (Y) {
             delete this.content;
         },
 
+        "Should find the fields of the given type in given language": function () {
+            var type = new Mock(),
+                identifiers = ['image1', 'image2'],
+                fieldType = 'ezimage',
+                language = 'eng-GB',
+                res;
+
+            Mock.expect(type, {
+                method: 'getFieldDefinitionIdentifiers',
+                args: [fieldType],
+                returns: identifiers,
+            });
+
+            res = this.content.getFieldsOfType(type, fieldType, language);
+
+            Assert.isArray(res, "The return value should be an array");
+            Assert.areEqual(
+                identifiers.length,
+                res.length,
+                "The return value should have as many fields as requested"
+            );
+            Assert.areSame(
+                res[0], this.content.getField('image1'),
+                "The image1 field should have been returned"
+            );
+            Assert.areSame(
+                res[1], this.content.getField('image2'),
+                "The image2 field should have been returned"
+            );
+        },
+
+
+        // deprecate usage
         "Should find the fields of the given type": function () {
             var type = new Mock(),
                 identifiers = ['image1', 'image2'],

From 1994b9e5232d9542ead0bfeaff0b4663b48aee83 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 15:29:41 +0100
Subject: [PATCH 26/40] EZP-26613: Change raw content view to not rely on
 deprecated getField behaviour

---
 Resources/public/js/views/ez-rawcontentview.js   | 2 +-
 Tests/js/views/assets/ez-rawcontentview-tests.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/public/js/views/ez-rawcontentview.js b/Resources/public/js/views/ez-rawcontentview.js
index a6b47954b..4e178fd2b 100644
--- a/Resources/public/js/views/ez-rawcontentview.js
+++ b/Resources/public/js/views/ez-rawcontentview.js
@@ -123,7 +123,7 @@ YUI.add('ez-rawcontentview', function (Y) {
             this._destroyFieldViews();
             Y.Object.each(definitions, function (def) {
                 var View, fieldView,
-                    field = content.getField(def.identifier);
+                    field = content.getField(def.identifier, this.get('languageCode'));
 
                 if (field) {
                     View = Y.eZ.FieldView.getFieldView(def.fieldType);
diff --git a/Tests/js/views/assets/ez-rawcontentview-tests.js b/Tests/js/views/assets/ez-rawcontentview-tests.js
index fb4869e4e..87e579ea0 100644
--- a/Tests/js/views/assets/ez-rawcontentview-tests.js
+++ b/Tests/js/views/assets/ez-rawcontentview-tests.js
@@ -29,7 +29,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             });
             Mock.expect(content, {
                 method: 'getField',
-                args: [Mock.Value.String],
+                args: [Mock.Value.String, this.languageCode],
                 run: Y.bind(function (id) {
                     return this.fields[id];
                 }, this),

From cc90bd26a6f73fe4e8f57b73cd6cd9b5b1a178f6 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 15:57:02 +0100
Subject: [PATCH 27/40] EZP-26613: Changed SubitemGridItemView to not rely on a
 deprecated usage of getFieldsOfType

---
 .../views/subitem/ez-subitemgriditemview.js   |  2 +-
 .../assets/ez-subitemgriditemview-tests.js    | 51 +++++++++++--------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/Resources/public/js/views/subitem/ez-subitemgriditemview.js b/Resources/public/js/views/subitem/ez-subitemgriditemview.js
index e0965761b..b21d3434c 100644
--- a/Resources/public/js/views/subitem/ez-subitemgriditemview.js
+++ b/Resources/public/js/views/subitem/ez-subitemgriditemview.js
@@ -105,7 +105,7 @@ YUI.add('ez-subitemgriditemview', function (Y) {
             var content = this.get('content'),
                 contentType = this.get('contentType');
 
-            return Y.Array.find(content.getFieldsOfType(contentType, 'ezimage'), function (field) {
+            return Y.Array.find(content.getFieldsOfType(contentType, 'ezimage', content.get('mainLanguageCode')), function (field) {
                 return !!field.fieldValue;
             });
         },
diff --git a/Tests/js/views/subitem/assets/ez-subitemgriditemview-tests.js b/Tests/js/views/subitem/assets/ez-subitemgriditemview-tests.js
index 56a1090bf..25195c77a 100644
--- a/Tests/js/views/subitem/assets/ez-subitemgriditemview-tests.js
+++ b/Tests/js/views/subitem/assets/ez-subitemgriditemview-tests.js
@@ -14,13 +14,27 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
                 returns: json,
             });
             return mock;
+        },
+        mockNoImageContent = function (content, contentType, languageCode) {
+            Mock.expect(content, {
+                method: 'getFieldsOfType',
+                args: [contentType, 'ezimage', languageCode],
+                returns: [],
+            });
+        },
+        mockContentMainLanguage = function (content, languageCode) {
+            Mock.expect(content, {
+                method: 'get',
+                args: ['mainLanguageCode'],
+                returns: languageCode,
+            });
         };
 
     renderTest = new Y.Test.Case({
         name: "eZ Subitem Grid Item View render test",
 
        setUp: function () {
-            var content, contentType;
+            var content, contentType, languageCode = 'fre-FR';
 
             this.locationJSON = {};
             this.contentJSON = {};
@@ -28,11 +42,8 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
 
             content = getModelMock(this.contentJSON);
             contentType = getModelMock(this.contentTypeJSON);
-            Mock.expect(content, {
-                method: 'getFieldsOfType',
-                args: [contentType, 'ezimage'],
-                returns: [],
-            });
+            mockContentMainLanguage(content, languageCode);
+            mockNoImageContent(content, contentType, languageCode);
 
             this.view = new Y.eZ.SubitemGridItemView({
                 location: getModelMock(this.locationJSON),
@@ -92,15 +103,12 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
         name: "eZ Subitem Grid Item View UI state test",
 
        setUp: function () {
-            var content, contentType;
+            var content, contentType, languageCode = 'fre-FR';
 
             content = new Mock();
             contentType = {};
-            Mock.expect(content, {
-                method: 'getFieldsOfType',
-                args: [contentType, 'ezimage'],
-                returns: [],
-            });
+            mockContentMainLanguage(content, languageCode);
+            mockNoImageContent(content, contentType, languageCode);
 
             this.view = new Y.eZ.SubitemGridItemView({
                 location: {},
@@ -139,13 +147,16 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
         name: "eZ Subitem Grid Item View loadImageVariation event test",
 
        setUp: function () {
+            var languageCode = 'fre-FR';
+
             this.content = new Mock();
             this.contentType = {};
             this.imageFields = [];
 
+            mockContentMainLanguage(this.content, languageCode);
             Mock.expect(this.content, {
                 method: 'getFieldsOfType',
-                args: [this.contentType, 'ezimage'],
+                args: [this.contentType, 'ezimage', languageCode],
                 run: Y.bind(function () {
                     return this.imageFields;
                 }, this),
@@ -240,15 +251,12 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
         name: "eZ Subitem Grid Item View error handling test",
 
        setUp: function () {
-            var content, contentType;
+            var content, contentType, languageCode = 'fre-FR';
 
             content = new Mock();
             contentType = {};
-            Mock.expect(content, {
-                method: 'getFieldsOfType',
-                args: [contentType, 'ezimage'],
-                returns: [],
-            });
+            mockContentMainLanguage(content, languageCode);
+            mockNoImageContent(content, contentType, languageCode);
 
             this.view = new Y.eZ.SubitemGridItemView({
                 location: {},
@@ -275,13 +283,14 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
         name: "eZ Subitem Grid Item View loaded variation test",
 
        setUp: function () {
-            var content, contentType;
+            var content, contentType, languageCode = 'fre-FR';
 
             content = getModelMock({});
             contentType = getModelMock({});
+            mockContentMainLanguage(content, languageCode);
             Mock.expect(content, {
                 method: 'getFieldsOfType',
-                args: [contentType, 'ezimage'],
+                args: [contentType, 'ezimage', languageCode],
                 returns: [{fieldValue: {}}],
             });
 

From 401344e1bab7d4a5ff1ac40c098cb37e726f95db Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 16:00:38 +0100
Subject: [PATCH 28/40] CS

---
 .../subitem/assets/ez-subitemgriditemview-tests.js     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Tests/js/views/subitem/assets/ez-subitemgriditemview-tests.js b/Tests/js/views/subitem/assets/ez-subitemgriditemview-tests.js
index 25195c77a..304e94ae2 100644
--- a/Tests/js/views/subitem/assets/ez-subitemgriditemview-tests.js
+++ b/Tests/js/views/subitem/assets/ez-subitemgriditemview-tests.js
@@ -33,7 +33,7 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
     renderTest = new Y.Test.Case({
         name: "eZ Subitem Grid Item View render test",
 
-       setUp: function () {
+        setUp: function () {
             var content, contentType, languageCode = 'fre-FR';
 
             this.locationJSON = {};
@@ -102,7 +102,7 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
     uiStateTest = new Y.Test.Case({
         name: "eZ Subitem Grid Item View UI state test",
 
-       setUp: function () {
+        setUp: function () {
             var content, contentType, languageCode = 'fre-FR';
 
             content = new Mock();
@@ -146,7 +146,7 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
     loadImageVariationTest = new Y.Test.Case({
         name: "eZ Subitem Grid Item View loadImageVariation event test",
 
-       setUp: function () {
+        setUp: function () {
             var languageCode = 'fre-FR';
 
             this.content = new Mock();
@@ -250,7 +250,7 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
     errorHandlingTest = new Y.Test.Case({
         name: "eZ Subitem Grid Item View error handling test",
 
-       setUp: function () {
+        setUp: function () {
             var content, contentType, languageCode = 'fre-FR';
 
             content = new Mock();
@@ -282,7 +282,7 @@ YUI.add('ez-subitemgriditemview-tests', function (Y) {
     loadedVariationTest = new Y.Test.Case({
         name: "eZ Subitem Grid Item View loaded variation test",
 
-       setUp: function () {
+        setUp: function () {
             var content, contentType, languageCode = 'fre-FR';
 
             content = getModelMock({});

From eb23ec9eefca7334b42a2b0542338961c6588632 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 17:11:06 +0100
Subject: [PATCH 29/40] EZP-26613: Changed the UDW selected view to not rely on
 getFieldsOfType deprecated behaviour

---
 .../ez-universaldiscoveryselectedview.js      |  2 +-
 ...ez-universaldiscoveryselectedview-tests.js | 23 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js b/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js
index fbd98c6ad..931a7c7f2 100644
--- a/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js
+++ b/Resources/public/js/views/universaldiscovery/ez-universaldiscoveryselectedview.js
@@ -184,7 +184,7 @@ YUI.add('ez-universaldiscoveryselectedview', function (Y) {
             var content = this.get('contentStruct').content,
                 contentType = this.get('contentStruct').contentType;
 
-            return Y.Array.find(content.getFieldsOfType(contentType, 'ezimage'), function (field) {
+            return Y.Array.find(content.getFieldsOfType(contentType, 'ezimage', content.get('mainLanguageCode')), function (field) {
                 return !!field.fieldValue;
             });
         },
diff --git a/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js b/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js
index 0f6825b2a..45e77df3b 100644
--- a/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js
+++ b/Tests/js/views/universaldiscovery/assets/ez-universaldiscoveryselectedview-tests.js
@@ -17,13 +17,20 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
             });
             Mock.expect(content, {
                 method: 'getFieldsOfType',
-                args: [type, 'ezimage'],
+                args: [type, 'ezimage', translations[0]],
                 returns: imageFieldTab,
             });
             Mock.expect(content, {
                 method: 'get',
-                args: ['currentVersion'],
-                returns: currentVersion,
+                args: [Mock.Value.String],
+                run: function (attr) {
+                    if ( attr === 'currentVersion' ) {
+                        return currentVersion;
+                    } else if ( attr === 'mainLanguageCode' ) {
+                        return translations[0];
+                    }
+                    Assert.fail('Unexpect content.get("' + attr + '")');
+                },
             });
             Mock.expect(currentVersion, {
                 method: 'getTranslationsList',
@@ -184,7 +191,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
                 struct = {content: content, contentType: type},
                 that = this;
 
-            _configureMock(type, content, currentVersion, [], []);
+            _configureMock(type, content, currentVersion, ['fre-FR'], []);
 
             this.view.set('addConfirmButton', true);
             this.view.set('contentStruct', struct);
@@ -330,7 +337,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
                 method: 'toJSON',
                 returns: {},
             });
-            _configureMock(type, content, currentVersion, [], []);
+            _configureMock(type, content, currentVersion, ['fre-FR'], []);
 
             this.view.set('isAlreadySelected', isAlreadySelected1);
             this.view.set('isSelectable', isselectable1);
@@ -374,7 +381,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
                 imageField = {fieldValue: "42"},
                 imageFieldTab = [imageField];
 
-            _configureMock(type, content, currentVersion, [], imageFieldTab);
+            _configureMock(type, content, currentVersion, ['fre-FR'], imageFieldTab);
 
             this.view.render();
             this.view.set('contentStruct', struct);
@@ -397,7 +404,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
                 currentVersion = new Mock(),
                 struct = {content: content, contentType: type};
 
-            _configureMock(type, content, currentVersion, [], '');
+            _configureMock(type, content, currentVersion, ['fre-FR'], '');
 
             this.view.render();
             this.view.set('contentStruct', struct);
@@ -465,7 +472,7 @@ YUI.add('ez-universaldiscoveryselectedview-tests', function (Y) {
                 imageField = {fieldValue: "42"},
                 imageFieldTab = [imageField];
 
-            _configureMock(type, content, currentVersion, [], imageFieldTab);
+            _configureMock(type, content, currentVersion, ['fre-FR'], imageFieldTab);
 
             this.view.render();
             this.view.set('variationIdentifier', variationIdentifier);

From 370f0f27eb7451ffa053193228ed09f2bef586af Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 17:26:12 +0100
Subject: [PATCH 30/40] EZP-26613: Changed the Richtext image resolver to not
 use the deprecated fields attribute

---
 .../richtext/ez-richtext-resolveimage.js      | 10 ++++--
 .../assets/ez-richtext-resolveimage-tests.js  | 33 ++++++++++++++-----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/Resources/public/js/views/fields/richtext/ez-richtext-resolveimage.js b/Resources/public/js/views/fields/richtext/ez-richtext-resolveimage.js
index 38bc775d0..47f323ab9 100644
--- a/Resources/public/js/views/fields/richtext/ez-richtext-resolveimage.js
+++ b/Resources/public/js/views/fields/richtext/ez-richtext-resolveimage.js
@@ -46,7 +46,10 @@ YUI.add('ez-richtext-resolveimage', function (Y) {
             return;
         }
 
-        imageField = content.get('fields')[contentType.getFieldDefinitionIdentifiers('ezimage')[0]];
+        imageField = content.getField(
+            contentType.getFieldDefinitionIdentifiers('ezimage')[0],
+            content.get('mainLanguageCode')
+        );
         embedNodes.forEach(function (node) {
             this._renderLoadingEmbed(node);
             this._loadVariation(view, content, imageField, node);
@@ -73,7 +76,10 @@ YUI.add('ez-richtext-resolveimage', function (Y) {
                 contentType = struct.contentType,
                 imageField;
 
-            imageField = content.get('fields')[contentType.getFieldDefinitionIdentifiers('ezimage')[0]];
+            imageField = content.getField(
+                contentType.getFieldDefinitionIdentifiers('ezimage')[0],
+                content.get('mainLanguageCode')
+            );
             mapNode[content.get('contentId')].forEach(Y.bind(this._loadVariation, this, view, content, imageField));
         }, this);
     };
diff --git a/Tests/js/views/fields/richtext/assets/ez-richtext-resolveimage-tests.js b/Tests/js/views/fields/richtext/assets/ez-richtext-resolveimage-tests.js
index 07a80baa8..d4e892fb6 100644
--- a/Tests/js/views/fields/richtext/assets/ez-richtext-resolveimage-tests.js
+++ b/Tests/js/views/fields/richtext/assets/ez-richtext-resolveimage-tests.js
@@ -16,6 +16,8 @@ YUI.add('ez-richtext-resolveimage-tests', function (Y) {
                 container: Y.one('.container'),
                 field: {id: 42},
             });
+            this.mainLanguageCode = 'fre-FR';
+            this.fieldDefinitionIdentifier = 'image';
             this.fields = {};
             this.fields["41"] = {'image': {}};
             this.fields["42"] = {'image': {}};
@@ -99,7 +101,11 @@ YUI.add('ez-richtext-resolveimage-tests', function (Y) {
 
         _getContentMock: function (contentId) {
             var content = new Mock(),
-                attrs = {contentId: contentId, name: "name-" + contentId, fields: this.fields[contentId]};
+                attrs = {
+                    contentId: contentId,
+                    name: "name-" + contentId,
+                    mainLanguageCode: this.mainLanguageCode,
+                };
 
             Mock.expect(content, {
                 method: 'get',
@@ -111,6 +117,11 @@ YUI.add('ez-richtext-resolveimage-tests', function (Y) {
                     Assert.fail("Unexpected call to get('" + attr + "')");
                 },
             });
+            Mock.expect(content, {
+                method: 'getField',
+                args: [this.fieldDefinitionIdentifier, this.mainLanguageCode],
+                returns: this.fields[contentId][this.fieldDefinitionIdentifier],
+            });
             return content;
         },
 
@@ -120,7 +131,7 @@ YUI.add('ez-richtext-resolveimage-tests', function (Y) {
             Mock.expect(type, {
                 method: 'getFieldDefinitionIdentifiers',
                 args: ['ezimage'],
-                returns: ['image'],
+                returns: [this.fieldDefinitionIdentifier],
             });
             return type;
         },
@@ -260,8 +271,7 @@ YUI.add('ez-richtext-resolveimage-tests', function (Y) {
         name: "eZ RichText resolve image process using the selection test",
 
         setUp: function () {
-            var container = Y.one('.container-useselection'),
-                fields = {};
+            var container = Y.one('.container-useselection');
 
             this.containerContent = container.getContent();
             this.processor = new Y.eZ.RichTextResolveImage();
@@ -270,6 +280,7 @@ YUI.add('ez-richtext-resolveimage-tests', function (Y) {
                 field: {id: 42},
             });
 
+            this.mainLanguageCode = 'fre-FR';
             this.imageFieldIdentifier = 'image';
             this.contentType = new Mock();
             Mock.expect(this.contentType, {
@@ -277,13 +288,19 @@ YUI.add('ez-richtext-resolveimage-tests', function (Y) {
                 args: ['ezimage'],
                 returns: [this.imageFieldIdentifier],
             });
-            this.content = new Y.Base();
+            this.content = new Mock(new Y.Base());
             this.contentInfo = new Y.Base();
-            fields[this.imageFieldIdentifier] = {};
+            this.fields = {};
+            this.fields[this.imageFieldIdentifier] = {};
             this.content.set('contentId', 41);
             this.contentInfo.set('contentId', this.content.get('contentId'));
             this.content.set('name', 'name-' + this.content.get('contentId'));
-            this.content.set('fields', fields);
+            this.content.set('mainLanguageCode', this.mainLanguageCode);
+            Mock.expect(this.content, {
+                method: 'getField',
+                args: [this.imageFieldIdentifier, this.mainLanguageCode],
+                returns: this.fields[this.imageFieldIdentifier],
+            });
         },
 
         tearDown: function () {
@@ -325,7 +342,7 @@ YUI.add('ez-richtext-resolveimage-tests', function (Y) {
                 loadImageVariationFired = true;
 
                 Assert.areSame(
-                    this.content.get('fields')[this.imageFieldIdentifier],
+                    this.fields[this.imageFieldIdentifier],
                     e.field,
                     "The image field should be provided"
                 );

From 53cdb0eaf560e1577265aa7dfdd06cbd1d0000f3 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Fri, 18 Nov 2016 18:04:06 +0100
Subject: [PATCH 31/40] EZP-26613: Changed the EmbedImage mixin to not use the
 deprecated fields attribute

---
 .../alloyeditor/buttons/mixins/embedimage.js  |  2 +-
 .../ez-alloyeditor-button-image-tests.jsx     | 23 +++++++++++++------
 .../ez-alloyeditor-button-imagehref-tests.jsx | 17 ++++++++++----
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/Resources/public/js/alloyeditor/buttons/mixins/embedimage.js b/Resources/public/js/alloyeditor/buttons/mixins/embedimage.js
index 0ff618e52..3de210abc 100644
--- a/Resources/public/js/alloyeditor/buttons/mixins/embedimage.js
+++ b/Resources/public/js/alloyeditor/buttons/mixins/embedimage.js
@@ -54,7 +54,7 @@ YUI.add('ez-alloyeditor-button-mixin-embedimage', function (Y) {
         _getImageField: function(contentType, content) {
             var imageIdentifier = contentType.getFieldDefinitionIdentifiers('ezimage');
 
-            return content.get('fields')[imageIdentifier[0]];
+            return content.getField(imageIdentifier[0], content.get('mainLanguageCode'));
         },
     };
 });
diff --git a/Tests/js/alloyeditor/buttons/assets/ez-alloyeditor-button-image-tests.jsx b/Tests/js/alloyeditor/buttons/assets/ez-alloyeditor-button-image-tests.jsx
index 2b3409730..2f77510f0 100644
--- a/Tests/js/alloyeditor/buttons/assets/ez-alloyeditor-button-image-tests.jsx
+++ b/Tests/js/alloyeditor/buttons/assets/ez-alloyeditor-button-image-tests.jsx
@@ -133,11 +133,16 @@ YUI.add('ez-alloyeditor-button-image-tests', function (Y) {
 
         },
 
-        _configureContent: function (content, fields) {
+        _configureContent: function (content, fields, fieldIdentifier, mainLanguageCode) {
             Mock.expect(content, {
                 method: 'get',
-                args: ['fields'],
-                returns: fields,
+                args: ['mainLanguageCode'],
+                returns: mainLanguageCode,
+            });
+            Mock.expect(content, {
+                method: 'getField',
+                args: [fieldIdentifier, mainLanguageCode],
+                returns: fields[fieldIdentifier],
             });
         },
 
@@ -178,6 +183,7 @@ YUI.add('ez-alloyeditor-button-image-tests', function (Y) {
         "Should not allow a content with an empty Image field": function () {
             var isSelectable = this._getIsSelectableFunction(),
                 fieldIdentifier = 'image',
+                mainLanguageCode = 'fre-FR',
                 fields = {},
                 contentType = new Mock(),
                 content = new Mock();
@@ -185,7 +191,7 @@ YUI.add('ez-alloyeditor-button-image-tests', function (Y) {
             fields[fieldIdentifier] = {fieldValue: null};
 
             this._configureContentType(contentType, true, fieldIdentifier);
-            this._configureContent(content, fields);
+            this._configureContent(content, fields, fieldIdentifier, mainLanguageCode);
 
             Assert.isFalse(
                 isSelectable({contentType: contentType, content: content}),
@@ -196,6 +202,7 @@ YUI.add('ez-alloyeditor-button-image-tests', function (Y) {
         "Should allow a content with a filled Image field": function () {
             var isSelectable = this._getIsSelectableFunction(),
                 fieldIdentifier = 'image',
+                mainLanguageCode = 'fre-FR',
                 fields = {},
                 contentType = new Mock(),
                 content = new Mock();
@@ -203,7 +210,7 @@ YUI.add('ez-alloyeditor-button-image-tests', function (Y) {
             fields[fieldIdentifier] = {fieldValue: {id: 42}};
 
             this._configureContentType(contentType, true, fieldIdentifier);
-            this._configureContent(content, fields);
+            this._configureContent(content, fields, fieldIdentifier, mainLanguageCode);
             Assert.isTrue(
                 isSelectable({contentType: contentType, content: content}),
                 "The content should be selectable"
@@ -235,6 +242,7 @@ YUI.add('ez-alloyeditor-button-image-tests', function (Y) {
         "Should initialize the widget": function () {
             var handler = this._getContentDiscoveredHandler(),
                 fieldIdentifier = 'image',
+                mainLanguageCode = 'fre-FR',
                 fields = {},
                 contentId = '/content/id',
                 contentType = new Mock(),
@@ -245,7 +253,7 @@ YUI.add('ez-alloyeditor-button-image-tests', function (Y) {
             fields[fieldIdentifier] = {fieldValue: {id: 42}};
 
             this._configureContentType(contentType, true, fieldIdentifier);
-            this._configureContent(content, fields);
+            this._configureContent(content, fields, fieldIdentifier, mainLanguageCode);
             Mock.expect(contentInfo, {
                 method: 'get',
                 args: ['contentId'],
@@ -271,6 +279,7 @@ YUI.add('ez-alloyeditor-button-image-tests', function (Y) {
         "Should fire the updatedEmbed event": function () {
             var handler = this._getContentDiscoveredHandler(),
                 fieldIdentifier = 'image',
+                mainLanguageCode = 'fre-FR',
                 fields = {},
                 contentId = '/content/id',
                 contentType = new Mock(),
@@ -286,7 +295,7 @@ YUI.add('ez-alloyeditor-button-image-tests', function (Y) {
             fields[fieldIdentifier] = {fieldValue: {id: 42}};
 
             this._configureContentType(contentType, true, fieldIdentifier);
-            this._configureContent(content, fields);
+            this._configureContent(content, fields, fieldIdentifier, mainLanguageCode);
             Mock.expect(contentInfo, {
                 method: 'get',
                 args: ['contentId'],
diff --git a/Tests/js/alloyeditor/buttons/assets/ez-alloyeditor-button-imagehref-tests.jsx b/Tests/js/alloyeditor/buttons/assets/ez-alloyeditor-button-imagehref-tests.jsx
index 5b46c7222..7acb3def4 100644
--- a/Tests/js/alloyeditor/buttons/assets/ez-alloyeditor-button-imagehref-tests.jsx
+++ b/Tests/js/alloyeditor/buttons/assets/ez-alloyeditor-button-imagehref-tests.jsx
@@ -146,11 +146,16 @@ YUI.add('ez-alloyeditor-button-imagehref-tests', function (Y) {
 
         },
 
-        _configureContent: function (content, fields) {
+        _configureContent: function (content, fields, fieldIdentifier, mainLanguageCode) {
             Mock.expect(content, {
                 method: 'get',
-                args: ['fields'],
-                returns: fields,
+                args: ['mainLanguageCode'],
+                returns: mainLanguageCode,
+            });
+            Mock.expect(content, {
+                method: 'getField',
+                args: [fieldIdentifier, mainLanguageCode],
+                returns: fields[fieldIdentifier],
             });
         },
 
@@ -192,13 +197,14 @@ YUI.add('ez-alloyeditor-button-imagehref-tests', function (Y) {
             var isSelectable = this._getIsSelectableFunction(),
                 fieldIdentifier = 'image',
                 fields = {},
+                mainLanguageCode = 'fre-FR',
                 contentType = new Mock(),
                 content = new Mock();
 
             fields[fieldIdentifier] = {fieldValue: null};
 
             this._configureContentType(contentType, true, fieldIdentifier);
-            this._configureContent(content, fields);
+            this._configureContent(content, fields, fieldIdentifier, mainLanguageCode);
 
             Assert.isFalse(
                 isSelectable({contentType: contentType, content: content}),
@@ -210,13 +216,14 @@ YUI.add('ez-alloyeditor-button-imagehref-tests', function (Y) {
             var isSelectable = this._getIsSelectableFunction(),
                 fieldIdentifier = 'image',
                 fields = {},
+                mainLanguageCode = 'fre-FR',
                 contentType = new Mock(),
                 content = new Mock();
 
             fields[fieldIdentifier] = {fieldValue: {id: 42}};
 
             this._configureContentType(contentType, true, fieldIdentifier);
-            this._configureContent(content, fields);
+            this._configureContent(content, fields, fieldIdentifier, mainLanguageCode);
             Assert.isTrue(
                 isSelectable({contentType: contentType, content: content}),
                 "The content should be selectable"

From 1ae298e0b8c79b6b5dbae789bc4326943649de53 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Mon, 21 Nov 2016 14:31:58 +0100
Subject: [PATCH 32/40] EZP-26613: Added Version#getFieldsIn and
 Version#setFieldsIn

---
 Resources/public/js/models/ez-versionmodel.js | 21 ++++++--
 .../js/models/assets/ez-versionmodel-tests.js | 54 +++++++++++++++++++
 2 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/Resources/public/js/models/ez-versionmodel.js b/Resources/public/js/models/ez-versionmodel.js
index e63e7d78f..35960c1dd 100644
--- a/Resources/public/js/models/ez-versionmodel.js
+++ b/Resources/public/js/models/ez-versionmodel.js
@@ -228,22 +228,32 @@ YUI.add('ez-versionmodel', function (Y) {
                 console.log('[DEPRECATED] Please specify a language code');
                 return this.get('fields')[identifier];
             }
-            fields = this._getFieldsIn(languageCode);
+            fields = this.getFieldsIn(languageCode);
             return fields ? fields[identifier] : undefined;
         },
 
         /**
          * Returns the fields in the given language.
          *
-         * @method _getFieldsIn
-         * @protected
+         * @method getFieldsIn
          * @param {String} languageCode
          * @return {Object|undefined}
          */
-        _getFieldsIn: function (languageCode) {
+        getFieldsIn: function (languageCode) {
             return this.get('fieldsByLanguage')[languageCode];
         },
 
+        /**
+         * Sets the fields in the given language
+         *
+         * @method setFieldsIn
+         * @param {Object} fields
+         * @param {String} languageCode
+         */
+        setFieldsIn: function (fields, languageCode) {
+            this.get('fieldsByLanguage')[languageCode] = fields;
+        },
+
         /**
          * Checks whether the version is the current version of the given
          * `content`
@@ -290,6 +300,9 @@ YUI.add('ez-versionmodel', function (Y) {
              *          'body': {},
              *      }
              *
+             * Do not use this attribute directly, use `setFieldsIn`,
+             * `getFieldsIn` or `getField`.
+             *
              * @attribute fieldsByLanguage
              * @type {Object}
              * @default {}
diff --git a/Tests/js/models/assets/ez-versionmodel-tests.js b/Tests/js/models/assets/ez-versionmodel-tests.js
index fbe97ed5a..9a329fef4 100644
--- a/Tests/js/models/assets/ez-versionmodel-tests.js
+++ b/Tests/js/models/assets/ez-versionmodel-tests.js
@@ -5,6 +5,7 @@
 YUI.add('ez-versionmodel-tests', function (Y) {
     var modelTest, createTest, updateTest, removeTest, hasTranslationTest,
         isDraftTest, createdByTest, isCurrentVersionTest, getFieldTest,
+        getFieldsInTest, setFieldsInTest,
         restResponse = {
             "Version": {
                 "_media-type": "application/vnd.ez.api.Version+json",
@@ -853,6 +854,57 @@ YUI.add('ez-versionmodel-tests', function (Y) {
         },
     });
 
+    getFieldsInTest = new Y.Test.Case({
+        name: "eZ Version Model getFieldsIn test",
+
+        setUp: function () {
+            this.version = new Y.eZ.Version();
+        },
+
+        tearDown: function () {
+            this.version.destroy();
+            delete this.version;
+        },
+
+        "Should return the fields in a given language": function () {
+            this.version.set('fieldsByLanguage', {
+                'fre-FR': {name: {fieldValue: 'Patates'}, location: {}},
+                'eng-GB': {name: {fieldValue: 'Potatoes'}, location: {}},
+            });
+
+            Assert.areSame(
+                this.version.get('fieldsByLanguage')['fre-FR'],
+                this.version.getFieldsIn('fre-FR'),
+                "The fields in the given language should be returned"
+            );
+        },
+    });
+
+    setFieldsInTest = new Y.Test.Case({
+        name: "eZ Version Model setFieldsIn test",
+
+        setUp: function () {
+            this.version = new Y.eZ.Version();
+        },
+
+        tearDown: function () {
+            this.version.destroy();
+            delete this.version;
+        },
+
+        "Should set the fields in a given language": function () {
+            var fields = {name: {fieldValue: 'Patates'}, location: {}};
+
+            this.version.setFieldsIn(fields, 'fre-FR');
+
+            Assert.areSame(
+                fields,
+                this.version.getFieldsIn('fre-FR'),
+                "The fields in the given language should be set"
+            );
+        },
+    });
+
     Y.Test.Runner.setName("eZ Version Model tests");
     Y.Test.Runner.add(modelTest);
     Y.Test.Runner.add(createTest);
@@ -863,4 +915,6 @@ YUI.add('ez-versionmodel-tests', function (Y) {
     Y.Test.Runner.add(createdByTest);
     Y.Test.Runner.add(isCurrentVersionTest);
     Y.Test.Runner.add(getFieldTest);
+    Y.Test.Runner.add(getFieldsInTest);
+    Y.Test.Runner.add(setFieldsInTest);
 }, '', {requires: ['test', 'json', 'model-tests', 'ez-versionmodel', 'ez-restmodel']});

From fcb6bf8ba2081a8c7ca6766500fc8f3cd1f6fa65 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Mon, 21 Nov 2016 14:34:12 +0100
Subject: [PATCH 33/40] EZP-26613: Added Content#getFieldsIn

---
 Resources/public/js/models/ez-contentmodel.js | 13 +++++++
 .../js/models/assets/ez-contentmodel-tests.js | 35 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/Resources/public/js/models/ez-contentmodel.js b/Resources/public/js/models/ez-contentmodel.js
index 65011a0ed..0f1b45718 100644
--- a/Resources/public/js/models/ez-contentmodel.js
+++ b/Resources/public/js/models/ez-contentmodel.js
@@ -181,6 +181,19 @@ YUI.add('ez-contentmodel', function (Y) {
             return version.getField.apply(version, arguments);
         },
 
+        /**
+         * Returns the fields in the given language code.
+         *
+         * @method getFieldsIn
+         * @param {String} languageCode
+         * @return {Object}
+         */
+        getFieldsIn: function (languageCode) {
+            var version = this.get('currentVersion');
+
+            return version.getFieldsIn.apply(version, arguments);
+        },
+
         /**
          * Returns the fields which field type has the given identifier. For BC,
          * `languageCode` can be omitted.
diff --git a/Tests/js/models/assets/ez-contentmodel-tests.js b/Tests/js/models/assets/ez-contentmodel-tests.js
index 7a0bc1587..65166d0e9 100644
--- a/Tests/js/models/assets/ez-contentmodel-tests.js
+++ b/Tests/js/models/assets/ez-contentmodel-tests.js
@@ -6,7 +6,7 @@ YUI.add('ez-contentmodel-tests', function (Y) {
     var modelTest, relationsTest, createContent, deleteContent, loadResponse, copyTest,
         loadLocationsTest, addLocationTest, setMainLocationTest, hasTranslationTest,
         getFieldsOfTypeTest, createDraftTest, currentVersionTest, fieldAttributeTest,
-        getFieldTest,
+        getFieldTest, getFieldsInTest,
         Assert = Y.Assert,
         Mock = Y.Mock;
 
@@ -1429,6 +1429,38 @@ YUI.add('ez-contentmodel-tests', function (Y) {
         },
     });
 
+    getFieldsInTest = new Y.Test.Case({
+        name: "eZ Content Model getFieldsIn test",
+
+        setUp: function () {
+            this.content = new Y.eZ.Content();
+        },
+
+        tearDown: function () {
+            this.content.destroy();
+        },
+
+        "Should return the current version's fields": function () {
+            var version = this.content.get('currentVersion'),
+                versionGetFieldsIn = false,
+                languageCode = 'fre-FR';
+
+            version.getFieldsIn = function (code) {
+                versionGetFieldsIn = true;
+
+                Assert.areEqual(
+                    code, languageCode,
+                    "The language code should be passed"
+                );
+            };
+
+            this.content.getFieldsIn(languageCode);
+            Assert.isTrue(
+                versionGetFieldsIn, "current version getFieldsIn should have been called"
+            );
+        },
+    });
+
     Y.Test.Runner.setName("eZ Content Model tests");
     Y.Test.Runner.add(modelTest);
     Y.Test.Runner.add(relationsTest);
@@ -1444,4 +1476,5 @@ YUI.add('ez-contentmodel-tests', function (Y) {
     Y.Test.Runner.add(currentVersionTest);
     Y.Test.Runner.add(fieldAttributeTest);
     Y.Test.Runner.add(getFieldTest);
+    Y.Test.Runner.add(getFieldsInTest);
 }, '', {requires: ['test', 'model-tests', 'ez-contentmodel', 'ez-restmodel']});

From d07078e6688357f0bd577d5b0d863e6e26d3826e Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Mon, 21 Nov 2016 14:39:45 +0100
Subject: [PATCH 34/40] EZP-26613: Use the new translated field API

---
 .../public/js/views/ez-contenteditformview.js |  6 +-
 .../public/js/views/ez-contenteditview.js     |  5 +-
 .../services/ez-contentcreateviewservice.js   | 21 ++---
 .../services/ez-contenteditviewservice.js     | 10 +--
 .../assets/ez-contenteditformview-tests.js    | 57 ++++++++-----
 .../views/assets/ez-contenteditview-tests.js  | 31 +++----
 .../ez-contentcreateviewservice-tests.js      | 81 ++++++++++---------
 .../assets/ez-contenteditviewservice-tests.js | 49 +++++------
 8 files changed, 143 insertions(+), 117 deletions(-)

diff --git a/Resources/public/js/views/ez-contenteditformview.js b/Resources/public/js/views/ez-contenteditformview.js
index 6bcb16aca..d6ec25cb6 100644
--- a/Resources/public/js/views/ez-contenteditformview.js
+++ b/Resources/public/js/views/ez-contenteditformview.js
@@ -71,7 +71,7 @@ YUI.add('ez-contenteditformview', function (Y) {
 
             Y.Object.each(fieldDefinitions, function (def) {
                 var EditView, view,
-                    field = version.getField(def.identifier);
+                    field = version.getField(def.identifier, languageCode);
 
                 if (field) {
                     try {
@@ -121,11 +121,11 @@ YUI.add('ez-contenteditformview', function (Y) {
         _updateFieldEditViews: function (version) {
             Y.Array.each(this._fieldEditViews, function (fieldEditView) {
                 var fieldIdentifier = fieldEditView.get('field').fieldDefinitionIdentifier,
-                    field = version.getField(fieldIdentifier);
+                    field = version.getField(fieldIdentifier, this.get('languageCode'));
 
                 fieldEditView.set('version', version);
                 fieldEditView.set('field', field);
-            });
+            }, this);
         },
 
         /**
diff --git a/Resources/public/js/views/ez-contenteditview.js b/Resources/public/js/views/ez-contenteditview.js
index 3389f4c0b..9c1cda047 100644
--- a/Resources/public/js/views/ez-contenteditview.js
+++ b/Resources/public/js/views/ez-contenteditview.js
@@ -51,7 +51,10 @@ YUI.add('ez-contenteditview', function (Y) {
                 }
             });
             this.after('languageCodeChange', function (e) {
-                this.get('formView').set('languageCode', this.get('languageCode'));
+                this.get('formView').setAttrs({
+                    'languageCode': this.get('languageCode'),
+                    'version': this.get('version'),
+                });
                 if ( this.get('active') ) {
                     this.render();
                 }
diff --git a/Resources/public/js/views/services/ez-contentcreateviewservice.js b/Resources/public/js/views/services/ez-contentcreateviewservice.js
index 7b41e6a18..7cf67382f 100644
--- a/Resources/public/js/views/services/ez-contentcreateviewservice.js
+++ b/Resources/public/js/views/services/ez-contentcreateviewservice.js
@@ -54,7 +54,7 @@ YUI.add('ez-contentcreateviewservice', function (Y) {
          */
         _initModels: function (callback) {
             var content = new Y.eZ.Content(),
-                version = new Y.eZ.Version(),
+                version = content.get('currentVersion'),
                 type = this.get('contentType'),
                 defaultFields = {};
 
@@ -75,16 +75,15 @@ YUI.add('ez-contentcreateviewservice', function (Y) {
         },
 
         /**
-         * Sets fields on given content and version.
+         * Sets fields on the version.
          *
          * @method _setFields
          * @protected
-         * @param {Object} fields object containing fields that will be set on given content and version
+         * @param {Object} fields object containing fields
          * @since 1.1
          */
         _setFields: function (fields) {
-            this.get('content').set('fields', fields);
-            this.get('version').set('fields', fields);
+            this.get('version').setFieldsIn(fields, this.get('app').get('contentCreationDefaultLanguageCode'));
         },
 
         /**
@@ -166,16 +165,8 @@ YUI.add('ez-contentcreateviewservice', function (Y) {
         _setLanguage: function (view, fields, e) {
             var version = this.get('version'),
                 selectedLanguageCode = e.selectedLanguageCode,
-                newVersion = new Y.eZ.Version(),
                 formFields = {};
 
-            version.destroy({api: this.get('capi'), remove: true}, function (error) {
-                if ( error ) {
-                    console.warn('Failed to remove the version ' + version.get('versionId'));
-                }
-            });
-            this.set('version', newVersion);
-
             Y.Object.each(fields, function (field) {
                 formFields[field.fieldDefinitionIdentifier] = {
                     fieldDefinitionIdentifier: field.fieldDefinitionIdentifier,
@@ -183,11 +174,11 @@ YUI.add('ez-contentcreateviewservice', function (Y) {
                 };
             });
 
-            this._setFields(formFields);
+            version.setFieldsIn(formFields, selectedLanguageCode);
             this.set('languageCode', selectedLanguageCode);
 
             view.setAttrs({
-                version: newVersion,
+                version: version,
                 languageCode: selectedLanguageCode,
             });
 
diff --git a/Resources/public/js/views/services/ez-contenteditviewservice.js b/Resources/public/js/views/services/ez-contenteditviewservice.js
index 0cf79f8f2..6965cfda6 100644
--- a/Resources/public/js/views/services/ez-contenteditviewservice.js
+++ b/Resources/public/js/views/services/ez-contenteditviewservice.js
@@ -152,7 +152,7 @@ YUI.add('ez-contenteditviewservice', function (Y) {
          * @private
          */
         _setVersionFields: function () {
-            this.get('version').set('fields', this._getFieldsForEdit());
+            this.get('version').setFieldsIn(this._getFieldsForEdit(), this.get('languageCode'));
         },
 
         /**
@@ -165,14 +165,14 @@ YUI.add('ez-contenteditviewservice', function (Y) {
          * @return {Object}
          */
         _getFieldsForEdit: function () {
-            var languageCode = this.get('languageCode'),
-                content = this.get('content'),
+            var languageCode = this.get('baseLanguageCode') || this.get('languageCode'),
+                languageFields = this.get('content').getFieldsIn(languageCode),
                 fields;
 
-            if ( Y.Object.isEmpty(content.get('fields')) ) {
+            if ( Y.Object.isEmpty(languageFields) ) {
                 fields = this._getDefaultFields(languageCode);
             } else {
-                fields = Y.clone(content.get('fields'));
+                fields = Y.clone(languageFields);
             }
 
             return fields;
diff --git a/Tests/js/views/assets/ez-contenteditformview-tests.js b/Tests/js/views/assets/ez-contenteditformview-tests.js
index e5574ae7e..388381971 100644
--- a/Tests/js/views/assets/ez-contenteditformview-tests.js
+++ b/Tests/js/views/assets/ez-contenteditformview-tests.js
@@ -77,10 +77,11 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 }
             });
 
+            this.languageCode = 'fre-FR';
             Y.Mock.expect(this.version, {
                 method: 'getField',
-                args: [Y.Mock.Value.String],
-                run: function (id) {
+                args: [Y.Mock.Value.String, this.languageCode],
+                run: function (id, languageCode) {
                     return {
                         'identifier': id
                     };
@@ -91,6 +92,7 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 container: '.container',
                 contentType: this.contentType,
                 content: this.content,
+                languageCode: this.languageCode,
                 version: this.version,
                 config: this.config
             });
@@ -238,9 +240,10 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 }
             }));
 
+            this.languageCode = 'fre-FR';
             Y.Mock.expect(this.version, {
                 method: 'getField',
-                args: [Y.Mock.Value.String],
+                args: [Y.Mock.Value.String, this.languageCode],
                 run: function (id) {
                     return {
                         'identifier': id
@@ -251,6 +254,7 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
             this.view = new Y.eZ.ContentEditFormView({
                 contentType: this.contentType,
                 version: this.version,
+                languageCode: this.languageCode,
                 config: this.config
             });
         },
@@ -358,9 +362,10 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 }
             }));
 
+            this.languageCode = 'fre-FR';
             Y.Mock.expect(this.version, {
                 method: 'getField',
-                args: [Y.Mock.Value.String],
+                args: [Y.Mock.Value.String, this.languageCode],
                 run: function (id) {
                     return {
                         'identifier': id
@@ -371,6 +376,7 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
             this.view = new Y.eZ.ContentEditFormView({
                 contentType: this.contentType,
                 version: this.version,
+                languageCode: this.languageCode,
                 config: this.config
             });
         },
@@ -439,9 +445,10 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 }
             });
 
+            this.languageCode = 'fre-FR';
             Y.Mock.expect(this.version, {
                 method: 'getField',
-                args: [Y.Mock.Value.String],
+                args: [Y.Mock.Value.String, this.languageCode],
                 run: function (id) {
                     return {
                         'identifier': id
@@ -467,6 +474,7 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
             this.view = new Y.eZ.ContentEditFormView({
                 contentType: this.contentType,
                 version: this.version,
+                languageCode: this.languageCode,
                 config: this.config
             });
         },
@@ -546,16 +554,18 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
             this.contentType = new Y.Mock();
             this.version = new Y.Mock();
             this.fieldType = 'test1';
+            this.languageCode = 'fre-FR';
             this.fieldDefinitions = [{
                 fieldGroup: 'content',
                 fieldType: this.fieldType,
+                languageCode: this.languageCode,
                 identifier: 'id1',
             }];
             this.fieldGroups = [{fieldGroupName: 'content'}, {fieldGroupName: 'meta'}];
 
             Y.Mock.expect(this.content, {
                 method: 'getField',
-                args: [Y.Mock.Value.String],
+                args: [Y.Mock.Value.String, this.languageCode],
                 run: function (id) {
                     return fields[id];
                 }
@@ -567,9 +577,10 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 returns: this.fieldDefinitions
             });
 
+            this.languageCode = 'fre-FR';
             Y.Mock.expect(this.version, {
                 method: 'getField',
-                args: [Y.Mock.Value.String],
+                args: [Y.Mock.Value.String, this.languageCode],
                 run: function (id) {
                     return fields[id];
                 }
@@ -592,6 +603,7 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 content: this.content,
                 contentType: this.contentType,
                 version: this.version,
+                languageCode: this.languageCode,
                 config: {}
             });
         }
@@ -603,6 +615,8 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
         setUp: function () {
             this.contentType = new Y.Mock();
             this.version = new Y.Mock();
+            this.fieldType = 'test1';
+            this.fieldDefinitionIdentifier = 'id1';
             this.config = {
                 fieldEditViews: {
                     something: 'hello'
@@ -614,38 +628,39 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 args: ['fieldDefinitions'],
                 returns: {
                     'id1': {
-                        'identifier': 'id1',
-                        'fieldType': 'test1',
+                        'identifier': this.fieldDefinitionIdentifier,
+                        'fieldType': this.fieldType,
                         'fieldGroup': 'testfieldgroup',
                     },
                 }
             });
-            Y.eZ.FieldEditView.registerFieldEditView('test1', Y.Base.create('fieldEdit1', Y.eZ.FieldEditView, [], {
+            Y.eZ.FieldEditView.registerFieldEditView(this.fieldType, Y.Base.create('fieldEdit1', Y.eZ.FieldEditView, [], {
                 getField: function () {
                     return this.get('field');
                 }
             }, {
                 ATTRS: {
-                    field: {
-                        fieldDefinitionIdentifier: 'test1'
-                    }
+                    field: {}
                 }
             }));
 
+            this.languageCode = 'fre-FR';
             Y.Mock.expect(this.version, {
                 method: 'getField',
-                args: [Y.Mock.Value.String],
-                run: function (id) {
+                args: [this.fieldDefinitionIdentifier, this.languageCode],
+                run: Y.bind(function (id) {
                     return {
                         'identifier': id,
+                        'fieldDefinitionIdentifier': this.fieldDefinitionIdentifier,
                         'value': 'some value'
                     };
-                }
+                }, this),
             });
 
             this.view = new Y.eZ.ContentEditFormView({
                 contentType: this.contentType,
                 version: this.version,
+                languageCode: this.languageCode,
                 config: this.config
             });
         },
@@ -653,7 +668,7 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
         tearDown: function () {
             this.view.destroy();
             delete this.view;
-            Y.eZ.FieldEditView.registerFieldEditView('test1', undefined);
+            Y.eZ.FieldEditView.registerFieldEditView(this.fieldType, undefined);
         },
 
         "Should set version and fields on fieldEditViews": function () {
@@ -663,7 +678,7 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
 
             Y.Mock.expect(newVersion, {
                 method: 'getField',
-                args: [Y.Mock.Value.Any],
+                args: [this.fieldDefinitionIdentifier, this.languageCode],
                 run: function (id) {
                     return {
                         'identifier': id,
@@ -672,7 +687,7 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 }
             });
 
-            this.view.set('version',newVersion);
+            this.view.set('version', newVersion);
 
             fields = this.view.getFields();
 
@@ -726,9 +741,10 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
                 }
             }));
 
+            this.languageCode = 'fre-FR';
             Y.Mock.expect(this.version, {
                 method: 'getField',
-                args: [Y.Mock.Value.String],
+                args: [Y.Mock.Value.String, this.languageCode],
                 run: function (id) {
                     return {
                         'identifier': id,
@@ -740,6 +756,7 @@ YUI.add('ez-contenteditformview-tests', function (Y) {
             this.view = new Y.eZ.ContentEditFormView({
                 contentType: this.contentType,
                 version: this.version,
+                languageCode: this.languageCode,
                 config: this.config
             });
         },
diff --git a/Tests/js/views/assets/ez-contenteditview-tests.js b/Tests/js/views/assets/ez-contenteditview-tests.js
index 58c079717..ba04359aa 100644
--- a/Tests/js/views/assets/ez-contenteditview-tests.js
+++ b/Tests/js/views/assets/ez-contenteditview-tests.js
@@ -658,7 +658,7 @@ YUI.add('ez-contenteditview-tests', function (Y) {
 
         "Should pass languageCode to formView when it changes and render the view": function () {
             var newLanguageCode = 'ita-IT',
-                languageCodeChanged = false,
+                updated = false,
                 viewRendered = false;
 
             this.view.render = function () {
@@ -666,24 +666,27 @@ YUI.add('ez-contenteditview-tests', function (Y) {
             };
 
             Y.Mock.expect(this.formView, {
-                method: 'set',
-                args: [Y.Mock.Value.String, Y.Mock.Value.Any],
-                run: function (attr, value) {
-                    if (attr === 'languageCode') {
-                        languageCodeChanged = true;
-                        Assert.areEqual(
-                            value,
-                            newLanguageCode,
-                            "The languageCode attr of formView should be the same as the one in contentEditView"
-                        );
-                    }
-                }
+                method: 'setAttrs',
+                args: [Y.Mock.Value.Object],
+                run: Y.bind(function (attrs) {
+                    updated = true;
+                    Assert.areEqual(
+                        newLanguageCode,
+                        attrs.languageCode,
+                        "The languageCode attr of formView should be the same as the one in contentEditView"
+                    );
+                    Assert.areSame(
+                        this.view.get('version'),
+                        attrs.version,
+                        "The version attr should be set on the formView"
+                    );
+                }, this),
             });
 
             this.view.set('active', true);
             this.view.set('languageCode', newLanguageCode);
 
-            Assert.isTrue(languageCodeChanged, "The languageCode attr should be updated in formView");
+            Assert.isTrue(updated, "The languageCode attr should be updated in formView");
             Assert.isTrue(viewRendered, "The view should be rendered");
         },
 
diff --git a/Tests/js/views/services/assets/ez-contentcreateviewservice-tests.js b/Tests/js/views/services/assets/ez-contentcreateviewservice-tests.js
index 3d565b5e8..6886514d8 100644
--- a/Tests/js/views/services/assets/ez-contentcreateviewservice-tests.js
+++ b/Tests/js/views/services/assets/ez-contentcreateviewservice-tests.js
@@ -12,6 +12,26 @@ YUI.add('ez-contentcreateviewservice-tests', function (Y) {
         setUp: function () {
             var that = this;
 
+            this.origVersion = Y.eZ.Version;
+            this.origContent = Y.eZ.Content;
+            Y.eZ.Version = Y.Base.create('versionModel', Y.Model, [], {
+                setFieldsIn: function (fields, language) {
+                    this._fields = fields;
+                },
+
+                getFieldsIn: function () {
+                    return this._fields;
+                },
+            });
+            Y.eZ.Content = Y.Base.create('contentMode', Y.Model, [], {}, {
+                ATTRS: {
+                    currentVersion: {
+                        getter: function () {
+                            return new Y.eZ.Version();
+                        },
+                    }
+                }
+            });
             this.type = new Mock();
             this.names = {'eng-GB': "Song", 'fre-FR': "Chanson"};
             this.fieldDefinitions = {
@@ -83,10 +103,18 @@ YUI.add('ez-contentcreateviewservice-tests', function (Y) {
             });
         },
 
+        tearDown: function () {
+            delete Y.eZ.Version;
+            delete Y.eZ.Content;
+            Y.eZ.Version = this.origVersion;
+            Y.eZ.Content = this.origContent;
+            this.service.destroy();
+        },
+
         _assertLoadResult: function (service) {
             var content = service.get('content'),
                 version = service.get('version'),
-                fields = content.get('fields'),
+                fields = version.getFieldsIn(service.get('languageCode')),
                 that = this;
 
             Assert.areSame(
@@ -297,6 +325,7 @@ YUI.add('ez-contentcreateviewservice-tests', function (Y) {
         setUp: function () {
             this.app = new Mock();
             this.version = new Mock();
+            this.content = new Mock(new Y.Base());
             this.languageCode = 'pol-PL';
             this.switchedLanguageCode = 'ger-DE';
             this.switchedLanguageName = 'German';
@@ -320,6 +349,7 @@ YUI.add('ez-contentcreateviewservice-tests', function (Y) {
                 app: this.app,
                 capi: this.capi,
                 request: this.request,
+                content: this.content,
                 version: this.version
             });
             this.view.addTarget(this.service);
@@ -357,24 +387,6 @@ YUI.add('ez-contentcreateviewservice-tests', function (Y) {
             Assert.isTrue(languageSelectFired, "The 'languageSelect' should have been fired");
         },
 
-        _configureVersionMock: function () {
-            Mock.expect(this.version, {
-                method: 'destroy',
-                args: [Mock.Value.Object, Mock.Value.Function],
-                run: Y.bind(function (options, callback) {
-                    Assert.areSame(
-                        this.capi, options.api,
-                        "The CAPI should be passed to the type load method"
-                    );
-                    Assert.isTrue(
-                        options.remove,
-                        "The `remove` option should be set to true"
-                    );
-                    callback(true);
-                }, this)
-            });
-        },
-
         _autoExecLanguageSelectedHandler: function () {
             this.service.on('languageSelect', Y.bind(function (e) {
                 var config = {selectedLanguageCode: this.switchedLanguageCode};
@@ -383,7 +395,17 @@ YUI.add('ez-contentcreateviewservice-tests', function (Y) {
             }, this));
         },
 
-        "Should destroy the version and set selected languageCode and fields": function () {
+        _configureVersionMock: function () {
+            Mock.expect(this.version, {
+                method: 'setFieldsIn',
+                args: [Mock.Value.Object, this.switchedLanguageCode],
+                run: Y.bind(function (fields) {
+                    this.setFields = fields;
+                }, this),
+            });
+        },
+
+        "Should set selected languageCode and fields": function () {
             var fields = [{
                     fieldDefinitionIdentifier: 'name',
                     fieldValue: 'Husaria',
@@ -404,27 +426,14 @@ YUI.add('ez-contentcreateviewservice-tests', function (Y) {
                 this.switchedLanguageCode,
                 'The attribute languageCode should be changed to the selected one'
             );
-            Assert.areNotSame(
-                this.version, this.service.get('version'),
-                "A new version should have been created"
-            );
-            Assert.areEqual(
-                this.service.get('content').get('fields').name.fieldDefinitionIdentifier,
-                expectedFields.name.fieldDefinitionIdentifier,
-                'The `fields` attribute of content should be updated with value passed to `changeLanguage` event'
-            );
-            Assert.areEqual(
-                this.service.get('content').get('fields').name.fieldValue,
-                expectedFields.name.fieldValue,
-                'The `fields` attribute of content should be updated with value passed to `changeLanguage` event'
-            );
+
             Assert.areEqual(
-                this.service.get('version').get('fields').name.fieldDefinitionIdentifier,
+                this.setFields.name.fieldDefinitionIdentifier,
                 expectedFields.name.fieldDefinitionIdentifier,
                 'The `fields` attribute of version should be updated with value passed to `changeLanguage` event'
             );
             Assert.areEqual(
-                this.service.get('version').get('fields').name.fieldValue,
+                this.setFields.name.fieldValue,
                 expectedFields.name.fieldValue,
                 'The `fields` attribute of version should be updated with value passed to `changeLanguage` event'
             );
diff --git a/Tests/js/views/services/assets/ez-contenteditviewservice-tests.js b/Tests/js/views/services/assets/ez-contenteditviewservice-tests.js
index c79ead504..d0847f581 100644
--- a/Tests/js/views/services/assets/ez-contenteditviewservice-tests.js
+++ b/Tests/js/views/services/assets/ez-contenteditviewservice-tests.js
@@ -109,19 +109,16 @@ YUI.add('ez-contenteditviewservice-tests', function (Y) {
                 run: Y.bind(function (attr) {
                     if ( attr === 'mainLanguageCode' ) {
                         return this.languageCode;
-                    } else if ( attr === 'fields' ) {
-                        return this.fields;
                     }
                     Y.fail('Unexpected call to content.get("' + attr + '")');
                 }, this),
             });
-
             Mock.expect(this.version, {
                 method: 'reset'
             });
             Mock.expect(this.version, {
-                method: 'set',
-                args: ['fields', Mock.Value.Object],
+                method: 'setFieldsIn',
+                args: [Mock.Value.Object, Mock.Value.String],
             });
 
             this.mocks = ['content', 'mainLocation', 'contentType', 'owner'];
@@ -133,6 +130,16 @@ YUI.add('ez-contenteditviewservice-tests', function (Y) {
             };
         },
 
+        _mockContentGetFieldsIn: function (languageCode) {
+            Mock.expect(this.content, {
+                method: 'getFieldsIn',
+                args: [languageCode],
+                run: Y.bind(function (languageCode) {
+                    return this.fields;
+                }, this),
+            });
+        },
+
         tearDown: function () {
             this.service.destroy();
             delete this.service;
@@ -277,6 +284,7 @@ YUI.add('ez-contenteditviewservice-tests', function (Y) {
                 args: [this.requestBaseLanguage.params.baseLanguageCode],
                 returns: true,
             });
+            this._mockContentGetFieldsIn(this.baseLanguageCode);
 
             this._configureMocksLoading('none', {'content': contentLoadingAssert});
             this.service = service = this._getService(this.requestBaseLanguage);
@@ -297,6 +305,7 @@ YUI.add('ez-contenteditviewservice-tests', function (Y) {
                 returns: true,
             });
 
+            this._mockContentGetFieldsIn(this.baseLanguageCode);
             this._configureMocksLoading('none');
             this.owner = null;
             this.service = service = this._getService(this.requestBaseLanguage);
@@ -343,6 +352,7 @@ YUI.add('ez-contenteditviewservice-tests', function (Y) {
                     );
                 };
 
+            this._mockContentGetFieldsIn(this.languageCode);
             this._configureMocksLoading('none', {'content': contentLoadingAssert});
             this.service = service = this._getService();
             service.once('error', function (e) {
@@ -435,6 +445,7 @@ YUI.add('ez-contenteditviewservice-tests', function (Y) {
                 contentInfoAttrs = {},
                 callbackCalled = false;
 
+            this._mockContentGetFieldsIn(this.languageCode);
             this._configureMocksLoading('content');
             Mock.expect(this.contentInfo, {
                 method: 'getAttrs',
@@ -468,25 +479,15 @@ YUI.add('ez-contenteditviewservice-tests', function (Y) {
             };
 
 
+            this.fields = {};
             Mock.expect(this.version, {
-                method: 'set',
-                args: ['fields', Mock.Value.Object],
-                run: function (attr, f) {
+                method: 'setFieldsIn',
+                args: [Mock.Value.Object, this.languageCode],
+                run: function (f, languageCode) {
                     fields = f;
                 },
             });
-            Mock.expect(this.content, {
-                method: 'get',
-                args: [Mock.Value.String],
-                run: Y.bind(function (attr) {
-                    if ( attr === 'mainLanguageCode' ) {
-                        return this.languageCode;
-                    } else if ( attr === 'fields' ) {
-                        return {};
-                    }
-                    Y.fail('Unexpected call to content.get("' + attr + '")');
-                }, this),
-            });
+
             Mock.expect(this.contentType, {
                 method: 'get',
                 args: ['fieldDefinitions'],
@@ -519,12 +520,13 @@ YUI.add('ez-contenteditviewservice-tests', function (Y) {
             var fields;
 
             Mock.expect(this.version, {
-                method: 'set',
-                args: ['fields', Mock.Value.Object],
-                run: function (attr, f) {
+                method: 'setFieldsIn',
+                args: [Mock.Value.Object, this.newLanguageCode],
+                run: function (f) {
                     fields = f;
                 },
             });
+            this._mockContentGetFieldsIn(this.baseLanguageCode);
 
             this["Should load the content, the location, the content type and the owner"]();
 
@@ -589,6 +591,7 @@ YUI.add('ez-contenteditviewservice-tests', function (Y) {
                 returns: true,
             });
             this.service = service = this._getService(this.requestBaseLanguage);
+            this._mockContentGetFieldsIn(this.baseLanguageCode);
             this._configureMocksLoading('owner');
 
             service.once('error', function (e) {

From 2bfc5eb0f0aad12bd156da4455d7bfb94af58228 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Mon, 21 Nov 2016 15:40:51 +0100
Subject: [PATCH 35/40] EZP-26613: getField falls back on `fields` attribute if
 not fieldByLanguage is not set

---
 Resources/public/js/models/ez-versionmodel.js |  6 ++++++
 .../js/models/assets/ez-versionmodel-tests.js | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/Resources/public/js/models/ez-versionmodel.js b/Resources/public/js/models/ez-versionmodel.js
index 35960c1dd..bcd1636bc 100644
--- a/Resources/public/js/models/ez-versionmodel.js
+++ b/Resources/public/js/models/ez-versionmodel.js
@@ -228,6 +228,12 @@ YUI.add('ez-versionmodel', function (Y) {
                 console.log('[DEPRECATED] Please specify a language code');
                 return this.get('fields')[identifier];
             }
+            if ( Y.Object.isEmpty(this.get('fieldsByLanguage')) ) {
+                console.log('[DEPRECATED] `Version#getField` call with the fields by language not set');
+                console.log('[DEPRECATED] Falling back on `field` attribute. This usage of `getFields` is deprecated');
+                console.log('[DEPRECATED] Please set the fields by language with `setFieldsIn`');
+                return this.get('fields')[identifier];
+            }
             fields = this.getFieldsIn(languageCode);
             return fields ? fields[identifier] : undefined;
         },
diff --git a/Tests/js/models/assets/ez-versionmodel-tests.js b/Tests/js/models/assets/ez-versionmodel-tests.js
index 9a329fef4..2aaa32dd7 100644
--- a/Tests/js/models/assets/ez-versionmodel-tests.js
+++ b/Tests/js/models/assets/ez-versionmodel-tests.js
@@ -828,9 +828,28 @@ YUI.add('ez-versionmodel-tests', function (Y) {
         },
 
         "Should handle non existing language": function () {
+            this.version.set('fieldsByLanguage', {
+                'fre-FR': {name: {fieldValue: 'Patates'}, location: {}},
+                'eng-GB': {name: {fieldValue: 'Potatoes'}, location: {}},
+            });
             Assert.isUndefined(this.version.getField('name', 'nor-NO'));
         },
 
+        // BC usage
+        "Should fallback on the `fields` attribute is not field by language is set": function () {
+            var field = {},
+                fields = {},
+                identifier = 'title';
+
+            fields[identifier] = field;
+            this.version.set('fields', fields);
+
+            Assert.areSame(
+                field, this.version.getField(identifier, 'fre-FR'),
+                "The field from the `fields` attribute should be returned"
+            );
+        },
+
         // deprecated usage
         "Should return the fields": function () {
             var version = this.version,

From a1cad2580daf893917db2b8332b4fb377c8235f8 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Mon, 21 Nov 2016 18:16:40 +0100
Subject: [PATCH 36/40] EZP-26613: Deprecated misnamed
 LanguagSwitcherView#_hideView()

---
 .../public/js/views/ez-languageswitcherview.js    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Resources/public/js/views/ez-languageswitcherview.js b/Resources/public/js/views/ez-languageswitcherview.js
index 2a1148544..f4a3601b6 100644
--- a/Resources/public/js/views/ez-languageswitcherview.js
+++ b/Resources/public/js/views/ez-languageswitcherview.js
@@ -78,7 +78,7 @@ YUI.add('ez-languageswitcherview', function (Y) {
         _setClickOutsideEventHandler: function (e) {
             if ( e.newVal ) {
                 this._clickOutsideSubscription = this.get('container').on(
-                    'clickoutside', Y.bind(this._hideView, this)
+                    'clickoutside', Y.bind(this._hideLanguageList, this)
                 );
             } else {
                 this._clickOutsideSubscription.detach();
@@ -90,8 +90,21 @@ YUI.add('ez-languageswitcherview', function (Y) {
          *
          * @method _hideView
          * @protected
+         * @deprecated
          */
         _hideView: function () {
+            console.log('[DEPRECATED] _hideView is deprecated, use _hideLanguageList instead');
+            console.log('[DEPRECATED] it will be removed from PlatformUI 2.0');
+            this._hideLanguageList();
+        },
+
+        /**
+         * Hides the language list (if any)
+         *
+         * @method _hideLanguageList
+         * @protected
+         */
+        _hideLanguageList: function () {
             this.set('expanded', false);
         },
 

From a21cf2e3545761ea686005f53f5427648eeb7170 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Mon, 21 Nov 2016 18:18:05 +0100
Subject: [PATCH 37/40] Cleaned up LanguageSwitcherView tests

---
 .../assets/ez-languageswitcherview-tests.js   | 97 -------------------
 Tests/js/views/ez-languageswitcherview.html   | 32 ++----
 2 files changed, 10 insertions(+), 119 deletions(-)

diff --git a/Tests/js/views/assets/ez-languageswitcherview-tests.js b/Tests/js/views/assets/ez-languageswitcherview-tests.js
index d6153fbcb..7022322a4 100644
--- a/Tests/js/views/assets/ez-languageswitcherview-tests.js
+++ b/Tests/js/views/assets/ez-languageswitcherview-tests.js
@@ -258,103 +258,6 @@ YUI.add('ez-languageswitcherview-tests', function (Y) {
         },
     });
 
-    renderTest = new Y.Test.Case({
-        name: "eZ Language Switcher View render test",
-
-        setUp: function () {
-            this.location = {
-                id: 'grzegorz-lato'
-            };
-            this.languageCode = 'eng-GB';
-            this.versionMock = new Mock();
-            this.contentMock = new Mock();
-            this.locationMock = new Mock();
-
-            Mock.expect(this.locationMock, {
-                method: 'toJSON',
-                returns: this.location
-            });
-            Mock.expect(this.contentMock, {
-                method: 'get',
-                args: ['currentVersion'],
-                returns: this.versionMock
-            });
-        },
-
-        tearDown: function () {
-            this.view.destroy();
-            delete this.view;
-        },
-
-        "Should render translations list when there are other translations": function () {
-            var container,
-                currentVersionMultiTranslations = {
-                    'languageCodes': 'eng-GB,pol-PL,ger-DE,fre-FR'
-                };
-
-            Mock.expect(this.versionMock, {
-                method: 'get',
-                args: ['languageCodes'],
-                returns: currentVersionMultiTranslations.languageCodes
-            });
-            Mock.expect(this.versionMock, {
-                method: 'getTranslationsList',
-                run: function () {
-                    return currentVersionMultiTranslations.languageCodes.split(',');
-                }
-            });
-
-            this.view = new Y.eZ.LanguageSwitcherView({
-                container: '.container',
-                content: this.contentMock,
-                location: this.locationMock,
-                languageCode: this.languageCode,
-            });
-            this.view.render();
-
-            container = this.view.get('container');
-
-            Assert.isNotNull(
-                container.one('.ez-expandable-area'),
-                'Should render the translations list'
-            );
-        },
-
-        "Should not render translations list when there is any other translation": function () {
-            var container,
-                currentVersionSingleTranslation = {
-                    'languageCodes': 'eng-GB'
-                };
-
-            Mock.expect(this.versionMock, {
-                method: 'get',
-                args: ['languageCodes'],
-                returns: currentVersionSingleTranslation.languageCodes
-            });
-            Mock.expect(this.versionMock, {
-                method: 'getTranslationsList',
-                run: function () {
-                    return currentVersionSingleTranslation.languageCodes.split(',');
-                }
-            });
-
-            this.view = new Y.eZ.LanguageSwitcherView({
-                container: '.container',
-                content: this.contentMock,
-                location: this.locationMock,
-                languageCode: this.languageCode,
-            });
-            this.view.render();
-
-            container = this.view.get('container');
-
-            Assert.isNull(
-                container.one('.ez-expandable-area'),
-                'Should not render the translations list'
-            );
-        },
-    });
-
     hideTest = new Y.Test.Case({
         name: "eZ Language Switcher View hide test",
 
diff --git a/Tests/js/views/ez-languageswitcherview.html b/Tests/js/views/ez-languageswitcherview.html
index 75af7cfdb..32b9cee7f 100644
--- a/Tests/js/views/ez-languageswitcherview.html
+++ b/Tests/js/views/ez-languageswitcherview.html
@@ -11,35 +11,23 @@
 
 <script type="text/x-handlebars-template" id="languageswitcherview-ez-template">
     <div class="ez-selected-language">
-        {{#if otherTranslations}}
-            <a href="#" class="ez-dropdown-list-indicator" data-test="{{ location.id }}">
-                <span class="ez-language-flag flag-icon"></span>
-                {{ currentTranslation }}
-            </a>
-        {{else}}
-            <span class="ez-language-flag flag-icon"></span>
-            {{ currentTranslation }}
-        {{/if}}
+        <a href="#" class="ez-dropdown-list-indicator">{{ currentTranslation }}</a>
     </div>
-    {{#if otherTranslations}}
-        <ul class="ez-expandable-area">
-        {{#each otherTranslations}}
-            <li class="ez-content-translation">
-                <a href="#">
-                    <span class="ez-language-flag flag-icon"></span>
-                    {{ this }}
-                </a>
-            </li>
-        {{/each}}
-        </ul>
-    {{/if}}
+    <ul class="ez-expandable-area">
+    {{#each otherTranslations}}
+        <li>
+            <a href="#" class="ez-language-switch-link" data-language-code="{{ this }}">{{ this }}</a>
+        </li>
+    {{/each}}
+    </ul>
 </script>
 
 <script type="text/javascript" src="../../../Resources/public/vendors/yui3/build/yui/yui.js"></script>
 <script type="text/javascript" src="./assets/ez-languageswitcherview-tests.js"></script>
 <script>
     var filter = (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'raw',
-            loaderFilter;
+        loaderFilter;
+
     if (filter == 'coverage'){
         loaderFilter = {
             searchExp : "/Resources/public/js/",

From 6fca93c017324aa2099307f5986fe80ea671d684 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Mon, 21 Nov 2016 18:18:53 +0100
Subject: [PATCH 38/40] =?UTF-8?q?EZP-26613:=C2=A0Changed=20the=20LanguageS?=
 =?UTF-8?q?witcherView=20to=20be=20able=20to=20fire=20an=20event=20when=20?=
 =?UTF-8?q?switching=20language?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/views/ez-languageswitcherview.js       | 57 ++++++++++++-
 .../public/templates/languageswitcher.hbt     |  2 +-
 .../assets/ez-languageswitcherview-tests.js   | 85 +++++++++++++++++++
 3 files changed, 142 insertions(+), 2 deletions(-)

diff --git a/Resources/public/js/views/ez-languageswitcherview.js b/Resources/public/js/views/ez-languageswitcherview.js
index f4a3601b6..2c6a3ff58 100644
--- a/Resources/public/js/views/ez-languageswitcherview.js
+++ b/Resources/public/js/views/ez-languageswitcherview.js
@@ -11,6 +11,8 @@ YUI.add('ez-languageswitcherview', function (Y) {
      */
     Y.namespace('eZ');
 
+    var NAVIGATE_MODE = 'navigate';
+
     /**
      * The Language Switcher View
      *
@@ -28,6 +30,44 @@ YUI.add('ez-languageswitcherview', function (Y) {
 
         initializer: function () {
             this.after('expandedChange', this._setClickOutsideEventHandler);
+            if ( this.get('switchMode') !== NAVIGATE_MODE ) {
+                this._addDOMEventHandlers({
+                    '.ez-language-switch-link': {
+                        'tap': '_switchLanguage',
+                    },
+                });
+                this.after('languageCodeChange', this.render);
+            }
+        },
+
+        /**
+         * `tap` event handler on the language switch links.
+         *
+         * @method _switchLanguage
+         * @protected
+         * @param {EventFacade} e
+         */
+        _switchLanguage: function (e) {
+            var newLanguageCode = e.target.getData('language-code'),
+                oldLanguageCode = this.get('languageCode');
+
+            e.preventDefault();
+
+            this._hideLanguageList();
+            this.set('languageCode', newLanguageCode);
+            /**
+             * Fired to indicate that the user wants to switch to a new
+             * language. It is fired only when `switchMode` attribute is set to
+             * 'event'.
+             *
+             * @event switchLanguage
+             * @param {String} languageCode
+             * @param {String} oldLanguageCode
+             */
+            this.fire('switchLanguage', {
+                languageCode: newLanguageCode,
+                oldLanguageCode: oldLanguageCode,
+            });
         },
 
         /**
@@ -142,7 +182,22 @@ YUI.add('ez-languageswitcherview', function (Y) {
              * @attribute languageCode
              * @type String
              */
-            languageCode: {}
+            languageCode: {},
+
+            /**
+             * The way the language switch will be done. When set to 'event',
+             * the view will fire a 'switchLanguage' event while if it is set to
+             * 'navigate', the browser will just follow the link generated by
+             * the template.
+             *
+             * @attribute switchMode
+             * @default 'navigate'
+             * @writeOnce
+             */
+            switchMode: {
+                writeOnce: 'initOnly',
+                value: NAVIGATE_MODE,
+            },
         }
     });
 });
diff --git a/Resources/public/templates/languageswitcher.hbt b/Resources/public/templates/languageswitcher.hbt
index efeb5009c..11407e3aa 100644
--- a/Resources/public/templates/languageswitcher.hbt
+++ b/Resources/public/templates/languageswitcher.hbt
@@ -11,7 +11,7 @@
     <ul class="ez-expandable-area">
     {{#each otherTranslations}}
         <li class="ez-content-translation">
-            <a class="ez-language-switch-link" href="{{ path "viewLocation" id=../location.id languageCode=this }}">
+            <a class="ez-language-switch-link" data-language-code="{{ this }}" href="{{ path "viewLocation" id=../location.id languageCode=this }}">
                 {{ language_name this }}
             </a>
         </li>
diff --git a/Tests/js/views/assets/ez-languageswitcherview-tests.js b/Tests/js/views/assets/ez-languageswitcherview-tests.js
index 7022322a4..25d495ad8 100644
--- a/Tests/js/views/assets/ez-languageswitcherview-tests.js
+++ b/Tests/js/views/assets/ez-languageswitcherview-tests.js
@@ -4,6 +4,7 @@
  */
 YUI.add('ez-languageswitcherview-tests', function (Y) {
     var viewTest, viewTestWithoutOtherTranslations, eventTest, renderTest, hideTest,
+        eventSwitchModeTest,
         Mock = Y.Mock, Assert = Y.Assert,
         currentVersion = {
             'languageCodes': 'eng-GB,pol-PL,ger-DE,fre-FR'
@@ -319,10 +320,94 @@ YUI.add('ez-languageswitcherview-tests', function (Y) {
         }
     });
 
+    eventSwitchModeTest = new Y.Test.Case({
+        name: "eZ Language Switcher View 'event' switch mode test",
+
+        setUp: function () {
+            this.languageCode = 'eng-GB';
+            this.translationList = ['eng-GB', 'fre-FR'];
+            this.versionMock = new Mock();
+            this.contentMock = new Mock();
+            this.locationMock = new Mock();
+
+            Mock.expect(this.locationMock, {
+                method: 'toJSON',
+                returns: this.location
+            });
+            Mock.expect(this.contentMock, {
+                method: 'get',
+                args: ['currentVersion'],
+                returns: this.versionMock
+            });
+            Mock.expect(this.versionMock, {
+                method: 'getTranslationsList',
+                returns: this.translationList,
+            });
+            this.view = new Y.eZ.LanguageSwitcherView({
+                container: '.container',
+                switchMode: 'event',
+                location: this.locationMock,
+                content: this.contentMock,
+                languageCode: this.languageCode,
+            });
+            this.view.render();
+        },
+
+        tearDown: function () {
+            this.view.destroy();
+            delete this.view;
+        },
+
+        "Should fire the switchLanguage event": function () {
+            var container = this.view.get('container'),
+                link = container.one('.ez-language-switch-link');
+
+            container.once('tap', function (e) {
+                Assert.isTrue(
+                    !!e.prevented,
+                    "The tap event should have been prevented"
+                );
+            });
+
+            this.view.set('expanded', true);
+            this.view.after('switchLanguage', this.next(function (e) {
+                Assert.areEqual(
+                    link.getData('language-code'), e.languageCode,
+                    "The new language code should be in the event facade"
+                );
+                Assert.areEqual(
+                    this.languageCode, e.oldLanguageCode,
+                    "The old language code should be in the event facade"
+                );
+                Assert.isFalse(
+                    this.view.get('expanded'),
+                    "The language list should be hidden"
+                );
+            }, this));
+            link.simulateGesture('tap');
+            this.wait();
+        },
+
+        "Should rerender the view": function () {
+            var container = this.view.get('container'),
+                link = container.one('.ez-language-switch-link');
+
+            link.simulateGesture('tap', this.next(function () {
+                Assert.areEqual(
+                    link.getData('language-code'),
+                    container.one('.ez-dropdown-list-indicator').get('text'),
+                    "The view should have been rerendered"
+                );
+            }, this));
+            this.wait();
+        },
+    });
+
     Y.Test.Runner.setName("eZ Language Switcher View tests");
     Y.Test.Runner.add(viewTest);
     Y.Test.Runner.add(viewTestWithoutOtherTranslations);
     Y.Test.Runner.add(eventTest);
     Y.Test.Runner.add(renderTest);
     Y.Test.Runner.add(hideTest);
+    Y.Test.Runner.add(eventSwitchModeTest);
 }, '', {requires: ['test', 'node-event-simulate', 'ez-languageswitcherview']});

From 3f86542753f0bb7e1ff5195f05c7eedcd478f107 Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Tue, 22 Nov 2016 12:44:21 +0100
Subject: [PATCH 39/40] EZP-26613: Allow switch language in the Content Peek
 View

---
 Resources/public/css/views/contentpeek.css    |   4 -
 .../public/js/views/ez-contentpeekview.js     |  64 +++++---
 .../public/js/views/ez-rawcontentview.js      |  46 ++++--
 .../views/assets/ez-contentpeekview-tests.js  | 118 +++++++++++---
 .../views/assets/ez-rawcontentview-tests.js   | 153 ++++++++++++------
 5 files changed, 270 insertions(+), 115 deletions(-)

diff --git a/Resources/public/css/views/contentpeek.css b/Resources/public/css/views/contentpeek.css
index 2ed03c366..ccce34ecf 100644
--- a/Resources/public/css/views/contentpeek.css
+++ b/Resources/public/css/views/contentpeek.css
@@ -56,7 +56,3 @@
 .ez-view-contentpeekview .ez-contentpeek-contenttype {
     margin: 0;
 }
-
-.ez-view-contentpeekview .ez-language-switcher-container {
-    display: none;
-}
diff --git a/Resources/public/js/views/ez-contentpeekview.js b/Resources/public/js/views/ez-contentpeekview.js
index 22dad5e86..6ca0e6118 100644
--- a/Resources/public/js/views/ez-contentpeekview.js
+++ b/Resources/public/js/views/ez-contentpeekview.js
@@ -27,22 +27,27 @@ YUI.add('ez-contentpeekview', function (Y) {
         },
 
         initializer: function () {
-            this.on(
-                ['contentChange', 'locationChange', 'contentTypeChange', 'languageCodeChange'],
-                this._forwardToRawContentView
-            );
+            this.after('activeChange', function (e) {
+                if ( !this.get('active') ) {
+                    this.reset();
+                }
+            });
         },
 
         /**
-         * Attribute change event handler. It sets the same value on the raw
-         * content view.
+         * Resets the view attributes. Overriden to destroy and set null in the
+         * `rawContentView` attribute.
          *
-         * @method _forwardToRawContentView
-         * @protected
-         * @param {EventFacade} e
+         * @method reset
+         * @param {String} name
          */
-        _forwardToRawContentView: function (e) {
-            this.get('rawContentView').set(e.attrName, e.newVal);
+        reset: function (name) {
+            if ( name === 'rawContentView' ) {
+                this.get('rawContentView').destroy();
+                this._set('rawContentView', null);
+                return;
+            }
+            this.constructor.superclass.reset.apply(this, arguments);
         },
 
         /**
@@ -69,11 +74,31 @@ YUI.add('ez-contentpeekview', function (Y) {
                 content: this.get('content').toJSON(),
                 contentType: this.get('contentType').toJSON(),
             }));
+            this._set('rawContentView', this._buildRawContentView());
             container.one('.ez-rawcontentview-container').append(
                 this.get('rawContentView').render().get('container')
             );
             return this;
-        }
+        },
+
+        /**
+         * Creates a new RawContentView instance.
+         *
+         * @method _buildRawContentView
+         * @protected
+         * @return {eZ.RawContentView}
+         */
+        _buildRawContentView: function () {
+            return new Y.eZ.RawContentView({
+                content: this.get('content'),
+                location: this.get('location'),
+                contentType: this.get('contentType'),
+                languageCode: this.get('languageCode'),
+                languageSwitchMode: 'event',
+                config: this.get('config'),
+                bubbleTargets: this,
+            });
+        },
     }, {
         ATTRS: {
             /**
@@ -104,7 +129,7 @@ YUI.add('ez-contentpeekview', function (Y) {
             contentType: {},
 
             /**
-             * The language code in which the Contenti item is displayed
+             * The language code in which the Content item is displayed
              *
              * @attribute languageCode
              * @type {String}
@@ -117,18 +142,11 @@ YUI.add('ez-contentpeekview', function (Y) {
              *
              * @attribute rawContentView
              * @type {eZ.RawContentView}
+             * @readOnly
              */
             rawContentView: {
-                valueFn: function () {
-                    return new Y.eZ.RawContentView({
-                        content: this.get('content'),
-                        location: this.get('location'),
-                        contentType: this.get('contentType'),
-                        languageCode: this.get('languageCode'),
-                        config: this.get('config'),
-                        bubbleTargets: this,
-                    });
-                },
+                readOnly: true,
+                value: null,
             },
         }
     });
diff --git a/Resources/public/js/views/ez-rawcontentview.js b/Resources/public/js/views/ez-rawcontentview.js
index 4e178fd2b..5a2f3a86f 100644
--- a/Resources/public/js/views/ez-rawcontentview.js
+++ b/Resources/public/js/views/ez-rawcontentview.js
@@ -46,28 +46,29 @@ YUI.add('ez-rawcontentview', function (Y) {
             if ( this.get('contentType') ) {
                 this._setFieldViews();
             }
-            this.after('contentTypeChange', this._setFieldViews);
-            this.after('activeChange', function (e) {
-                Y.Array.each(this._fieldViews, function (v) {
-                    v.set('active', e.newVal);
-                });
+            this.after('activeChange', this._forwardActive);
+
+            this.after('*:switchLanguage', function (e) {
+                this.set('languageCode', e.languageCode);
+            });
+
+            this.after('languageCodeChange', function () {
+                this._setFieldViews();
+                this.render();
+                this._forwardActive();
             });
-            this.on(
-                ['contentChange', 'locationChange', 'languageCodeChange'],
-                this._forwardToLanguageSwitcherView
-            );
         },
 
         /**
-         * Attribute change event handler. It makes sure the attribute new value
-         * is set on the language switcher view.
+         * Forwards the active flag to the field views.
          *
-         * @method _forwardToLanguageSwitcherView
+         * @method _forwardActive
          * @protected
-         * @param {EventFacade} e
          */
-        _forwardToLanguageSwitcherView: function (e) {
-            this.get('languageSwitcherView').set(e.attrName, e.newVal);
+        _forwardActive: function () {
+            this._fieldViews.forEach(function (v) {
+                v.set('active', this.get('active'));
+            }, this);
         },
 
         /**
@@ -232,6 +233,20 @@ YUI.add('ez-rawcontentview', function (Y) {
              */
             languageCode: {},
 
+            /**
+             * Configure the language switcher view to fire an event when
+             * switching language ('event' value) or to let the browser follow
+             * the link to switch language ('navigate' value).
+             *
+             * @attribute languageSwitchMode
+             * @type {String}
+             * @default undefined
+             * @writeOnce
+             */
+            languageSwitchMode: {
+                writeOnce: 'initOnly',
+            },
+
             /**
              * The language switcher view instance
              *
@@ -244,6 +259,7 @@ YUI.add('ez-rawcontentview', function (Y) {
                         content: this.get('content'),
                         location: this.get('location'),
                         languageCode: this.get('languageCode'),
+                        switchMode: this.get('languageSwitchMode'),
                         bubbleTargets: this
                     });
                 }
diff --git a/Tests/js/views/assets/ez-contentpeekview-tests.js b/Tests/js/views/assets/ez-contentpeekview-tests.js
index ef72a03eb..a4564c1f4 100644
--- a/Tests/js/views/assets/ez-contentpeekview-tests.js
+++ b/Tests/js/views/assets/ez-contentpeekview-tests.js
@@ -3,7 +3,7 @@
  * For full copyright and license information view LICENSE file distributed with this source code.
  */
 YUI.add('ez-contentpeekview-tests', function (Y) {
-    var renderTest, closeContentPeekTest, forwardAttributeToRawContentView,
+    var renderTest, closeContentPeekTest, resetTest, rawContentViewTest,
         Assert = Y.Assert, Mock = Y.Mock,
         _getModelMock = function (toJSON) {
             var mock = new Mock();
@@ -19,21 +19,18 @@ YUI.add('ez-contentpeekview-tests', function (Y) {
         name: "eZ Content Peek View render test",
 
         setUp: function () {
-            var RawContentView;
-
-            RawContentView = Y.Base.create('rawContentView', Y.View, [], {
+            Y.eZ.RawContentView = Y.Base.create('rawContentView', Y.View, [], {
                 render: function () {
                     renderTest.rawContentViewRendered = true;
                     return this;
                 },
             });
-            this.rawContentView = new RawContentView();
+            this.rawContentView = new Y.eZ.RawContentView();
             this.contentJSON = {};
             this.contentTypeJSON = {};
             this.view = new Y.eZ.ContentPeekView({
                 content: _getModelMock(this.contentJSON),
                 contentType: _getModelMock(this.contentTypeJSON),
-                rawContentView: this.rawContentView,
             });
         },
 
@@ -42,6 +39,7 @@ YUI.add('ez-contentpeekview-tests', function (Y) {
             this.rawContentView.destroy();
             delete this.view;
             delete this.rawContentView;
+            delete Y.eZ.RawContentView;
         },
 
         "Should use a template": function () {
@@ -86,7 +84,7 @@ YUI.add('ez-contentpeekview-tests', function (Y) {
             );
             Assert.isTrue(
                 this.view.get('container').one('.ez-rawcontentview-container').contains(
-                    this.rawContentView.get('container')
+                    this.view.get('rawContentView').get('container')
                 ),
                 "The raw content view container should have been added"
             );
@@ -97,13 +95,13 @@ YUI.add('ez-contentpeekview-tests', function (Y) {
         name: "eZ Content Peek View close content peek test",
 
         setUp: function () {
+            Y.eZ.RawContentView = Y.View;
             this.contentJSON = {};
             this.contentTypeJSON = {};
             this.view = new Y.eZ.ContentPeekView({
                 container: '.container',
                 content: _getModelMock(this.contentJSON),
                 contentType: _getModelMock(this.contentTypeJSON),
-                rawContentView: new Y.View(),
             });
             this.view.render();
         },
@@ -111,6 +109,7 @@ YUI.add('ez-contentpeekview-tests', function (Y) {
         tearDown: function () {
             this.view.destroy();
             delete this.view;
+            delete Y.eZ.RawContentView;
         },
 
         "Should fire the `contentPeekClose` event": function () {
@@ -129,48 +128,117 @@ YUI.add('ez-contentpeekview-tests', function (Y) {
         },
     });
 
-    forwardAttributeToRawContentView = new Y.Test.Case({
-        name: "eZ Content Peek View forward attribute test",
+    resetTest = new Y.Test.Case({
+        name: "eZ Content Peek View reset test",
 
         setUp: function () {
+            var RawContentView = Y.Base.create('rawContentView', Y.View, [], {
+                    destructor: Y.bind(function () {
+                        this.destroyed = true;
+                    }, this),
+                });
+            this.rawContentView = new RawContentView();
             this.view = new Y.eZ.ContentPeekView({
-                rawContentView: new Y.View(),
+                content: {},
+                location: {},
+                contentType: {},
+                languageCode: 'fre-FR',
             });
+            this.view._set('rawContentView', new RawContentView());
         },
 
         tearDown: function () {
             this.view.destroy();
+            delete this.destroyed;
             delete this.view;
         },
 
-        _testForwardAttribute: function (attrName, value) {
-            this.view.set(attrName, value);
+        "Should destroy the raw content view": function () {
+            this.view.reset();
 
-            Assert.areSame(
-                value, this.view.get('rawContentView').get(attrName),
-                "The attribute " + attrName + " should be set on the raw content view"
+            Assert.isTrue(
+                this.destroyed,
+                "The raw content view should have been destroyed"
+            );
+            Assert.isNull(
+                this.view.get('rawContentView'),
+                "The rawContentView attribute should have been set to null"
             );
         },
 
-        "Should forward the content attribute value": function () {
-            this._testForwardAttribute('content', {});
+        "Should be called on getting inactive": function () {
+            this.view.set('active', true);
+            this.view.set('active', false);
+
+            Assert.isTrue(
+                this.destroyed,
+                "The raw content view should have been destroyed"
+            );
+            Assert.isNull(
+                this.view.get('rawContentView'),
+                "The rawContentView attribute should have been set to null"
+            );
+        },
+    });
+
+    rawContentViewTest = new Y.Test.Case({
+        name: "eZ Content Peek View rawContentView parameter test",
+
+        setUp: function () {
+            Y.eZ.RawContentView = Y.View;
+            this.view = new Y.eZ.ContentPeekView({
+                content: _getModelMock(),
+                location: {},
+                contentType: _getModelMock(),
+                languageCode: 'fre-FR',
+                config: {},
+            });
+            this.view.render();
         },
 
-        "Should forward the contentType attribute value": function () {
-            this._testForwardAttribute('contentType', {});
+        tearDown: function () {
+            this.view.destroy();
+            delete this.view;
+            delete Y.eZ.RawContentView;
         },
 
-        "Should forward the location attribute value": function () {
-            this._testForwardAttribute('location', {});
+        "Should receive the parameters": function () {
+            var assertAttribute = Y.bind(function (attr) {
+                    Assert.areSame(
+                        this.view.get(attr),
+                        this.view.get('rawContentView').get(attr),
+                        "The rawContentView attribute " + attr + " should have been set"
+                    );
+                }, this);
+
+            assertAttribute('content');
+            assertAttribute('contentType');
+            assertAttribute('config');
+            assertAttribute('languageCode');
+            Assert.areEqual(
+                'event', this.view.get('rawContentView').get('languageSwitchMode'),
+                "The languageSwitchMode attribute should be set to event"
+            );
         },
 
-        "Should forward the languageCode attribute value": function () {
-            this._testForwardAttribute('languageCode', 'fre-FR');
+        "Should set the peek view as a bubble target": function () {
+            var bubble = false;
+
+            this.view.on('*:whatever', function () {
+                bubble = true;
+            });
+            this.view.get('rawContentView').fire('whatever');
+
+            Assert.isTrue(
+                bubble,
+                "The event should have bubbled to the peek view"
+            );
         },
     });
 
     Y.Test.Runner.setName("eZ Content Peek View tests");
     Y.Test.Runner.add(renderTest);
     Y.Test.Runner.add(closeContentPeekTest);
-    Y.Test.Runner.add(forwardAttributeToRawContentView);
+    Y.Test.Runner.add(resetTest);
+    Y.Test.Runner.add(rawContentViewTest);
 }, '', {requires: ['test', 'node-event-simulate', 'ez-contentpeekview']});
diff --git a/Tests/js/views/assets/ez-rawcontentview-tests.js b/Tests/js/views/assets/ez-rawcontentview-tests.js
index 87e579ea0..bca591ece 100644
--- a/Tests/js/views/assets/ez-rawcontentview-tests.js
+++ b/Tests/js/views/assets/ez-rawcontentview-tests.js
@@ -4,7 +4,7 @@
  */
 YUI.add('ez-rawcontentview-tests', function (Y) {
     var viewTest, destroyTest, eventTest, fieldViewParametersTest, inconsistencyFieldsTest,
-        languageSwitcherViewTest, contentTypeChangeTest,
+        languageSwitcherViewTest, switchLanguageTest,
         Assert = Y.Assert, Mock = Y.Mock,
         _getContentTypeMock = function (fieldDefinitions, fieldGroups) {
             var mock = new Y.Test.Mock();
@@ -244,6 +244,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 content: {},
                 location: {},
                 languageCode: 'fre-FR',
+                languageSwitchMode: 'whatever',
             });
         },
 
@@ -270,6 +271,11 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 switcher.get('languageCode'),
                 'The location should have been set on languageSwitcherView'
             );
+            Assert.areEqual(
+                this.view.get('languageSwitchMode'),
+                switcher.get('switchMode'),
+                "The language switcher should have received the language switch mode"
+            );
         },
 
         "Should set the raw content view as a bubble target of the language switcher": function () {
@@ -286,26 +292,6 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 "The raw content view should be a bubble target of the language switcher"
             );
         },
-
-        _testForwardAttribute: function (attrName, value) {
-            this.view.set(attrName, value);
-
-            Assert.areSame(
-                value, this.view.get('languageSwitcherView').get(attrName)
-            );
-        },
-
-        "Should receive the new value of the content attribute": function () {
-            this._testForwardAttribute('content', {});
-        },
-
-        "Should receive the new value of the location attribute": function () {
-            this._testForwardAttribute('location', {});
-        },
-
-        "Should receive the new value of the languageCode attribute": function () {
-            this._testForwardAttribute('languageCode', 'eng-GB');
-        },
     });
 
     eventTest = new Y.Test.Case({
@@ -365,6 +351,7 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 );
             });
 
+            this.languageSwitcherView = new Y.View();
             this.view = new Y.eZ.RawContentView({
                 container: '.container',
                 location: this.location,
@@ -372,8 +359,9 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
                 contentType: this.contentType,
                 languageCode: this.languageCode,
                 config: this.config,
-                languageSwitcherView: new Y.View(),
+                languageSwitcherView: this.languageSwitcherView,
             });
+            this.languageSwitcherView.addTarget(this.view);
         },
 
         tearDown: function () {
@@ -590,45 +578,65 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
         }
     });
 
-    contentTypeChangeTest = new Y.Test.Case({
-        name: "eZ Raw Content View contentTypeChange test",
+    switchLanguageTest = new Y.Test.Case({
+        name: "eZ Raw Content View switchLanguage event test",
 
         setUp: function () {
+            var that = this;
+
+            this.languageCode = "eng-GB";
+            this.newLanguageCode = 'fre-FR';
             this.fieldDefinitions = [{
                 fieldGroup: 'content',
                 fieldType: 'something',
                 identifier: 'id1',
-            }, {
-                fieldGroup: 'meta',
-                fieldType: 'somethingelse',
-                identifier: 'id2',
             }];
-            this.fieldGroups = [{fieldGroupName: 'content'}, {fieldGroupName: 'meta'}];
-            this.fields = {'id1': {fieldValue: 'value1'}, 'id2': {fieldValue: 'value2'}};
-            this.fieldViewsInitialized = {};
+            this.fieldGroups = [{fieldGroupName: 'content'}];
+            this.fields = {};
+            this.fields[this.languageCode] = {'id1': {fieldValue: 'value1'}};
+            this.fields[this.newLanguageCode] = {'id1': {fieldValue: 'value1'}};
 
             this.location = {};
-            this.content = _getContentMock.call(this, {});
+            this.content = new Mock();
+            Mock.expect(this.content, {
+                method: 'getField',
+                args: [Mock.Value.String, Mock.Value.String],
+                run: Y.bind(function (id, lang) {
+                    return this.fields[lang][id];
+                }, this),
+            });
+            Mock.expect(this.content, {
+                method: 'toJSON',
+                returns: {},
+            });
+
             this.contentType = this._getContentTypeMock();
 
+            this.fieldViewField = {};
             Y.Array.each(this.fieldDefinitions, function (def) {
                 Y.eZ.FieldView.registerFieldView(
                     def.fieldType ,
-                    Y.Base.create(def.fieldType + 'TestView', Y.eZ.FieldView, [], {
-                        initializer: Y.bind(function () {
-                            this.fieldViewsInitialized[def.identifier] = true;
-                        }, this),
+                    Y.Base.create(def.fieldType + 'TestView', Y.View, [], {
+                        initializer: function () {
+                            that.fieldView = this;
+                        },
+                        render: function () {
+                            that.fieldViewRendered = true;
+                            return this;
+                        },
                     })
                 );
-            }, this);
+            });
 
+            this.languageSwitcherView = new Y.View();
             this.view = new Y.eZ.RawContentView({
-                container: '.container',
                 location: this.location,
                 content: this.content,
+                contentType: this.contentType,
                 languageCode: this.languageCode,
-                languageSwitcherView: new Y.View(),
+                languageSwitcherView: this.languageSwitcherView,
             });
+            this.languageSwitcherView.addTarget(this.view);
         },
 
         tearDown: function () {
@@ -640,19 +648,68 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
             });
         },
 
+        _getContentMock: function () {
+            return _getContentMock.call(this, {});
+        },
+
         _getContentTypeMock: function () {
             return _getContentTypeMock(this.fieldDefinitions, this.fieldGroups);
         },
 
-        "Should initialize the field views": function () {
-            this.view.set('contentType', this.contentType);
+        _switchLanguage: function () {
+            this.languageSwitcherView.fire('switchLanguage', {
+                languageCode: this.newLanguageCode,
+            });
+        },
 
-            this.fieldDefinitions.forEach(function (def) {
-                Assert.isTrue(
-                    this.fieldViewsInitialized[def.identifier],
-                    "The field views for the content type should have been initialized"
-                );
-            }, this);
+        "Should set the language code on switchLanguage event": function () {
+            this._switchLanguage();
+            Assert.areEqual(
+                this.newLanguageCode,
+                this.view.get('languageCode'),
+                "The language code attribute should have been updated"
+            );
+        },
+
+        "Should instantiate a new field view": function () {
+            var origFieldView = this.fieldView;
+
+            this._switchLanguage();
+            Assert.areNotSame(
+                origFieldView, this.fieldView,
+                "A new field view should have been created"
+            );
+            Assert.areSame(
+                this.fields[this.newLanguageCode].id1,
+                this.fieldView.get('field'),
+                "The field in the new language should be passed to the field view"
+            );
+        },
+
+        "Should rerender the view and field views": function () {
+            var stamp = 'not rendered yet';
+
+            this.view.get('container').setContent('stamp');
+            this._switchLanguage();
+
+            Assert.areNotEqual(
+                stamp, this.view.get('container').getContent('stamp'),
+                "The view should have been rendered"
+            );
+            Assert.isTrue(
+                this.fieldViewRendered,
+                "The field view should have been rendered"
+            );
+        },
+
+        "Should set the active flag on the field views": function () {
+            this.view.set('active', true);
+            this._switchLanguage();
+
+            Assert.isTrue(
+                this.fieldView.get('active'),
+                "The active flag should set on the field view"
+            );
         },
     });
 
@@ -663,5 +720,5 @@ YUI.add('ez-rawcontentview-tests', function (Y) {
     Y.Test.Runner.add(destroyTest);
     Y.Test.Runner.add(fieldViewParametersTest);
     Y.Test.Runner.add(inconsistencyFieldsTest);
-    Y.Test.Runner.add(contentTypeChangeTest);
+    Y.Test.Runner.add(switchLanguageTest);
 }, '', {requires: ['test', 'node-event-simulate', 'ez-rawcontentview']});

From b3ea8b0485513b1b96e3c2a7c63a635731d0735d Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Tue, 22 Nov 2016 12:56:56 +0100
Subject: [PATCH 40/40] EZP-26613: Improved the display of the language
 switcher

---
 Resources/public/css/theme/views/languageswitcher.css |  9 +++++++--
 Resources/public/css/views/languageswitcher.css       | 11 +++++------
 Resources/public/templates/languageswitcher.hbt       |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Resources/public/css/theme/views/languageswitcher.css b/Resources/public/css/theme/views/languageswitcher.css
index 0fec07af7..07bcf3a1b 100644
--- a/Resources/public/css/theme/views/languageswitcher.css
+++ b/Resources/public/css/theme/views/languageswitcher.css
@@ -16,10 +16,15 @@
     vertical-align: bottom;
 }
 
-.ez-view-languageswitcherview .ez-expandable-area {
+
+.ez-view-languageswitcherview .ez-language-list {
+    list-style: none;
     border: 1px solid #ccc;
     box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
     background: #fff;
+}
+
+.ez-view-languageswitcherview .ez-expandable-area {
     display: block;
             transform: scaleY(0);
     -webkit-transform: scaleY(0);
@@ -30,8 +35,8 @@
 }
 
 .ez-view-languageswitcherview.is-expanded .ez-expandable-area {
-            transform: scaleY(1);
     -webkit-transform: scaleY(1);
+            transform: scaleY(1);
 }
 
 .ez-view-languageswitcherview .ez-content-translation .ez-language-switch-link {
diff --git a/Resources/public/css/views/languageswitcher.css b/Resources/public/css/views/languageswitcher.css
index 14f6e6e77..961fabe41 100644
--- a/Resources/public/css/views/languageswitcher.css
+++ b/Resources/public/css/views/languageswitcher.css
@@ -8,19 +8,18 @@
     top: 0;
     right: 1em;
     line-height: 2.5em;
-    padding: 0 1em;
 }
 
-.ez-view-languageswitcherview .ez-expandable-area {
+.ez-view-languageswitcherview .ez-language-list {
     position: absolute;
-    top: 2.3em;
-    left: 0.5em;
-    overflow-y: auto;
+    top: 2.5em;
+    overflow: hidden;
+    text-overflow: ellipsis;
     display: none;
     line-height: 1em;
     margin: 0;
     padding: 0;
-    list-style: none;
+    width: 100%;
 }
 
 .ez-view-languageswitcherview.is-expanded .ez-expandable-area {
diff --git a/Resources/public/templates/languageswitcher.hbt b/Resources/public/templates/languageswitcher.hbt
index 11407e3aa..ab8242f7a 100644
--- a/Resources/public/templates/languageswitcher.hbt
+++ b/Resources/public/templates/languageswitcher.hbt
@@ -8,10 +8,10 @@
     {{/if}}
 </div>
 {{#if otherTranslations}}
-    <ul class="ez-expandable-area">
+    <ul class="ez-expandable-area ez-language-list">
     {{#each otherTranslations}}
         <li class="ez-content-translation">
-            <a class="ez-language-switch-link" data-language-code="{{ this }}" href="{{ path "viewLocation" id=../location.id languageCode=this }}">
+            <a class="ez-language-switch-link" data-language-code="{{ this }}" href="{{ path "viewLocation" id=../location.id languageCode=this }}" title="{{ language_name this }}">
                 {{ language_name this }}
             </a>
         </li>