From 7c2cbfb32e81a6ac1146577213c08053cfffef09 Mon Sep 17 00:00:00 2001
From: Rokt33r <fluke8259@gmail.com>
Date: Mon, 22 Jun 2015 12:20:16 +0900
Subject: [PATCH] fix injector bug & add tray-icon

---
 src/browser/main/config/states.js       |  17 ++++++++++++++++-
 src/browser/main/index.html             |  10 +++++-----
 src/browser/shared/config/satellizer.js |  23 +----------------------
 src/tray-icon.png                       | Bin 542 -> 321 bytes
 src/tray-icon@2x.png                    | Bin 0 -> 542 bytes
 src/tray-icon@4x.png                    | Bin 0 -> 1569 bytes
 6 files changed, 22 insertions(+), 28 deletions(-)
 create mode 100644 src/tray-icon@2x.png
 create mode 100644 src/tray-icon@4x.png

diff --git a/src/browser/main/config/states.js b/src/browser/main/config/states.js
index d84f2f7e..56bf2230 100644
--- a/src/browser/main/config/states.js
+++ b/src/browser/main/config/states.js
@@ -1,6 +1,21 @@
 /* global angular */
 angular.module('codexen')
-  .config(function ($stateProvider, $urlRouterProvider) {
+  .config(function ($stateProvider, $urlRouterProvider, $httpProvider) {
+    $httpProvider.interceptors.push(function ($q, $injector) {
+      return {
+        responseError: function (res) {
+          switch (res.status) {
+            case 401:
+              var $state = $injector.get('$state')
+              $state.go('auth.signin')
+              break
+          }
+
+          return $q.reject(res)
+        }
+      }
+    })
+
     $urlRouterProvider
       .when('/auth', '/auth/register')
       .when('/auth/', '/auth/register')
diff --git a/src/browser/main/index.html b/src/browser/main/index.html
index 3e36c3fc..0a1985d4 100644
--- a/src/browser/main/index.html
+++ b/src/browser/main/index.html
@@ -38,8 +38,6 @@
     <script src="app.js"></script>
     <script src="config/states.js"></script>
     <script src="controllers/AppController.js"></script>
-    <script src="filters/from-now.js"></script>
-    <script src="filters/search-snippets.js"></script>
     <script src="directives/btn-delete-snippet.js"></script>
     <script src="directives/btn-edit-snippet.js"></script>
     <script src="directives/btn-new-snippet.js"></script>
@@ -47,20 +45,22 @@
     <script src="directives/snippet-item.js"></script>
     <script src="directives/tag-item.js"></script>
     <script src="directives/tag-list.js"></script>
+    <script src="filters/from-now.js"></script>
+    <script src="filters/search-snippets.js"></script>
     <script src="services/Modal.js"></script>
     <script src="services/Settings.js"></script>
     <script src="services/Tag.js"></script>
     <script src="services/User.js"></script>
     <script src="controllers/directives/SideNavController.js"></script>
-    <script src="controllers/modals/DeleteSnippetModalController.js"></script>
-    <script src="controllers/modals/EditSnippetModalController.js"></script>
-    <script src="controllers/modals/NewSnippetModalController.js"></script>
     <script src="controllers/states/AuthRegisterController.js"></script>
     <script src="controllers/states/AuthSignInController.js"></script>
     <script src="controllers/states/HomeController.js"></script>
     <script src="controllers/states/SettingsController.js"></script>
     <script src="controllers/states/SnippetsDetailController.js"></script>
     <script src="controllers/states/SnippetsListController.js"></script>
+    <script src="controllers/modals/DeleteSnippetModalController.js"></script>
+    <script src="controllers/modals/EditSnippetModalController.js"></script>
+    <script src="controllers/modals/NewSnippetModalController.js"></script>
     <script src="../shared/shared.js"></script>
     <script src="../shared/config/ace.js"></script>
     <script src="../shared/config/env.js"></script>
diff --git a/src/browser/shared/config/satellizer.js b/src/browser/shared/config/satellizer.js
index b7717dc7..ca15816a 100644
--- a/src/browser/shared/config/satellizer.js
+++ b/src/browser/shared/config/satellizer.js
@@ -1,29 +1,8 @@
 /* global angular */
 angular.module('codexen.shared')
-  .config(function ($authProvider, $httpProvider, apiUrl, appName) {
+  .config(function ($authProvider, $httpProvider, apiUrl) {
     $authProvider.baseUrl = apiUrl
 
     $httpProvider.defaults.useXDomain = true
     delete $httpProvider.defaults.headers.common['X-Requested-With']
-    $httpProvider.interceptors.push(function ($q, $injector) {
-      return {
-        responseError: function (res) {
-          switch (res.status) {
-            case 401:
-              switch (appName) {
-                case 'main' :
-                  var $state = $injector.get('$state')
-                  $state.go('auth.signin')
-                  break
-                case 'popup' :
-                  // TODO: hide popup
-                  break
-              }
-              break
-          }
-
-          return $q.reject(res)
-        }
-      }
-    })
   })
diff --git a/src/tray-icon.png b/src/tray-icon.png
index c615b96079781508d270d878efa6001e208adfef..fde419910f445628567d7dd480cc0a47eb401195 100644
GIT binary patch
delta 259
zcmbQoa*#=}Gr-TCmrII^fq{Y7)59eQNDF{42Q!e=(B%)FsHnhd9N-h;Ix$d`*(bAb
zVxV;Wr4@68fYO2`L4Lt3lWP7dtmk47Ge`<pbk2GI+n^kti$KYKPZ!4!iOZ(_-9oO4
zEUtpBe*ORd-_kBUn{i`uZetm<f>HPF2DgPDT2|%6IIqxj$UX4H!!{)2XZ0_!JBNM0
zR%~26<&$M^ojXq^=cJ#@?kuqBP09Hspgm{B-s7Gp4k(>_$*7j7v^vMggD;MiwS7ln
z)rwm0U4rKhS08A){L7_1?BT-ruM6F?PQQLof2VSj<ws^?aW+OCZF6Iw+Za4u{an^L
HB{Ts53lw8G

delta 484
zcmV<A0UQ3o0-gjRiBL{Q4GJ0x0000DNk~Le0000W0000W2m=5B07RsU#*rZ)2sThm
zR7Ff_agkvdk#Gr-a0!uc34aJ{S?B-&01<RjPE!CyC1wOI?hQ5>)P$!~bd<=lTGayp
z00C)9L_t(I%av0>mc<|l6BLDtR_}k=L2ci+zl)h+;U+P}fX@B1Qu+nwMG$!*VaHvf
zFFYU<irlyh9KIz&60Sh9q#W&Df?WMgCD+0z$>DBdHB2meu#d56_J2^ytu<;iOu!ub
zVD#Q&m4d`{%UHt%C!Yo_hGK;<Y+VFv3aUKrPKKgJpC0jmM#z0uLq_dA?=Ge0u5^s%
zEf;Y^OX(rNt<>1g!UVYrnvVv1{$v3$BUd$<T-tbT3EO-mgJV6W%MRysTGKV#air=4
zAIs!HZN9}^rq66j@qhketmht#^uaAls_|k}zl6;B76nS~ixFW2+M{xPB!L#wWE>-p
zc(O1*2Rd>b425`P9{Pg!ZJTSLCF~iX66gu(vvy*0Met{~vJs`CQ4QbM&gNQ*?PQ|j
zL0X@<IZqFl#v&*+Bj<&?$KGBIC#&+lZm&JJ-4t6l{HEM{ekJ7_USAO9@%P>p!k<3x
ayM6#4{}NfFZM{MO0000<MNUMnLSTZqYtokh

diff --git a/src/tray-icon@2x.png b/src/tray-icon@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c615b96079781508d270d878efa6001e208adfef
GIT binary patch
literal 542
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaO00(?STeKHGuNe3L+kuQKI2$lr-1v9v+rm^V0<294K(y~0bWXg$6QCERZ
zV9fM%aSX9IJvG>I+EE1#VUgCZu=n*h9dqw*-`_nm@u8aGk%n`BHwXP<eeNnyshD^?
zc9Fh~f^gTJ9o#beRGoy@Ic!=Y^ER$2=C7~n^+OsbALb>Q`sh?`=--(6E#TBz(<~F8
z12Vr8zT8Wm+H|Dkbi`p6_4#bNZAq;LIk7C+T&rx}`L!)_n=kjV!R<tCn6ukk+xL1)
zpRFtDd8R8~=<NMc@xa<EH_jbm*~vAlpRM{|3ZtQNxarK8TNSySw`)|IlWmus=6hZe
zb=mZG;gVO(@~59T=I%Qhv+R71*T;WJYo5#Xd^xD=z3O99$o`fyKgC$R-gOHmvfNr+
zRIAb`b~!~xxxZqQfjzrbkql33MT*?7rti74vlpnokz643g7f9(vZP|y59!-B2`*g}
z$b0|#xo1&bZ&MaMa*Ue4!_uFB`Y|O9Q|0HayN}<C<5ge%X<y!Y+wFHnqRsy-yHj2F
qR5~tR;OWQj_e2lPw|l?4jzRvvP~_s=y-vUwVeoYIb6Mw<&;$T$nBjW>

literal 0
HcmV?d00001

diff --git a/src/tray-icon@4x.png b/src/tray-icon@4x.png
new file mode 100644
index 0000000000000000000000000000000000000000..25c9f14bb51b28856f5b7498266354db7c5b5ffc
GIT binary patch
literal 1569
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
T0^O}+00000NkvXXu0mjf`zOWN

literal 0
HcmV?d00001