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

git-svn-id: https://msi/svn/firstRepo/Management/trunk@66 0f545695-f87b-41b6-9a03-7f16563b5454

Browse Source
This commit is contained in:
hexstudy
2016-02-14 21:46:23 +00:00
parent d45146fc23
commit 94bcb4e1e2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.build_prod.js
+1
View File
@@ -21,6 +21,7 @@
baseUrl: "js", baseUrl: "js",
//- this is the directory that the new files will be. it will be created if it doesn't exist //- this is the directory that the new files will be. it will be created if it doesn't exist
dir: "./app-build_prod", dir: "./app-build_prod",
removeCombined: true,
paths: { paths: {
jquery: 'empty:', jquery: 'empty:',
underscore: 'libs/underscore-min', underscore: 'libs/underscore-min',
js/manifest.js
+2 -4
View File
@@ -1,10 +1,8 @@
var myManifest = { var myManifest = {
Debug: (window.location.port !== ""), Debug: (window.location.port !== ""),
Name: "Il Management", Name: "Il Management",
Version: "0.3.0.0", Version: "0.3.0.1",
<<<<<<< .mine Version: "0.2.1.0", Author: "Denis Ironi",
======= Version: "0.3.0.0",
>>>>>>> .theirs Author: "Denis Ironi",
Settings: { Settings: {
DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"), DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),
JQueryVersion: "1.11.1", JQueryVersion: "1.11.1",
js/modules/editricetta/editricetta.js
+5 -1
View File
@@ -1,3 +1,4 @@
define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricettaViewTemplate.html', 'modules/base/baseView', define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricettaViewTemplate.html', 'modules/base/baseView',
'controls/window/window', 'modules/addingr/addingr', 'jqx'], 'controls/window/window', 'modules/addingr/addingr', 'jqx'],
function($, _, Backbone, editricettaViewTemplate, BaseView, Window, AddIngrDlg) { function($, _, Backbone, editricettaViewTemplate, BaseView, Window, AddIngrDlg) {
@@ -384,7 +385,10 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricett
self.save(function(msg){ self.save(function(msg){
//alert(msg.message); //alert(msg.message);
if (msg.result) if (msg.result)
{ {
if($("#ricettaID").val() == "")
$("#ricettaID").val(msg.ricettaID);
var profileID = "10203753344023406"; var profileID = "10203753344023406";
if($("#autorePhoto").val() != 0) if($("#autorePhoto").val() != 0)