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

js/manifest.js

@@ -1,7 +1,7 @@
 var myManifest = {
     Debug: (window.location.port !== ""),
     Name: "Il Lievitario",
-    Version: "2.9.3.2",
+    Version: "2.9.3.5",
     Author: "Denis Ironi",
     Settings: {
         DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),

js/modules/settings/settings.js

@@ -47,8 +47,8 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                            Profile.data.dataSpacc.tipopm === "")
                         {
                             self.$el.find('#titlePopup').html("Campi obbligatori");
-                            this.$el.find('#messaggio').html("<center><h1 style='color: red;'>ATTENZIONE</h1> devono essere settate tutte i campi</center>");                            
+                            self.$el.find('#messaggio').html("<center><h1 style='color: red;'>ATTENZIONE</h1> devono essere settate tutte i campi</center>");                            
-                            this.$el.find('#popupDialog').popup("open");
+                            self.$el.find('#popupDialog').popup("open");
                             self._flagSave = false;
                             return;
                         }
@@ -56,8 +56,8 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                         if(Profile.data.dataSpacc.privacy==="0")
                         {
                             self.$el.find('#titlePopup').html("Informativa privacy");
-                            this.$el.find('#messaggio').html("<center><h1 style='color: red;'>ATTENZIONE</h1> per proseguire è obbligatorio accettare l'informativa privacy</center>");
+                            self.$el.find('#messaggio').html("<center><h1 style='color: red;'>ATTENZIONE</h1> per proseguire è obbligatorio accettare l'informativa privacy</center>");
-                            this.$el.find('#popupDialog').popup("open");
+                            self.$el.find('#popupDialog').popup("open");
                             self._flagSave = false;
                             return;
                         }
@@ -82,7 +82,16 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                             }
                         });
                     }
-                }
+                    else
+                    {
+                        Profile.updateProfile(function(){
+                            self._flagSave = false;       
+                            self.$el.find('#titlePopup').html("Salvataggio");                             
+                            self.$el.find('#messaggio').html("Impostazioni salvate con successo");
+                            self.$el.find('#popupDialog').popup("open");
+                        });
+                    }
+                }                
                 else
                 {
                     Profile.updateProfile(function(){

js/modules/sync/sync.js

@@ -21,13 +21,8 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/sync/syncViewTemplate.
                     "click #backBtn": "backBtn",
                     "click #fblogin": "fbLogin",
                     "click #gpluslogin": "gplusLogin",
-                    "click #resetBtn": "resetBtn"
+                    "click #fblogout": "fbLogout",
-                },
+                    "click #gpluslogout": "gplusLogout"
-                resetBtn: function (e) {
-                    e.preventDefault();
-                    Profile.resetProfile();
-                    this.updateLoginBtn();
-                    //Backbone.history.loadUrl();
                 },
                 backBtn: function (e) {
                     e.preventDefault();
@@ -45,6 +40,26 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/sync/syncViewTemplate.
 
                     hello('google').login();
                 },
+                fbLogout: function (e) {
+                    var self = this;
+                    e.preventDefault();
+
+                    hello('facebook').logout().then(function() {
+                        Profile.resetProfile();
+                        self.updateLoginBtn();
+                    });
+                    
+                },
+                gplusLogout: function (e) {
+                    var self = this;
+                    e.preventDefault();
+
+                    hello('google').logout().
+                    then(function() {
+                        Profile.resetProfile();
+                        self.updateLoginBtn();
+                    });                    
+                },
                 updateLoginBtn: function ()
                 {
                     if (Profile.isConnected()) {

js/modules/sync/syncViewTemplate.html

@@ -11,6 +11,5 @@
             <a href="#" data-rel="back" class="ui-btn ui-btn-b ui-corner-all ui-shadow ui-btn-a ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>
             <iframe id="urlLogin" src="" width="497" height="298" seamless=""></iframe>
         </div>
-        <a id="resetBtn" href="" class="ui-btn ui-corner-all ui-shadow">Reset Account</a>
     </div>
 </div>