Bugfixes, cleanup assets, added FirefoxOS manifest

zhukov · Feb 1, 2014 · ceee76d · ceee76d
1 parent 593b9e7
commit ceee76d
Show file tree

Hide file tree

Showing 34 changed files with 44 additions and 12 deletions.
diff --git a/app/img/icons/Arrow_1x.png b/app/img/icons/Arrow_1x.png
diff --git a/app/img/icons/Arrow_2x.png b/app/img/icons/Arrow_2x.png
diff --git a/app/img/icons/Attach_1x.png b/app/img/icons/Attach_1x.png
diff --git a/app/img/icons/Attach_2x.png b/app/img/icons/Attach_2x.png
diff --git a/app/img/icons/Attach_pressed_1x.png b/app/img/icons/Attach_pressed_1x.png
diff --git a/app/img/icons/Attach_pressed_2x.png b/app/img/icons/Attach_pressed_2x.png
diff --git a/app/img/icons/DocBlue_1x.png b/app/img/icons/DocBlue_1x.png
diff --git a/app/img/icons/DocBlue_2x.png b/app/img/icons/DocBlue_2x.png
diff --git a/app/img/icons/DocGrey_1x.png b/app/img/icons/DocGrey_1x.png
diff --git a/app/img/icons/DocGrey_2x.png b/app/img/icons/DocGrey_2x.png
diff --git a/app/img/icons/Logo_1x.png b/app/img/icons/Logo_1x.png
diff --git a/app/img/icons/Logo_2x.png b/app/img/icons/Logo_2x.png
diff --git a/app/img/icons/NoResults.png b/app/img/icons/NoResults.png
diff --git a/app/img/icons/Search_1x.png b/app/img/icons/Search_1x.png
diff --git a/app/img/icons/Search_2x.png b/app/img/icons/Search_2x.png
diff --git a/app/img/icons/Smile_1x.png b/app/img/icons/Smile_1x.png
diff --git a/app/img/icons/Smile_2x.png b/app/img/icons/Smile_2x.png
diff --git a/app/img/icons/Smile_pressed_1x.png b/app/img/icons/Smile_pressed_1x.png
diff --git a/app/img/icons/Smile_pressed_2x.png b/app/img/icons/Smile_pressed_2x.png
diff --git a/app/img/icons/icon120.png b/app/img/icons/icon120.png
diff --git a/app/img/icons/icon128.png b/app/img/icons/icon128.png
diff --git a/app/img/icons/icon16.png b/app/img/icons/icon16.png
diff --git a/app/img/icons/icon32.png b/app/img/icons/icon32.png
diff --git a/app/img/icons/icon60.png b/app/img/icons/icon60.png
diff --git a/app/img/icons/icon64.png b/app/img/icons/icon64.png
diff --git a/app/img/icons/icon90.png b/app/img/icons/icon90.png
diff --git a/app/img/screenshot1.png b/app/img/screenshot1.png
diff --git a/app/img/screenshot1_tile.png b/app/img/screenshot1_tile.png
diff --git a/app/img/screenshot2.png b/app/img/screenshot2.png
diff --git a/app/js/app.js b/app/js/app.js
@@ -48,8 +48,8 @@ config(['$locationProvider', '$routeProvider', '$compileProvider', function($loc
   $.emojiarea.icons = icons;
   $.emojiarea.reverseIcons = reverseIcons;
 
-  $compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|ftp|file|blob|filesystem|chrome-extension):|data:image\//);
-  $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|file|mailto|blob|filesystem|chrome-extension):|data:image\//);
+  $compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|ftp|file|blob|filesystem|chrome-extension|app):|data:image\//);
+  $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|file|mailto|blob|filesystem|chrome-extension|app):|data:image\//);
 
 
   // $locationProvider.html5Mode(true);

diff --git a/app/js/lib/mtproto.js b/app/js/lib/mtproto.js
@@ -1500,7 +1500,7 @@ factory('MtpSha1Service', function ($q) {
   }
 }).
 
-factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerator, MtpSecureRandom, MtpSha1Service, MtpAesService, AppConfigManager, $http, $q, $timeout) {
+factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerator, MtpSecureRandom, MtpSha1Service, MtpAesService, AppConfigManager, $http, $q, $timeout, $interval) {
 
   var updatesProcessor;
 
@@ -1517,7 +1517,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
     //   (function () {
     //     console.log('update server salt');
     //     self.serverSalt = [0,0,0,0,0,0,0,0];
-    //     setTimeout(arguments.callee, nextRandomInt(2000, 12345));
+    //     $timeout(arguments.callee, nextRandomInt(2000, 12345));
     //   })();
     // }
 
@@ -1536,7 +1536,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
 
     this.pendingTimeouts = [];
 
-    this.longPollInt = setInterval(this.checkLongPoll.bind(this), 10000);
+    this.longPollInt = $interval(this.checkLongPoll.bind(this), 10000);
     this.checkLongPoll();
   };
 
@@ -1689,7 +1689,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
     this.wrapMtpCall('http_wait', {max_delay: 0, wait_after: 0, max_wait: maxWait}, {noResponse: true}).
       then((function () {
         delete this.longPollPending;
-        setTimeout(this.checkLongPoll.bind(this), 0);
+        $timeout(this.checkLongPoll.bind(this), 0);
       }).bind(this));
   };
 
@@ -1981,7 +1981,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
 
     clearTimeout(this.nextReqTO);
 
-    this.nextReqTO = setTimeout(this.performSheduledRequest.bind(this), delay || 0);
+    this.nextReqTO = $timeout(this.performSheduledRequest.bind(this), delay || 0);
     this.nextReq = nextReq;
   };
 
@@ -2274,7 +2274,7 @@ factory('MtpApiManager', function (AppConfigManager, MtpAuthorizer, MtpNetworker
       return (cachedNetworker = networker).wrapApiCall(method, params, options).then(
         function (result) {
           deferred.resolve(result);
-          // setTimeout(function () {
+          // $timeout(function () {
           //   deferred.resolve(result);
           // }, 1000);
         },

diff --git a/app/manifest.json b/app/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Telegram UNOFFICIAL",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "short_name": "Webogram",
   "manifest_version": 2,
   "app": {
@@ -13,6 +13,12 @@
     {"fileSystem": ["write"]},
     "storage"
   ],
-  "icons": { "16": "img/icons/icon16.png",
-            "128": "img/icons/icon128.png" }
+  "icons": {
+    "16": "img/icons/icon16.png",
+    "32": "img/icons/icon32.png",
+    "60": "img/icons/icon60.png",
+    "64": "img/icons/icon64.png",
+    "90": "img/icons/icon90.png",
+    "128": "img/icons/icon128.png"
+  }
 }
diff --git a/app/manifest.webapp b/app/manifest.webapp
@@ -0,0 +1,27 @@
+{
+  "name": "Webogram",
+  "description": "Webogram – UNOFFICIAL Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
+  "version": "0.0.12",
+  "launch_path": "/index.html",
+  "developer": {
+    "name": "Igor Zhukov",
+    "url": "https://github.com/zhukov"
+  },
+  "installs_allowed_from": [
+    "*"
+  ],
+  "permissions": {
+    "desktop-notification": {
+      "description": "To show new message notifications etc"
+    }
+  },
+  "icons": {
+    "16": "img/icons/icon16.png",
+    "32": "img/icons/icon32.png",
+    "60": "img/icons/icon60.png",
+    "64": "img/icons/icon64.png",
+    "90": "img/icons/icon90.png",
+    "120": "img/icons/icon120.png",
+    "128": "img/icons/icon128.png"
+  }
+}
diff --git a/app/partials/welcome.html b/app/partials/welcome.html
@@ -12,7 +12,6 @@
       <p>Visit <a target="_blank" href="https://telegram.org/">telegram.org</a> to learn more.</p>
     </div>
     <a href="#/login" class="btn btn-tg btn-block">Start Messaging</a>
-    </form>
   </div>
 
 </div>