diff --git a/js/app.js b/js/app.js index dcd72d7..03c35b0 100644 --- a/js/app.js +++ b/js/app.js @@ -33,10 +33,11 @@ define([ tagModeSwitch.checked = settings.tagMode === "all" ? true : false; - languageSelect.store = new Memory(); - languages.forEach(function (l) { - languageSelect.store.add(l); - languageSelect.setSelected(l, l.value === settings.language); + languageSelect.source = new Memory({data: languages}); + languageSelect.on("query-success", function () { + languages.forEach(function (l) { + languageSelect.setSelected(l, l.value === settings.language); + }); }); // callbacks called when a settings input field is modified @@ -89,12 +90,12 @@ define([ photosReceived = function (json) { // cleanup request requestDone(); - // show the photos in the list by simply setting the list's store - photolist.store = new Memory({data: json.items}); + // show the photos in the list by simply setting the list's source + photolist.source = new Memory({data: json.items}); }; refreshPhotoList = function () { - photolist.store = new Memory(); + photolist.source = new Memory(); getPhotos(settings.tags); }; diff --git a/runnable/part1/index.html b/runnable/part1/index.html index 08ded1c..88361e1 100644 --- a/runnable/part1/index.html +++ b/runnable/part1/index.html @@ -27,14 +27,11 @@
Menu
- + + {"label": "First View", "id": "first" }, {"label": "Second View", "id": "second" }, {"label": "Third View", "id": "third" } - - - - @@ -62,20 +59,7 @@ 3rd view - - - \ No newline at end of file diff --git a/runnable/part1/js/app.js b/runnable/part1/js/app.js index c5f994b..178f8ea 100644 --- a/runnable/part1/js/app.js +++ b/runnable/part1/js/app.js @@ -1,11 +1,10 @@ define([ "delite/register", "delite/theme!delite/themes/{{theme}}/global.css", "deliteful/ViewStack", "deliteful/SidePane", "deliteful/LinearLayout", "deliteful/Button", "deliteful/StarRating", - "deliteful/ProgressBar", "deliteful/Store", "deliteful/list/List", "requirejs-domready/domReady!" + "deliteful/ProgressBar", "deliteful/list/List", "requirejs-domready/domReady!" ], function (register) { register.parse(); document.body.style.display = ""; - list.selectedItem = list.store.get("first"); /* app code will go here */ diff --git a/runnable/part4/js/app.js b/runnable/part4/js/app.js index 0912388..7545a82 100644 --- a/runnable/part4/js/app.js +++ b/runnable/part4/js/app.js @@ -35,12 +35,12 @@ define([ photosReceived = function (json) { // cleanup request requestDone(); - // show the photos in the list by simply setting the list's store - photolist.store = new Memory({data: json.items}); + // show the photos in the list by simply setting the list's source + photolist.source = new Memory({data: json.items}); }; refreshPhotoList = function () { - photolist.store = new Memory(); + photolist.source = new Memory(); getPhotos("bridges,famous"); }; diff --git a/runnable/part5/js/app.js b/runnable/part5/js/app.js index 1ca340a..d1326b3 100644 --- a/runnable/part5/js/app.js +++ b/runnable/part5/js/app.js @@ -40,12 +40,12 @@ define([ photosReceived = function (json) { // cleanup request requestDone(); - // show the photos in the list by simply setting the list's store - photolist.store = new Memory({data: json.items}); + // show the photos in the list by simply setting the list's source + photolist.source = new Memory({data: json.items}); }; refreshPhotoList = function () { - photolist.store = new Memory(); + photolist.source = new Memory(); getPhotos("bridges,famous"); }; diff --git a/runnable/part6/js/app.js b/runnable/part6/js/app.js index 7efbd77..b4da126 100644 --- a/runnable/part6/js/app.js +++ b/runnable/part6/js/app.js @@ -40,12 +40,12 @@ define([ photosReceived = function (json) { // cleanup request requestDone(); - // show the photos in the list by simply setting the list's store - photolist.store = new Memory({data: json.items}); + // show the photos in the list by simply setting the list's source + photolist.source = new Memory({data: json.items}); }; refreshPhotoList = function () { - photolist.store = new Memory(); + photolist.source = new Memory(); getPhotos("bridges,famous"); }; diff --git a/runnable/part7/js/app.js b/runnable/part7/js/app.js index dcd72d7..005d5f7 100644 --- a/runnable/part7/js/app.js +++ b/runnable/part7/js/app.js @@ -33,10 +33,11 @@ define([ tagModeSwitch.checked = settings.tagMode === "all" ? true : false; - languageSelect.store = new Memory(); - languages.forEach(function (l) { - languageSelect.store.add(l); - languageSelect.setSelected(l, l.value === settings.language); + languageSelect.source = new Memory({data: languages}); + languageSelect.on("query-success", function () { + languages.forEach(function (l) { + languageSelect.setSelected(l, l.value === settings.language); + }); }); // callbacks called when a settings input field is modified @@ -89,39 +90,39 @@ define([ photosReceived = function (json) { // cleanup request requestDone(); - // show the photos in the list by simply setting the list's store - photolist.store = new Memory({data: json.items}); + // show the photos in the list by simply setting the list's source + photolist.source = new Memory({data: json.items}); }; refreshPhotoList = function () { - photolist.store = new Memory(); + photolist.source = new Memory(); getPhotos(settings.tags); }; photolist.itemRenderer = register("d-photo-item", [HTMLElement, ItemRenderer], { template: handlebars.compile(""), + "
" + + "
" + + "" + + "
" + + "
" + + "
{{item.title}}
" + + "
{{this.formatDate(this.item.published)}}
" + + "
{{item.author}}
" + + "
" + + "
" + + ""), // Formats a date in ISO 8601 format into a more readable format. formatDate: function (d) { return d && new Intl.DateTimeFormat(settings.language, { - year: "numeric", - month: "long", - day: "numeric", - hour: "numeric", - minute: "numeric", - second: "numeric" - }).format(new Date(d)); + year: "numeric", + month: "long", + day: "numeric", + hour: "numeric", + minute: "numeric", + second: "numeric" + }).format(new Date(d)); } }); diff --git a/runnable/part8-1/js/app.js b/runnable/part8-1/js/app.js index dcd72d7..03c35b0 100644 --- a/runnable/part8-1/js/app.js +++ b/runnable/part8-1/js/app.js @@ -33,10 +33,11 @@ define([ tagModeSwitch.checked = settings.tagMode === "all" ? true : false; - languageSelect.store = new Memory(); - languages.forEach(function (l) { - languageSelect.store.add(l); - languageSelect.setSelected(l, l.value === settings.language); + languageSelect.source = new Memory({data: languages}); + languageSelect.on("query-success", function () { + languages.forEach(function (l) { + languageSelect.setSelected(l, l.value === settings.language); + }); }); // callbacks called when a settings input field is modified @@ -89,12 +90,12 @@ define([ photosReceived = function (json) { // cleanup request requestDone(); - // show the photos in the list by simply setting the list's store - photolist.store = new Memory({data: json.items}); + // show the photos in the list by simply setting the list's source + photolist.source = new Memory({data: json.items}); }; refreshPhotoList = function () { - photolist.store = new Memory(); + photolist.source = new Memory(); getPhotos(settings.tags); };