summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/ntp4/apps_page.js
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/resources/ntp4/apps_page.js')
-rw-r--r--chrome/browser/resources/ntp4/apps_page.js16
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/resources/ntp4/apps_page.js b/chrome/browser/resources/ntp4/apps_page.js
index b6ef1e6..0b5a567 100644
--- a/chrome/browser/resources/ntp4/apps_page.js
+++ b/chrome/browser/resources/ntp4/apps_page.js
@@ -415,6 +415,17 @@ cr.define('ntp4', function() {
this.appendTile(new App(appData), animate);
},
+ /** @inheritdoc */
+ doDragOver: function(e) {
+ var tile = ntp4.getCurrentlyDraggingTile();
+ if (!tile.querySelector('.app')) {
+ e.preventDefault();
+ e.dataTransfer.dropEffect = 'copy';
+ } else {
+ TilePage.prototype.doDragOver.call(this, e);
+ }
+ },
+
/** @inheritDoc */
shouldAcceptDrag: function(e) {
return ntp4.getCurrentlyDraggingTile() ||
@@ -431,7 +442,7 @@ cr.define('ntp4', function() {
currentlyDraggingTile,
this.tileElements_[index]);
this.tileMoved(currentlyDraggingTile);
- } else if (tileContents.classList.contains('most-visited')) {
+ } else if (currentlyDraggingTile.querySelector('.most-visited')) {
this.generateAppForLink(tileContents.data);
}
} else {
@@ -485,7 +496,8 @@ cr.define('ntp4', function() {
generateAppForLink: function(data) {
assert(data.url != undefined);
assert(data.title != undefined);
- chrome.send('generateAppForLink', [data.url, data.title]);
+ var pageIndex = ntp4.getAppsPageIndex(this);
+ chrome.send('generateAppForLink', [data.url, data.title, pageIndex]);
},
/** @inheritDoc */