Index: components/browse/data/demoData.json
===================================================================
--- components/browse/data/demoData.json (revision 9148)
+++ components/browse/data/demoData.json (working copy)
@@ -8,13 +8,13 @@
strings: {
title: "Local Browse Sample"
},
-
- lists: [
+
+ useCabinet: true,
+
+ categories: [
{
- category: "Category 1",
- description: "",
- listOptions: {
- links: [
+ name: "Category 1",
+ items: [
{
target: "../../navigationList/images/Artifacts-.jpg",
image: "../../navigationList/images/Artifacts-.jpg",
@@ -32,20 +32,13 @@
image: "../../navigationList/images/Snuffbox.jpg",
title: "Title 3",
description: "Description 3"
- },
- {
- target: "http://build.fluidproject.org",
- category: "Category",
- size: 100
- }
+ }
]
- }
+
},
{
- category: "Category 2",
- description: "Description 2",
- listOptions: {
- links: [
+ name: "Category 2",
+ items: [
{
target: "../../navigationList/images/Artifacts-.jpg",
image: "../../navigationList/images/Artifacts-.jpg",
@@ -63,20 +56,12 @@
image: "../../navigationList/images/Snuffbox.jpg",
title: "Title 3",
description: "Description 3"
- },
- {
- target: "http://build.fluidproject.org",
- category: "Category",
- size: 100
}
]
- }
},
{
- category: "Category 3",
- description: "Description 3",
- listOptions: {
- links: [
+ name: "Category 3",
+ items: [
{
target: "../../navigationList/images/Artifacts-.jpg",
image: "../../navigationList/images/Artifacts-.jpg",
@@ -94,14 +79,8 @@
image: "../../navigationList/images/Snuffbox.jpg",
title: "Title 3",
description: "Description 3"
- },
- {
- target: "http://build.fluidproject.org",
- category: "Category",
- size: 100
}
]
- }
}
]
}
\ No newline at end of file
Index: components/browse/html/browse.html
===================================================================
--- components/browse/html/browse.html (revision 9148)
+++ components/browse/html/browse.html (working copy)
@@ -58,16 +58,18 @@
+
+
+
+
+
@@ -50,13 +51,15 @@
Description
@@ -66,7 +69,7 @@
@@ -17,21 +16,25 @@
-
+
+
+
-
-
+
Index: components/navigationList/js/NavigationList.js
===================================================================
--- components/navigationList/js/NavigationList.js (revision 9148)
+++ components/navigationList/js/NavigationList.js (working copy)
@@ -16,129 +16,71 @@
(function ($) {
- /**
- * Creates a render component for the component tree. The key can be any key that a componet tree would take and the value is what would be assigned to it.
- * For example if you wanted to have node that just prints out "Hello World" you could set the key to "value" and the value to "Hello World"
- *
- * @param {Object} id, the ID used by the component tree
- * @param {Object} key, a key representing an entry in a renderer component
- * @param {Object} value, the value assigned to the key
- * @param {Object} classes, (optional) can add classes without having to specify the decorator key.
- */
- var treeNode = function (id, key, value, classes) {
- var obj = {ID: id};
- obj[key] = value;
- if (classes) {
- obj.decorators = {
- type: "addClass",
- classes: classes
- };
- }
-
- return obj;
- };
-
- /**
- * Creates a renderer component of type message
- *
- * @param {Object} id, the ID used by the component tree
- * @param {Object} messageKey, an EL path into the message bundle representing the template to be used
- * @param {Object} messageArgs, the arguements to be merged into the message template
- * @param {Object} classes, (optional) can be used to add classes
- */
- var compileMessage = function (id, messageKey, messageArgs, classes) {
- var obj = treeNode(id, "messagekey", messageKey, classes);
- obj.args = messageArgs;
- return obj;
- };
-
- /**
- * Will return the result of a function wich is run based on a condition.
- *
- * @param {Object} condition, the test condition
- * @param {Object} onTrue, the function to run if the condition passes
- * @param {Object} onFalse, the function to run if the condition fails
- */
- var conditionalNode = function (condition, onTrue, onFalse) {
- var func = condition === null || condition === undefined ? onFalse : onTrue;
-
- return func();
- };
-
- /**
- * Renders the copmonent based on values passed into the options
- *
- * @param {Object} that, the component
- */
- var render = function (that) {
- var selectorMap = [
- {selector: that.options.selectors.listItems, id: "listItems:"},
- {selector: that.options.selectors.link, id: "link"},
- {selector: that.options.selectors.image, id: "image"},
- {selector: that.options.selectors.titleText, id: "titleText"},
- {selector: that.options.selectors.descriptionText, id: "descriptionText"}
- ];
- var generateTree = function () {
- var styles = that.options.styles;
- return fluid.transform(that.options.links, function (object) {
- var title = object.title || "";
- var tree = treeNode("listItems:", "children", [
- treeNode("link", "target", object.target || "", styles.link),
- treeNode("titleText", "value", title, styles.titleText)
- ], styles.listItems);
+ var generateTree = function (model, useDefaultImage) {
+ return {
+ children: fluid.transform(model, function (navListItem) {
+ var itemSubtree = {
+ ID: "listItems:",
+ children: [
+ {
+ ID: "link",
+ target: navListItem.target || ""
+ },
+ {
+ ID: "titleText",
+ value: navListItem.title || ""
+ }
+ ]
+ };
- if (object.description) {
- tree.children.push(treeNode("descriptionText", "value", object.description || "", styles.descriptionText));
+ if (navListItem.description) {
+ itemSubtree.children.push({
+ ID: "descriptionText",
+ value: navListItem.description
+ });
}
- if (object.image || that.options.useDefaultImage) {
- tree.children.push({
+ if (navListItem.image || useDefaultImage) {
+ itemSubtree.children.push({
ID: "image",
- target: object.image,
- decorators: [{
- type: "addClass",
- classes: styles.image
- }]
+ target: navListItem.image
});
}
- return tree;
- });
+ return itemSubtree;
+ })
};
-
- var options = {
- cutpoints: selectorMap,
- messageSource: {
- type: "data",
- messages: that.options.messageBundle
- }
- };
-
- fluid.selfRender(that.locate("listGroup"), generateTree(), options);
-
- };
+ };
/**
- * The styles to be set on the group containing the list of links
- *
- * @param {Object} that, the component
- */
- var styleGroup = function (that) {
- that.locate("listGroup").addClass(that.options.styles.listGroup);
- };
-
- /**
* The general setup function that calls the functions that need to be run on init
*
* @param {Object} that, the component
*/
var setup = function (that) {
- render(that);
- styleGroup(that);
- that.locate("gridToggle").click(that.toggleGrid);
+ that.render = fluid.engage.renderUtils.createRendererFunction(that.container, that.options.selectors, {
+ repeatingSelectors: ["listItems"],
+ selectorsToIgnore: ["listGroup", "linkContainer", "gridToggle"]
+ });
+
+ that.refreshView();
+ that.locate("gridToggle").click(that.toggleLayout);
+ that.options.defaultToGrid ? that.gridLayout() : that.listLayout();
};
+ var styleAsGrid = function (listGroup, linkContainer, link, styles) {
+ listGroup.addClass(styles.grid).removeClass(styles.list);
+ linkContainer.addClass(styles.gridTable);
+ link.addClass(styles.gridCell);
+ };
+
+ var styleAsList = function (listGroup, linkContainer, link, styles) {
+ listGroup.addClass(styles.list).removeClass(styles.grid);
+ linkContainer.removeClass(styles.gridTable);
+ link.removeClass(styles.gridCell);
+ };
+
/**
* The creator function
*
@@ -147,15 +89,27 @@
*/
fluid.navigationList = function (container, options) {
var that = fluid.initView("fluid.navigationList", container, options);
+ that.model = that.options.model;
+ that.isGrid = that.options.defaultToGrid;
- that.toggleGrid = function () {
- that.locate("listGroup").toggleClass(that.options.styles.grid);
- that.locate("linkContainer").toggleClass(that.options.styles.gridLinkContainer);
- that.locate("link").toggleClass(that.options.styles.gridLink);
- that.locate("titleText").toggle();
- that.locate("descriptionText").toggle();
+ that.toggleLayout = function () {
+ that.isGrid ? that.listLayout() : that.gridLayout();
};
+ that.gridLayout = function () {
+ styleAsGrid(that.locate("listGroup"), that.locate("linkContainer"), that.locate("link"), that.options.styles);
+ that.isGrid = true;
+ };
+
+ that.listLayout = function () {
+ styleAsList(that.locate("listGroup"), that.locate("linkContainer"), that.locate("link"), that.options.styles);
+ that.isGrid = false;
+ };
+
+ that.refreshView = function () {
+ that.render(generateTree(that.model, that.options.useDefaultImage));
+ };
+
setup(that);
return that;
@@ -166,7 +120,7 @@
*/
fluid.defaults("fluid.navigationList", {
selectors: {
- listGroup: ".flc-nagivationList-listGroup",
+ listGroup: ".flc-navigationList-listGroup",
listItems: ".flc-navigationList-items",
linkContainer: ".flc-navigationList-linkContainer",
link: ".flc-navigationList-link",
@@ -177,35 +131,30 @@
},
styles: {
- listGroup: "fl-list-menu fl-list-thumbnails fl-thumbnails-expanded",
- listItems: null,
- linkContainer: "",
- link: null,
- image: "fl-icon",
- titleText: null,
- descriptionText: "fl-link-summary",
- category: null,
-
- grid: "fl-grid",
- gridLinkContainer: "fl-table",
- gridLink: "fl-table-cell"
+ grid: "fl-thumbnails-expanded fl-grid",
+ gridTable: "fl-table",
+ gridCell: "fl-table-cell",
+ list: "fl-list"
},
+ defaultToGrid: false,
+
strings: {},
events: {},
useDefaultImage: false,
- links: [
- {
- target: "",
- image: "",
- title: "",
- description: null
- }
- ]
- }
- );
+ defaultToGridLayout: false,
+
+ model: [
+ {
+ target: "",
+ image: "",
+ title: "",
+ description: null
+ }
+ ]
+ });
-})(jQuery);
\ No newline at end of file
+})(jQuery);
Index: shared/css/engage-mobile.css
===================================================================
--- shared/css/engage-mobile.css (revision 9148)
+++ shared/css/engage-mobile.css (working copy)
@@ -1,3 +1,7 @@
+.fl-theme-iphone {
+ background: rgb(255,255,255);
+}
+
.fl-list-thumbnails.fl-grid li {
overflow: hidden;
}
Index: tests/component-tests/browse/html/Browse-test.html
===================================================================
--- tests/component-tests/browse/html/Browse-test.html (revision 9148)
+++ tests/component-tests/browse/html/Browse-test.html (working copy)
@@ -55,7 +55,7 @@
-
+
-
![]()
Index: tests/component-tests/browse/js/BrowseTests.js
===================================================================
--- tests/component-tests/browse/js/BrowseTests.js (revision 9148)
+++ tests/component-tests/browse/js/BrowseTests.js (working copy)
@@ -31,7 +31,7 @@
}
jqUnit.assertEquals("Correct Title text", component.title, $(selectors.title).text());
- jqUnit.assertEquals("Correct Number of NavigationLists Rendered", component.model.categories.length, $(".flc-nagivationList-listGroup").length);
+ jqUnit.assertEquals("Correct Number of NavigationLists Rendered", component.model.categories.length, $(".flc-navigationList-listGroup").length);
};
var browseTests = function () {
Index: tests/component-tests/navigationList/html/NavigationList-test.html
===================================================================
--- tests/component-tests/navigationList/html/NavigationList-test.html (revision 9148)
+++ tests/component-tests/navigationList/html/NavigationList-test.html (working copy)
@@ -34,7 +34,7 @@
-
-
-
-
-