From 6a75d4d8ea1e14bb7ec03f275d6c5a5284fa4fb6 Mon Sep 17 00:00:00 2001 From: Wesley Dawson Date: Tue, 21 Jul 2015 17:03:19 -0700 Subject: [PATCH] Move dashboard sandboxes collection to avoid infinite recursion. Fixes #1613. --- .../javascript/adapters/sandboxes_adapter.js | 13 +++++++--- dasher/javascript/collections/sandboxes.js | 25 ------------------- 2 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 dasher/javascript/collections/sandboxes.js diff --git a/dasher/javascript/adapters/sandboxes_adapter.js b/dasher/javascript/adapters/sandboxes_adapter.js index 74333c37f..5af39d9ae 100644 --- a/dasher/javascript/adapters/sandboxes_adapter.js +++ b/dasher/javascript/adapters/sandboxes_adapter.js @@ -5,10 +5,9 @@ define( "backbone", "adapters/base_adapter", "models/sandbox", - "models/sandbox_output", - "collections/plugins" + "models/sandbox_output" ], - function($, _, Backbone, BaseAdapter, Sandbox, Sandboxes, SandboxOutput) { + function($, _, Backbone, BaseAdapter, Sandbox, SandboxOutput) { "use strict"; /** @@ -21,6 +20,14 @@ define( * * @constructor */ + var Sandboxes = Backbone.Collection.extend({ + model: Sandbox, + + comparator: function(collection) { + return(collection.get('Name')); + } + }); + var SandboxesAdapter = function() { /** * Sandboxes collection to be filled with data. diff --git a/dasher/javascript/collections/sandboxes.js b/dasher/javascript/collections/sandboxes.js deleted file mode 100644 index 7fe966ce2..000000000 --- a/dasher/javascript/collections/sandboxes.js +++ /dev/null @@ -1,25 +0,0 @@ -define( - [ - "backbone", - "models/sandbox" - ], - function(Backbone, Sandbox) { - "use strict"; - - /** - * Sandboxes collection. - * - * @class Sandboxes - * @constructor - */ - var Sandboxes = Backbone.Collection.extend({ - model: Sandbox, - - comparator: function(collection) { - return(collection.get('Name')); - } - }); - - return Sandboxes; - } -);