← Back to branch summary

~zeller-benjamin/ubuntu-ui-toolkit/qrcify3

« back to all changes in this revision

Viewing changes to src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml

  • Committer: Benjamin Zeller
  • Date: 2015-09-10 08:43:12 UTC
  • mfrom: (1585.1.2 staging)
  • Revision ID: benjamin.zeller@canonical.com-20150910084312-6eh8n2729jpslgmb
Merge staging

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml
147
147
                onStatusChanged: {
148
148
                    if (item && status == Loader.Ready) {
149
149
                        // set model data
150
 
                        if (item.hasOwnProperty("action"))
 
150
                        if (item.hasOwnProperty("action")) {
151
151
                            item.action = modelData;
 
152
                            item.objectName = item.action.objectName + '_button';
 
153
                        }
152
154
                        if (item.hasOwnProperty("refModelData"))
153
155
                            item.refModelData = modelData;
154
156
                        if (item.hasOwnProperty("modelData"))