diff --git a/app.build_prod.js b/app.build_prod.js index eb0d95f..9de2acd 100644 --- a/app.build_prod.js +++ b/app.build_prod.js @@ -21,6 +21,7 @@ baseUrl: "js", //- this is the directory that the new files will be. it will be created if it doesn't exist dir: "./app-build_prod", + removeCombined: true, paths: { jquery: 'empty:', underscore: 'libs/underscore-min', diff --git a/js/manifest.js b/js/manifest.js index a8573fb..d2c7189 100644 --- a/js/manifest.js +++ b/js/manifest.js @@ -1,10 +1,8 @@ var myManifest = { Debug: (window.location.port !== ""), Name: "Il Management", - Version: "0.3.0.0", -<<<<<<< .mine Version: "0.2.1.0", -======= Version: "0.3.0.0", ->>>>>>> .theirs Author: "Denis Ironi", + Version: "0.3.0.1", + Author: "Denis Ironi", Settings: { DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"), JQueryVersion: "1.11.1", diff --git a/js/modules/editricetta/editricetta.js b/js/modules/editricetta/editricetta.js index 0aff9ac..8d958e8 100644 --- a/js/modules/editricetta/editricetta.js +++ b/js/modules/editricetta/editricetta.js @@ -1,3 +1,4 @@ + define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricettaViewTemplate.html', 'modules/base/baseView', 'controls/window/window', 'modules/addingr/addingr', 'jqx'], function($, _, Backbone, editricettaViewTemplate, BaseView, Window, AddIngrDlg) { @@ -384,7 +385,10 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricett self.save(function(msg){ //alert(msg.message); if (msg.result) - { + { + if($("#ricettaID").val() == "") + $("#ricettaID").val(msg.ricettaID); + var profileID = "10203753344023406"; if($("#autorePhoto").val() != 0)