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@48 0f545695-f87b-41b6-9a03-7f16563b5454

Browse Source
This commit is contained in:
hexstudy
2016-01-14 14:03:23 +00:00
parent 57a9ecfb84
commit 247cac972c
7 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/common.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
js/libs/hello.min.js
Vendored
+4 -3
View File
File diff suppressed because one or more lines are too long
js/libs/ua-parser.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
js/manifest.js
+1 -1
View File
@@ -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
+13 -4
View File
@@ -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>");
this.$el.find('#popupDialog').popup("open");
self.$el.find('#messaggio').html("<center><h1 style='color: red;'>ATTENZIONE</h1> devono essere settate tutte i campi</center>");
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>");
this.$el.find('#popupDialog').popup("open");
self.$el.find('#messaggio').html("<center><h1 style='color: red;'>ATTENZIONE</h1> per proseguire è obbligatorio accettare l'informativa privacy</center>");
self.$el.find('#popupDialog').popup("open");
self._flagSave = false;
return;
}
@@ -82,6 +82,15 @@ 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
{
js/modules/sync/sync.js
+22 -7
View File
@@ -21,13 +21,8 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/sync/syncViewTemplate.
"click #backBtn": "backBtn",
"click #fblogin": "fbLogin",
"click #gpluslogin": "gplusLogin",
"click #resetBtn": "resetBtn"
},
resetBtn: function (e) {
e.preventDefault();
Profile.resetProfile();
this.updateLoginBtn();
//Backbone.history.loadUrl();
"click #fblogout": "fbLogout",
"click #gpluslogout": "gplusLogout"
},
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
-1
View File
@@ -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>