Merge pull request #7420 from dscravag/nightly2

Nightly 2013-01-09
mozilla-b2g · Jan 9, 2013 · f8e15c1 · f8e15c1
2 parents 7c348f4 + a069d55
commit f8e15c1
Show file tree

Hide file tree

Showing 190 changed files with 4,670 additions and 1,711 deletions.
diff --git a/Makefile b/Makefile
@@ -81,6 +81,7 @@ GAIA_LOCALES_PATH?=locales
 LOCALES_FILE?=shared/resources/languages.json
 GAIA_LOCALE_SRCDIRS=shared $(GAIA_APP_SRCDIRS)
 GAIA_DEFAULT_LOCALE?=en-US
+GAIA_INLINE_LOCALES?=1
 
 ###############################################################################
 # The above rules generate the profile/ folder and all its content.           #
@@ -316,10 +317,12 @@ define run-js-command
 	const HOMESCREEN = "$(HOMESCREEN)"; const GAIA_PORT = "$(GAIA_PORT)";       \
 	const GAIA_APP_SRCDIRS = "$(GAIA_APP_SRCDIRS)";                             \
 	const GAIA_LOCALES_PATH = "$(GAIA_LOCALES_PATH)";                           \
+	const LOCALES_FILE = "$(LOCALES_FILE)";                                     \
 	const BUILD_APP_NAME = "$(BUILD_APP_NAME)";                                 \
 	const PRODUCTION = "$(PRODUCTION)";                                         \
 	const OFFICIAL = "$(MOZILLA_OFFICIAL)";                                     \
 	const GAIA_DEFAULT_LOCALE = "$(GAIA_DEFAULT_LOCALE)";                       \
+	const GAIA_INLINE_LOCALES = "$(GAIA_INLINE_LOCALES)";                       \
 	const GAIA_ENGINE = "xpcshell";                                             \
 	';                                                                          \
 	$(XULRUNNERSDK) $(XPCSHELLSDK) -e "$$JS_CONSTS" -f build/utils.js "build/$(strip $1).js"

diff --git a/apps/browser/js/browser.js b/apps/browser/js/browser.js
@@ -733,7 +733,8 @@ var Browser = {
           type: 'url',
           url: this.currentTab.url,
           name: this.currentTab.title,
-          icon: place.iconUri
+          icon: place.iconUri,
+          useAsyncPanZoom: true
         }
       });
     }).bind(this));

diff --git a/apps/browser/manifest.webapp b/apps/browser/manifest.webapp
@@ -10,7 +10,9 @@
   "permissions": {
     "browser":{},
     "systemXHR":{},
-    "settings":{ "access": "readonly" }
+    "settings":{ "access": "readonly" },
+    "geolocation" : {},
+    "desktop-notification" : {}
   },
   "locales": {
     "ar": {

diff --git a/apps/calendar/caldav_worker.js b/apps/calendar/caldav_worker.js
@@ -3,6 +3,7 @@
  'ext/ical',
  'ext/caldav',
  'ext/uuid',
+ 'service/ical_recur_expansion',
  'service/caldav'].forEach(function(script) {
    // ?time= is for cache busting in development...
    // there have been cases where nightly would not
@@ -11,7 +12,7 @@
 });
 
 var thread = new Calendar.Thread(this);
-this.console = new thread.console();
+this.console = new thread.console('caldav worker');
 
 thread.addRole('caldav');
 

diff --git a/apps/calendar/index.html b/apps/calendar/index.html
@@ -95,7 +95,9 @@
 </head>
 
 <body role="application" class="loading">
-
+<section id="errors" role="status">
+  <p class="errors"></p>
+</section>
 <nav class="skin-organic" id="settings" role="region">
 
   <header>

diff --git a/apps/calendar/js/app.js b/apps/calendar/js/app.js
@@ -1,5 +1,82 @@
 Calendar.App = (function(window) {
 
+  function PendingManager() {
+    this.objects = [];
+    this.pending = 0;
+
+    this.onstart = this.onstart.bind(this);
+    this.onend = this.onend.bind(this);
+  }
+
+  PendingManager.prototype = {
+
+    onpending: function() {},
+    oncomplete: function() {},
+
+    register: function(object) {
+      object.on(object.startEvent, this.onstart);
+      object.on(object.completeEvent, this.onend);
+
+      var wasPending = this.isPending();
+
+      this.objects.push(object);
+
+      if (object.pending) {
+        this.pending++;
+
+        if (!wasPending) {
+          this.onpending();
+        }
+      }
+    },
+
+    /**
+     * Unregister an object.
+     * Note it is intended that objects that
+     * are unregistered are never in a state
+     * where we are waiting for their pending
+     * status to complete. If an incomplete
+     * object is removed it will break .pending.
+     */
+    unregister: function(object) {
+      var idx = this.objects.indexOf(object);
+
+      if (idx !== -1) {
+        var object = this.objects[idx];
+        this.objects.splice(idx, 1);
+        return true;
+      }
+      return false;
+    },
+
+    isPending: function() {
+      var len = this.objects.length;
+      var i = 0;
+
+      for (; i < len; i++) {
+        if (this.objects[i].pending)
+          return true;
+      }
+
+      return false;
+    },
+
+    onstart: function() {
+      if (!this.pending) {
+        this.onpending();
+      }
+
+      this.pending++;
+    },
+
+    onend: function() {
+      this.pending--;
+      if (!this.pending) {
+        this.oncomplete();
+      }
+    }
+  };
+
   /**
    * Focal point for state management
    * within calendar application.
@@ -8,13 +85,17 @@ Calendar.App = (function(window) {
    * location to reference database.
    */
   var App = {
+    PendingManager: PendingManager,
+
     //XXX: always assumes that app is never lazy loaded
     startingURL: window.location.href,
 
     _location: window.location,
 
     _mozTimeRefreshTimeout: 3000,
 
+    pendingClass: 'pending-operation',
+
     // Dependency map for loading
     cssBase: '/style/',
     jsBase: '/js/',
@@ -23,6 +104,10 @@ Calendar.App = (function(window) {
       Style: {},
       Templates: {},
       Utils: {},
+      Controllers: {
+        RecurringEvents: []
+      },
+
       Views: {
         AdvancedSettings: [
           {type: 'Templates', name: 'Account'}
@@ -79,7 +164,8 @@ Calendar.App = (function(window) {
           {type: 'Templates', name: 'Week'},
           {type: 'Utils', name: 'OrderedMap'},
           {type: 'Views', name: 'DayBased'}
-        ]
+        ],
+        Errors: []
       }
     },
 
@@ -95,11 +181,44 @@ Calendar.App = (function(window) {
       this._providers = Object.create(null);
       this._views = Object.create(null);
       this._routeViewFn = Object.create(null);
+      this._pendingManger = new PendingManager();
+
+      var self = this;
+      this._pendingManger.oncomplete = function onpending() {
+        document.body.classList.remove(self.pendingClass);
+      };
+
+      this._pendingManger.onpending = function oncomplete() {
+        document.body.classList.add(self.pendingClass);
+      };
 
       this.timeController = new Calendar.Controllers.Time(this);
       this.syncController = new Calendar.Controllers.Sync(this);
       this.serviceController = new Calendar.Controllers.Service(this);
       this.alarmController = new Calendar.Controllers.Alarm(this);
+
+      // observe sync events
+      this.observePendingObject(this.syncController);
+    },
+
+    /**
+     * Adds observers to objects capable of being pending.
+     *
+     * Object must emit some kind of start/complete events
+     * and have the following properties:
+     *
+     *  - startEvent (used to register an observer)
+     *  - endEvent ( ditto )
+     *  - pending
+     *
+     * @param {Object} object to observe.
+     */
+    observePendingObject: function(object) {
+      this._pendingManger.register(object);
+    },
+
+    isPending: function() {
+      return this._pendingManger.isPending();
     },
 
     /**
@@ -195,6 +314,18 @@ Calendar.App = (function(window) {
 
       this.timeController.move(new Date());
 
+      // lazy load recurring event expander so as not to impact initial load.
+      this.loadResource('Controllers', 'RecurringEvents', function() {
+        self.recurringEventsController =
+          new Calendar.Controllers.RecurringEvents(self);
+
+        self.observePendingObject(
+          self.recurringEventsController
+        );
+
+        self.recurringEventsController.observe();
+      });
+
       this.view('TimeHeader', function(header) {
           header.render();
       });
@@ -203,6 +334,8 @@ Calendar.App = (function(window) {
         colors.render();
       });
 
+      this.view('Errors');
+
       document.body.classList.remove('loading');
       this._routes();
     },
@@ -366,10 +499,12 @@ Calendar.App = (function(window) {
           this._views[name] = new Calendar.Views[name]({
             app: this
           });
-          cb.call(this, this._views[name]);
+          if (cb) {
+            cb.call(this, this._views[name]);
+          }
         }.bind(this));
 
-      } else {
+      } else if (cb) {
           cb.call(this, this._views[name]);
       }
     },
@@ -384,6 +519,13 @@ Calendar.App = (function(window) {
      */
     store: function(name) {
       return this.db.getStore(name);
+    },
+
+    /**
+     * Returns the offline status.
+     */
+    offline: function() {
+      return (navigator && 'onLine' in navigator) ? !navigator.onLine : true;
     }
   };
 

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
@@ -1,9 +1,21 @@
 (function(window) {
 
+  const NEXT_TICK = 'calendar-next-tick';
+  var nextTickStack = [];
+
   window.Calendar = {
 
     DEBUG: false,
 
+    /**
+     * Very similar to node's nextTick.
+     * Much faster then setTimeout.
+     */
+    nextTick: function(callback) {
+      nextTickStack.push(callback);
+      window.postMessage(NEXT_TICK, '*');
+    },
+
     /**
      * Creates a calendar namespace.
      *
@@ -115,8 +127,20 @@
           return mid;
       }
     }
-
   };
 
+  /**
+   * next tick inspired by http://dbaron.org/log/20100309-faster-timeouts.
+   */
+  window.addEventListener('message', function handleNextTick(event) {
+    if (event.source === window && event.data == NEXT_TICK) {
+      event.stopPropagation();
+      if (nextTickStack.length) {
+        (nextTickStack.shift())();
+      }
+    }
+  });
+
+
 }(this));
 
diff --git a/apps/calendar/js/controllers/alarm.js b/apps/calendar/js/controllers/alarm.js
@@ -17,12 +17,14 @@ Calendar.ns('Controllers').Alarm = (function() {
 
       this._wifiLock = null;
       this.app.syncController.on('syncComplete', function() {
-        if (self._wifiLock !== null)
+        if (self._wifiLock !== null) {
           self._wifiLock.unlock();
+          self._wifiLock = null;
+        }
       });
 
       this._nextPeriodicSync = this.settings.syncAlarm;
-      
+
       if (this._nextPeriodicSync.alarmId === null)
         this._resetSyncAlarm(false);
 
@@ -172,21 +174,25 @@ Calendar.ns('Controllers').Alarm = (function() {
       var start = new Date();
       var end = new Date(start.getTime() + duration);
 
-      // We're resetting the sync alarm after a settings change and times are still in range
+      // We're resetting the sync alarm after a settings
+      // change and times are still in range
       if (!triggered &&
           this._nextPeriodicSync.end > start &&
           this._nextPeriodicSync.start.getTime() + duration > start) {
         start = this._nextPeriodicSync.start;
         end = new Date(start.getTime() + duration);
       }
-
+
-      var request = navigator.mozAlarms.add(end, 'ignoreTimezone', {type: 'sync'});
+      var request = navigator.mozAlarms.add(
+        end, 'ignoreTimezone', {type: 'sync'}
+      );
+
       var self = this;
       request.onsuccess = function(e) {
         self._nextPeriodicSync.alarmId = e.target.result;
         self._nextPeriodicSync.start = start;
         self._nextPeriodicSync.end = end;
-        self.settings.set('syncAlarm', self._nextPeriodicSync)
+        self.settings.set('syncAlarm', self._nextPeriodicSync);
       };
       request.onerror = function(e) {
         debug('Error setting alarm:', e.target.error.name);