Merge branch 'open-master' into open1223

Merge latest from master branch into topic branch for
WTD-1223
This commit is contained in:
Victor Woeltjen
2015-06-23 13:29:47 -07:00
4 changed files with 52 additions and 7 deletions

View File

@@ -90,6 +90,10 @@ define(
function lookupPanels(ids) {
var configuration = $scope.configuration || {};
// ids is read from model.composition and may be undefined;
// fall back to an array if that occurs
ids = ids || [];
// Pull panel positions from configuration
rawPositions = shallowCopy(configuration.panels || {}, ids);