← Back to branch summary

~osomon/webbrowser-app/bottom-edge-mouse

« back to all changes in this revision

Viewing changes to src/app/webbrowser/BookmarksFoldersViewWide.qml

  • Committer: Olivier Tilloy
  • Date: 2016-01-28 18:54:35 UTC
  • mfrom: (1328.1.7 webbrowser-app)
  • Revision ID: olivier.tilloy@canonical.com-20160128185435-ry7qkjmegp8nm6fz
Merge the latest changes from trunk, and resolve a minor conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/webbrowser/BookmarksFoldersViewWide.qml
1
1
/*
2
 
 * Copyright 2015 Canonical Ltd.
 
2
 * Copyright 2015-2016 Canonical Ltd.
3
3
 *
4
4
 * This file is part of webbrowser-app.
5
5
 *
195
195
                bookmarksList.interactive = true
196
196
 
197
197
                if (dragAndDrop.target && dragAndDrop.target.folderName !== folder) {
198
 
                    bookmarksFoldersViewWideItem.model.update(entry.url, entry.title,
199
 
                                                                 dragAndDrop.target.folderName)
 
198
                    BookmarksModel.update(entry.url, entry.title, dragAndDrop.target.folderName)
200
199
                    dragAndDrop.success = true
201
200
                }
202
201
            }