Chromium Code Reviews| Index: chrome/browser/resources/ntp4/apps_page.js |
| diff --git a/chrome/browser/resources/ntp4/apps_page.js b/chrome/browser/resources/ntp4/apps_page.js |
| index e5f2fe7309a4cccd7d985b4095c0401c03b965d5..b6ce2c4d50e42b013b8d427d5b03803c3de141e1 100644 |
| --- a/chrome/browser/resources/ntp4/apps_page.js |
| +++ b/chrome/browser/resources/ntp4/apps_page.js |
| @@ -663,8 +663,9 @@ cr.define('ntp', function() { |
| * Similar to appendApp, but it respects the app_launch_ordinal field of |
| * |appData|. |
| * @param {Object} appData The data that describes the app. |
| + * @param {boolean} animate Whether to animate the insertion. |
| */ |
| - insertApp: function(appData) { |
| + insertApp: function(appData, animate) { |
| var index = this.tileElements_.length; |
| for (var i = 0; i < this.tileElements_.length; i++) { |
| if (appData.app_launch_ordinal < |
| @@ -674,7 +675,7 @@ cr.define('ntp', function() { |
| } |
| } |
| - this.addTileAt(new App(appData), index, false); |
| + this.addTileAt(new App(appData), index, animate); |
| }, |
| /** |
| @@ -749,17 +750,6 @@ cr.define('ntp', function() { |
| }, |
| /** @inheritDoc */ |
| - doDragOver: function(e) { |
| - var tile = ntp.getCurrentlyDraggingTile(); |
| - if (tile && !tile.querySelector('.app')) { |
| - e.preventDefault(); |
| - this.setDropEffect(e.dataTransfer); |
|
Dan Beam
2012/05/15 01:46:03
this was avoiding calling TilePage#updateDropIndic
Evan Stade
2012/05/15 03:01:11
yes this is intentional, you will notice that most
Dan Beam
2012/05/15 04:00:44
OK, fixed outside data handling to match.
|
| - } else { |
| - TilePage.prototype.doDragOver.call(this, e); |
| - } |
| - }, |
| - |
| - /** @inheritDoc */ |
| shouldAcceptDrag: function(e) { |
| if (ntp.getCurrentlyDraggingTile()) |
| return true; |