diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-28 07:01:04 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-28 07:01:04 -0500 |
| commit | b73bbbccb4aaadd7513edf5e393710b36fa3d984 (patch) | |
| tree | 22c0ff847319fe0d8733fde04ce395a2f2888994 /www/js/app.js | |
| parent | c590ca90128aaa3c72da9b7bfaf15615f447b5f3 (diff) | |
various fixes
Former-commit-id: 780f7f5dba161552d4aaf377e993fdd7810eb23b
Diffstat (limited to 'www/js/app.js')
| -rw-r--r-- | www/js/app.js | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/www/js/app.js b/www/js/app.js index 38a451a2..e236b026 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -19,11 +19,7 @@ angular.module('zmApp', [ 'com.2fdevs.videogular.plugins.controls', 'com.2fdevs.videogular.plugins.overlayplay' - - - - - + ]) // ------------------------------------------ @@ -67,7 +63,8 @@ angular.module('zmApp', [ loginScreenString: "var currentView = 'login'", // Isn't there a better way? desktopUrl:"/zm", desktopApiUrl: "/api/zm", - latestRelease: "https://api.github.com/repos/pliablepixels/zmNinja/releases/latest" + latestRelease: "https://api.github.com/repos/pliablepixels/zmNinja/releases/latest", + }) @@ -147,7 +144,6 @@ angular.module('zmApp', [ link: function ($scope, $element, $attributes) { if ($attributes.imageSpinnerLoader) { - // console.log ("DIRECTIVE: IMAGE SPINNER"); var loader = $compile('<div class="image-loader-container"><ion-spinner style="position:fixed;top:5%;left:5%" class="image-loader" icon="' + $attributes.imageSpinnerLoader + '"></ion-spinner></div>')($scope); $element.after(loader); } @@ -232,28 +228,6 @@ angular.module('zmApp', [ 'request': function (config) { - /* - we don't need this with electron - if ($rootScope.platformOS == "desktop") - { - var zmD = $injector.get('ZMDataModel'); - var ld = zmD.getLogin(); - // This takes care of url and apiurl as they have - // the same base - if (ld.url !="" && config.url.indexOf(ld.url) > -1) - { - - zmD.zmDebug("Running in desktop, removing URLs for proxy"); - zmD.zmDebug ("OLD URL " + config.url); - config.url = config.url.replace(ld.url,zm.desktopUrl); - zmD.zmDebug ("NEW URL " + config.url); - } - - - - } - */ - - // config.withCredentials = true; if (zmCookie) { config.headers.Cookie = "ZMSESSID=" + zmCookie; } |
