Skip to content
This repository has been archived by the owner on Sep 8, 2020. It is now read-only.

Update ui-layout.js #197

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update ui-layout.js #197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e93f196
Update ui-layout.js
luxigo Mar 2, 2016
baa4527
Enable publishing ui-layout controller into related scope (like ng-form)
luxigo Mar 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/ui-layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ angular.module('ui.layout', [])

var ctrl = this;
var opts = angular.extend({}, $scope.$eval($attrs.uiLayout), $scope.$eval($attrs.options));
if (opts.ctrl) {
$scope[opts.ctrl]=ctrl;
}

var numOfSplitbars = 0;
//var cache = {};
var animationFrameRequested;
Expand Down Expand Up @@ -387,7 +391,7 @@ angular.module('ui.layout', [])
}
} else {
// fix for potentially collapsed containers
ctrl.containers[index - 1].collapsed = false;
if (index) ctrl.containers[index - 1].collapsed = false;
numOfSplitbars--;
}

Expand Down