wrapper for native requestPermission

azproduction · Feb 24, 2014 · 2d1cf58 · 2d1cf58
1 parent 7445ec4
commit 2d1cf58
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 24 deletions.
diff --git a/jquery.notification.js b/jquery.notification.js
@@ -80,32 +80,40 @@ var W3CNotification = (function () {
             return;
         }
 
+        if (webkitNotifications.requestPermission.length) {
+            webkitNotifications.requestPermission(function () {
+                Notification.permissionLevel();
+                callback();
+            });
+            return;
+        }
 
-        $(document).one('click', function () {
-            if (webkitNotifications.requestPermission.length) {
-                webkitNotifications.requestPermission(function () {
-                    Notification.permissionLevel();
-                    callback();
-                });
-                return;
-            }
+        // In old chrome webkitNotifications.requestPermission is without callback LOL
+        webkitNotifications.requestPermission();
+        var checkPermissionInterval = window.setInterval(function () {
+            var permissionLevel = Notification.permissionLevel();
 
-            // In old chrome webkitNotifications.requestPermission is without callback LOL
-            webkitNotifications.requestPermission();
-            var checkPermissionInterval = window.setInterval(function () {
-                var permissionLevel = Notification.permissionLevel();
-
-                if (permissionLevel !== "default") {
-                    window.clearInterval(checkPermissionInterval);
-                    callback();
-                }
-            }, 200);
-        });
+            if (permissionLevel !== "default") {
+                window.clearInterval(checkPermissionInterval);
+                callback();
+            }
+        }, 200);
     };
 
     return Notification;
 }());
 
+var requestPermission = function (callback) {
+    if ((W3CNotification.permission || W3CNotification.permissionLevel()) !== "default") {
+        callback();
+        return;
+    }
+
+    $(document).one('click', function () {
+        W3CNotification.requestPermission(callback);
+    });
+};
+
 /**
  * Notification
  *
@@ -154,9 +162,10 @@ var exports = function (options) {
         options.icon = icon;
     }
 
-    W3CNotification.requestPermission(function () {
-        if ((W3CNotification.permission || W3CNotification.permissionLevel()) !== "granted") {
-            dfd.reject(W3CNotification.permissionLevel());
+    requestPermission(function () {
+        var level = W3CNotification.permission || W3CNotification.permissionLevel();
+        if (level !== "granted") {
+            dfd.reject(level);
             return;
         }
 
@@ -186,7 +195,7 @@ exports.permission = W3CNotification.permission;
 exports.permissionLevel = W3CNotification.permissionLevel || function () {
     return W3CNotification.permission;
 };
-exports.requestPermission = W3CNotification.requestPermission;
+exports.requestPermission = requestPermission;
 
 return exports;
 

diff --git a/notification.jquery.json b/notification.jquery.json
@@ -8,7 +8,7 @@
         "wrapper",
         "webkit"
     ],
-    "version": "1.0.2",
+    "version": "1.0.4",
     "author": {
         "name": "Mikhail Davydov",
         "email": "azazel.private@gmail.com",