hexstudy/IlLievitario-App
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://msi/svn/firstRepo/WebClient/branches/NewRelease@49 0f545695-f87b-41b6-9a03-7f16563b5454

Browse Source
This commit is contained in:
hexstudy
2016-01-15 17:04:16 +00:00
parent 247cac972c
commit 1cd4cb737e
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/jqm-config.js
+2 -2
View File
@@ -11,8 +11,8 @@ define(['jquery'], function ($) {
$.mobile.buttonMarkup.hoverDelay = 0; $.mobile.buttonMarkup.hoverDelay = 0;
// Remove page from DOM when it's being replaced // Remove page from DOM when it's being replaced
$(document).on("pagecontainerhide", function (event, ui) { $(document).on("pagecontainerhide", function (event, ui) {
ui.prevPage.remove(); //ui.prevPage.remove();
//$("div[data-role='page'][stay-in-page='false']:not(.ui-page-active)").remove(); $("div[data-role='page'][stay-in-page='false']:not(.ui-page-active)").remove();
}); });
}); });
}); });
js/model/categoryItem/categoryItemCollection.js
+1 -1
View File
@@ -12,7 +12,7 @@ var CategoryItems = CachedCollection.extend({
model:Category, model:Category,
url: function() { url: function() {
return myManifest.Settings.DefaultURL + "/api/categoryitems/" + this.categoryId; return myManifest.Settings.DefaultURL + "/api/ricette/" + this.categoryId;
} }
}); });
js/model/categoryItem/foundItemCollection.js
+1 -1
View File
@@ -28,7 +28,7 @@ define(['app', 'jquery', 'underscore', 'backbone', 'model/categoryItem/searchIte
}, },
url: function() { url: function() {
var u = myManifest.Settings.DefaultURL + "/api/categoryitems/search/" + var u = myManifest.Settings.DefaultURL + "/api/ricette/search/" +
this.numItems + this.numItems +
"/" + this.indexItems + "/" + this.indexItems +
"/" + this.dataFilter.categoryId + "/" + this.dataFilter.categoryId +
js/modules/category/categoryItemTemplate.html
+5 -1
View File
@@ -3,7 +3,11 @@
<%} else { for (var i = 0; i < data.length; i++) { %> <%} else { for (var i = 0; i < data.length; i++) { %>
<% var item = data[i]; %> <% var item = data[i]; %>
<li><a href="#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r"> <li><a href="#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r">
<!--<img src="Resources\img\ricettaND_80.png">--> <% if(item.firstImage === ""){ %>
<img src='Resources\img\ricettaND_80.png'>
<%}else{%>
<img src='<%=myManifest.Settings.DefaultURL%>/api/photo/thumbnail/<%=item.firstImage%>'>
<%}%>
<div class='ricettaTitolo'><%= unescape(item.titolo) %></div> <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
<div class='ricettaAutore'><%= unescape(item.autore) %></div> <div class='ricettaAutore'><%= unescape(item.autore) %></div>
<br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div> <br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div>
js/router.js
+3 -7
View File
@@ -1,7 +1,7 @@
define(['jquery', 'underscore', 'backbone', define(['jquery', 'underscore', 'backbone',
'modules/home/home', 'modules/faq/faq', 'modules/index/index', 'modules/category/category', 'modules/item/item', 'modules/home/home', 'modules/faq/faq', 'modules/index/index', 'modules/category/category', 'modules/item/item',
'modules/about/about', 'modules/search/search', 'modules/search/found', 'modules/more/more', 'modules/note/note', 'modules/about/about', 'modules/search/search', 'modules/search/found', 'modules/more/more', 'modules/note/note',
'modules/sync/sync', 'modules/converter/converter', 'modules/donation/donation', 'modules/settings/settings', 'modules/sync/sync', 'modules/donation/donation','modules/settings/settings',
'modules/debug/debug','modules/maps/maps', 'modules/debug/debug','modules/maps/maps',
'model/note/noteCollection', 'model/category/categoryCollection', 'model/categoryItem/categoryItemCollection', 'model/note/noteCollection', 'model/category/categoryCollection', 'model/categoryItem/categoryItemCollection',
'model/item/itemCollection', 'model/item/ingredientiCollection', 'model/categoryItem/foundItemCollection', 'model/item/itemCollection', 'model/item/ingredientiCollection', 'model/categoryItem/foundItemCollection',
@@ -10,7 +10,7 @@ define(['jquery', 'underscore', 'backbone',
function ($, _, Backbone, function ($, _, Backbone,
HomeView, FaqView, IndexView, CategoryView, ItemView, HomeView, FaqView, IndexView, CategoryView, ItemView,
AboutView, SearchView, FoundView, MoreView, NoteView, AboutView, SearchView, FoundView, MoreView, NoteView,
SyncView, ConverterView, DonationView, SettingsView, SyncView, DonationView, SettingsView,
DebugView, MapsView, DebugView, MapsView,
NoteCollection, CategoryCollection, CategoryItemCollection, NoteCollection, CategoryCollection, CategoryItemCollection,
ItemCollection, IngredientiCollection, FoundItemCollection, ItemCollection, IngredientiCollection, FoundItemCollection,
@@ -149,11 +149,7 @@ define(['jquery', 'underscore', 'backbone',
//indexView.render(); //indexView.render();
itemView.bind('renderCompleted:Item', this.changePage, this); itemView.bind('renderCompleted:Item', this.changePage, this);
}, },
showConverter: function () {
var converterView = new ConverterView();
converterView.render();
this.changePage(converterView);
},
showMore: function () { showMore: function () {
var moreView = new MoreView(); var moreView = new MoreView();
moreView.render(); moreView.render();