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

Persistent State #164

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

Persistent State #164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
867aa3b
style: added consistent formatting and some explanatory comments
widmoser Dec 3, 2015
06c32bb
feat(persistentState): persisting container sizes in local storage
widmoser Dec 3, 2015
deaad26
test: added a .bowerrc file to explicitly define the location of bowe…
widmoser Dec 3, 2015
861ca93
test(persistentState): fixed existing tests by clearing local storage…
widmoser Dec 3, 2015
b1beee2
test(persistentState): extended existing tests to check if new positi…
widmoser Dec 3, 2015
7d74e0f
test(persistentState): added a test to check if state is persisted
widmoser Dec 3, 2015
0880294
feat(persistentState): improved storage id robustness
widmoser Dec 4, 2015
220cbb7
style(persistentState): fixed jshint problems
widmoser Dec 4, 2015
2e0b7db
style: reset formatting changes to clean up diff
widmoser Dec 9, 2015
6bcba31
refactor: removed .bowerrc file because this change is out of scope f…
widmoser Dec 9, 2015
4bc969e
style: some more formatting fixes to clean up diff
widmoser Dec 9, 2015
35651cb
style: removed TODO and using forEach instead of for loop
widmoser Feb 19, 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
Prev Previous commit
Next Next commit
style: some more formatting fixes to clean up diff
  • Loading branch information
@widmoser
widmoser committed Dec 9, 2015
commit 4bc969ee9635b58f00b3bc632f65947e12e5fa1a
10 changes: 5 additions & 5 deletions src/ui-layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ angular.module('ui.layout', [])

//verify the container was found in the list
if(index > -1) {
var beforeContainer = (index > 0) ? ctrl.containers[index - 1] : null;
var afterContainer = ((index+1) <= ctrl.containers.length) ? ctrl.containers[index + 1] : null;
var beforeContainer = (index > 0) ? ctrl.containers[index-1] : null;
var afterContainer = ((index+1) <= ctrl.containers.length) ? ctrl.containers[index+1] : null;

if(beforeContainer !== null) setValues(beforeContainer);
if(afterContainer !== null) setValues(afterContainer);
Expand Down Expand Up @@ -283,7 +283,7 @@ angular.module('ui.layout', [])
ctrl.calculate = function() {
var c, i;
var dividerSize = parseInt(opts.dividerSize);
var elementSize = $element[0].getBoundingClientRect()[ctrl.sizeProperties.sizeProperty]; // width/height
var elementSize = $element[0].getBoundingClientRect()[ctrl.sizeProperties.sizeProperty];
var availableSize = elementSize - (dividerSize * numOfSplitbars);
var originalSize = availableSize;
var usedSpace = 0;
Expand Down Expand Up @@ -347,7 +347,7 @@ angular.module('ui.layout', [])
remainder = availableSize - autoSize * numOfAutoContainers;
for(i=0; i < ctrl.containers.length; i++) {
c = ctrl.containers[i];
c[ctrl.sizeProperties.flowProperty] = usedSpace; // left/top
c[ctrl.sizeProperties.flowProperty] = usedSpace;
c.maxSize = opts.maxSizes[i];
c.minSize = opts.minSizes[i];

Expand Down Expand Up @@ -954,7 +954,7 @@ angular.module('ui.layout', [])
element.addClass(animationClass);

scope.$watch('collapsed', function (val, old) {
if(angular.isDefined(old) && val !== old) {
if (angular.isDefined(old) && val !== old) {
ctrl.toggleContainer(scope.container.index);
}
});
Expand Down
6 changes: 3 additions & 3 deletions test/layout-scenar.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function splitMoveTests(description, startEvent, moveEvent, endEvent) {
}
});

afterEach(function() {
afterEach(function () {
if(element) element.remove();
});

Expand All @@ -59,13 +59,13 @@ function splitMoveTests(description, startEvent, moveEvent, endEvent) {

// Spy on the requestAnimationFrame to directly trigger it
beforeEach(function () {
spyOn(window, 'requestAnimationFrame').and.callFake(function(fct) {
spyOn(window, 'requestAnimationFrame').and.callFake(function (fct) {
fct();
});
});

afterEach(function () {
if(element) element.remove();
if (element) element.remove();
});

describe('the slider', function () {
Expand Down