Merge lp:~renatofilho/address-book-app/code-style-fix into lp:~fboucault/address-book-app/converged_bottom_edge

[Renato Araujo Oliveira Filho]

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-10-23 11:05:56 +0000
+++ src/imports/ABContactListPage.qml	2015-10-23 12:41:25 +0000
@@ -152,6 +152,12 @@
         editorPage.contactSaved.connect(onNewContactSaved);
     }
 
+    function onNewContactSaved(contact) {
+        if (pageStack.columns > 1) {
+            showContact(contact);
+        }
+    }
+
     title: i18n.tr("Contacts")
 
     flickable: null
@@ -541,12 +547,6 @@
         }
     }
 
-    function onNewContactSaved(contact) {
-        if (pageStack.columns > 1) {
-            showContact(contact);
-        }
-    }
-
     Component {
         id: editorPageBottomEdge
         ABContactEditorPage {
@@ -578,12 +578,7 @@
         id: bottomEdge
         objectName: "bottomEdge"
 
-        anchors.fill: parent
-        contentComponent: pageStack.columns == 1 ? editorPageBottomEdge : emptyContact
-        flickable: contactList
-        iconName: "contact-new"
-        enabled: !contactList.isInSelectionMode
-        backGroundEffectEnabled: pageStack.columns === 1
+        property var incubator
 
         // FIXME: this is a workaround for the lack of fully asynchronous loading
         // of Pages in AdaptativePageLayout
@@ -600,7 +595,6 @@
             }
         }
 
-        property var incubator
         function incubateObject(component, properties, callback) {
             if (component.status == Component.Ready) {
                 incubator = component.incubateObject(null,
@@ -624,6 +618,13 @@
                                        showContactEditorPage);
         }
 
+        anchors.fill: parent
+        contentComponent: pageStack.columns == 1 ? editorPageBottomEdge : emptyContact
+        flickable: contactList
+        iconName: "contact-new"
+        enabled: !contactList.isInSelectionMode
+        backGroundEffectEnabled: pageStack.columns === 1
+
         onOpenBegin: {
             contactList.prepareNewContact = true;
             contactList.positionViewAtBeginning();