Skip to content

Fix for initializing Flexie with JS for nested layouts in IE 9 and lower #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Fix for initializing Flexie with JS for nested layouts in IE 9 and lower #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5661b1c
Change demo flexie src call to use relative path
Jan 9, 2012
f3e8df8
Fixes issue #32
Jan 9, 2012
f9df5ea
Fix for initializing Flexie with JS for nested layouts in IE 9 and lo…
Jun 26, 2013
40da658
Disable automatic initialization on startup, to allow using the libra…
osmestad Jul 19, 2013
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
2 changes: 1 addition & 1 deletion demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@
<!-- <script src="https://ajax.googleapis.com/ajax/libs/dojo/1.5/dojo/dojo.xd.js" type="text/javascript"></script> -->

<!-- Flexie -->
<script src="/src/flexie.js" type="text/javascript"></script>
<script src="../src/flexie.js" type="text/javascript"></script>
</body>
</html>
30 changes: 16 additions & 14 deletions src/flexie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,14 +1067,14 @@ var Flexie = (function (win, doc) {
isNested;

while (parent.FLX_DOM_ID) {
obj = FLEX_BOXES[parent.FLX_DOM_ID];
matrix = createMatchMatrix(obj.children, sanitizeChildren(parent, parent.childNodes), NULL);
totalFlex += matrix.total;
isNested = TRUE;
parent = parent.parentNode;
}
if (FLEX_BOXES[parent.FLX_DOM_ID]) {
obj = FLEX_BOXES[parent.FLX_DOM_ID];
matrix = createMatchMatrix(obj.children, sanitizeChildren(parent, parent.childNodes), NULL);
totalFlex += matrix.total;
isNested = TRUE;
}
parent = parent.parentNode;
}

return {
nested : isNested,
Expand Down Expand Up @@ -1548,11 +1548,13 @@ var Flexie = (function (win, doc) {
x = flexers[key][k];
max = NULL;

for (m = 0, n = x.properties.length; m < n; m++) {
rule = x.properties[m];
if (x.properties) {
for (m = 0, n = x.properties.length; m < n; m++) {
rule = x.properties[m];

if ((RESTRICTIVE_PROPERTIES).test(rule.property)) {
max = parseFloat(rule.value);
if ((RESTRICTIVE_PROPERTIES).test(rule.property)) {
max = parseFloat(rule.value);
}
}
}

Expand Down Expand Up @@ -1895,7 +1897,7 @@ var Flexie = (function (win, doc) {
while (parent) {
flex = FLEX_BOXES[parent.FLX_DOM_ID];

if (flex) {
if (flex && flex.nodes) {
cleanPositioningProperties(flex.nodes);
self.setup(flex.target, flex.nodes, flex);
}
Expand Down Expand Up @@ -2028,7 +2030,7 @@ var Flexie = (function (win, doc) {
FLX.version = "1.0.3";

// Load when the DOM is ready
attachLoadMethod(FLX.init);
//attachLoadMethod(FLX.init);
Copy link

@quantizor quantizor Mar 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You shouldn't comment that out, as it will prevent Flexie from automatically starting up.


return FLX;
}(this, document));
33 changes: 33 additions & 0 deletions test/css/nested-grid-js.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/* set up stuff: */
body, html {
width: 100%;
height: 100%;
padding: 0;
margin: 0;
font: normal 13px/16px "Helvetica Neue", Helvetica, Arial, sans-serif;
}

#box-wrap {
margin: 0 auto;
width: 70%;
height: 99%;
border: 1px solid #8ec1da;
background: #d9ecf5;
}

#box-wrap-inner div {
margin: 10px;
background: #f8f8f8;
border: 1px solid #8ec1da;
text-align: center;
line-height: 50px;
}

/* Sizing of flex-boxes: */
#box-wrap-inner {
height: 100%;
}

#menu {
width: 200px;
}
48 changes: 48 additions & 0 deletions test/css/nested-grid.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/* set up stuff: */
body, html {
width: 100%;
height: 100%;
padding: 0;
margin: 0;
font: normal 13px/16px "Helvetica Neue", Helvetica, Arial, sans-serif;
}

#box-wrap {
margin: 0 auto;
width: 70%;
height: 99%;
border: 1px solid #8ec1da;
background: #d9ecf5;
}

#box-wrap-inner div {
margin: 10px;
background: #f8f8f8;
border: 1px solid #8ec1da;
text-align: center;
line-height: 50px;
}

/* Sizing of flex-boxes: */
#box-wrap-inner {
height: 100%;
}

#menu {
width: 200px;
}

/* Flexie specific styles: */
#box-wrap-inner {
display: box;
box-orient: vertical;
}

#box-2 {
box-flex: 1;
display: box;
}

#main {
box-flex: 1;
}
37 changes: 37 additions & 0 deletions test/nested-grid-js.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Flexie grid</title>
<!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<link rel="stylesheet" href="css/nested-grid-js.css" type="text/css" />
</head>
<body>
<div id="box-wrap">
<div id="box-wrap-inner">
<div id="box-1">Box 1</div>
<div id="box-2">
<div id="menu">menu</div>
<div id="main">main</div>
</div>
<div id="box-3">Box 3</div>
</div>
</div>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js" type="text/javascript"></script>
<script src="../src/flexie.js" type="text/javascript"></script>
<script>
window.setTimeout(function () {
var box = new Flexie.box({
target : document.getElementById("box-wrap-inner"),
orient : "vertical",
flexMatrix : [0, 1, 0]
});

var inner = new Flexie.box({
target : document.getElementById("box-2"),
flexMatrix : [0, 1]
});
}, 1000);
</script>
</body>
</html>
23 changes: 23 additions & 0 deletions test/nested-grid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Flexie grid</title>
<!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<link rel="stylesheet" href="css/nested-grid.css" type="text/css" />
</head>
<body>
<div id="box-wrap">
<div id="box-wrap-inner">
<div id="box-1">Box 1</div>
<div id="box-2">
<div id="menu">menu</div>
<div id="main">main</div>
</div>
<div id="box-3">Box 3</div>
</div>
</div>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js" type="text/javascript"></script>
<script src="../src/flexie.js" type="text/javascript"></script>
</body>
</html>