Changeset 12473 for extensions/piwigo_mobile/ios/www/js

Timestamp:

Oct 17, 2011, 8:27:39 PM (13 years ago)

Author:

patdenice

Message:

Update languages

File:

• extensions/piwigo_mobile/ios/www/js/app.js (modified) (11 diffs)

extensions/piwigo_mobile/ios/www/js/app.js

@@ -4 +4 @@
 var backPage;
 var conf = new Object;
-var selectedCat = '0';
-var logged = false;
+var selectedCat = null;
 var lastImageURL;
 var pwg_token;
@@ -14 +13 @@
 var OSCode = 'IPH';
 
-// Wait for PhoneGap to connect with the device
-document.addEventListener("deviceready",onDeviceReady,false);
-
-// PhoneGap is ready to be used!
-function onDeviceReady() {
-
-  pictureSource=navigator.camera.PictureSourceType;
-  destinationType=navigator.camera.DestinationType;
-
-  var reg = /(iphone|ipad|ipod)/i;
-  if (!reg.test(device.platform)) OSCode = 'AND';
-
-  if (!checkDeviceConnection ()) {
-    message("Error", "Please check your internet connection", '#config');
-  }
-}
-
-
 $(document).ready( function () {
+
+  $(document).bind("deviceready", function() {
+  
+    pictureSource=navigator.camera.PictureSourceType;
+    destinationType=navigator.camera.DestinationType;
+
+    var reg = /(iphone|ipad|ipod)/i;
+    if (!reg.test(device.platform)) OSCode = 'AND';
+
+    if (!checkDeviceConnection ()) {
+      message("Error", "Please check your internet connection", '#config');
+    }
+
+    $(document).bind("resume", pwgLogin);
+  });
 
   // Init
   loadSettings();
-  language = navigator.language.split("-");
-  loadLanguage(language[0]);
+  loadLanguage(navigator.language);
 
   // Page events
@@ -118 +113 @@
     },
     error: function() {
-      loadLanguage('en');
+      loadLanguage('en-us');
     }
   });
@@ -169 +164 @@
 
   // Log only if connection parameters have changed
-  if (conf.url != old_conf.url || conf.username != old_conf.username || conf.password != old_conf.password || !logged) {
-    selectedCat = '0';
+  if (conf.url != old_conf.url || conf.username != old_conf.username || conf.password != old_conf.password || selectedCat == null) {
+    selectedCat = null;
     pwgLogin();
   } else {
@@ -193 +188 @@
 
 
-function pwgLogin() {
+function pwgLogin(callback) {
 
   $.mobile.loadingMessage = l10n("Loging");
@@ -208 +203 @@
     dataType: "json",
     success: function(data) {
+      $.mobile.hidePageLoadingMsg();
       if (data.stat == "ok") {
-        logged = true;
-        $.mobile.changePage('#album');
         getPwgToken();
-        getCategories();
+        if (selectedCat == null) {
+          selectedCat = '0';
+          getCategories();
+          $.mobile.changePage('#album');
+        }
       } else {
-        $.mobile.hidePageLoadingMsg();
-        logged = false;
         $.mobile.changePage('#config', { transition: "none" });
         message("Error", data.message, '#config');
@@ -222 +218 @@
     error: function(data) {
       $.mobile.hidePageLoadingMsg();
-      logged = false;
       $.mobile.changePage('#config', { transition: "none" });
       if (!checkDeviceConnection ()) {
@@ -327 +322 @@
   }
 
+  $.mobile.loadingMessage = l10n("Album creation");
+  $.mobile.showPageLoadingMsg();
+
   $.ajax({
     type: "POST",
@@ -338 +336 @@
     async: false,
     success: function(data) {
+      $.mobile.hidePageLoadingMsg();
       if (data.stat == "ok") {
         selectedCat = data['result']['id'];
@@ -347 +346 @@
     },
     error: function(data) {
+      $.mobile.hidePageLoadingMsg();
       message("Error", "An error has occured", '#album', data.status, data.statusText);
     }
@@ -487 +487 @@
 function removeAllPhotos() {
 
+  if (queue.length == 0) return;
+
   for (i in queue) {
     removePhoto(queue[i][0]);