cleanup

Subash · Dec 17, 2013 · 3d455c8 · 3d455c8
1 parent d9733f2
commit 3d455c8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 26 deletions.
diff --git a/application/app/scripts/controllers/MainCtrl.js b/application/app/scripts/controllers/MainCtrl.js
@@ -81,7 +81,7 @@ prepros.controller('MainCtrl', [
 
         $scope.$on('$routeChangeSuccess', function () {
 
-            if ($scope.multiSelect.pid !== $routeParams.pid || $scope.routeSubPath !== $route.current.subPath || $scope.routePath !== $route.current.path) {
+            if ($scope.multiSelect.pid !== $routeParams.pid || $scope.routePath !== $route.current.path) {
 
                 $scope.multiSelect.id = "";
                 $scope.multiSelect.files = {};
@@ -239,10 +239,7 @@ prepros.controller('MainCtrl', [
 
         $scope.addMultiSelectFile = function (pid, fid) {
 
-
-            var subPath = $scope.routeSubPath ? $scope.routeSubPath.toLowerCase() : 'files';
-
-            $location.path('/' + subPath + '/' + pid); //Redirect to files list view
+            $location.path('/files/' + pid); //Redirect to files list view
 
             $scope.multiSelect.pid = pid;
 

diff --git a/application/app/scripts/controllers/ProjectCtrl.js b/application/app/scripts/controllers/ProjectCtrl.js
@@ -80,7 +80,7 @@ prepros.controller('ProjectCtrl', [
 
         $scope.openRemoteInspect = function () {
 
-            liveServer.openRemoteInspect();
+            pro.showMessage();
         };
 
         $scope.optimizeAllImages = function (pid) {

diff --git a/application/app/scripts/directives/file-context-menu.js b/application/app/scripts/directives/file-context-menu.js
@@ -101,7 +101,7 @@ prepros.directive('fileContextMenu', [
 
                         } else {
 
-                            if (!Prepros.IS_PRO) return pro.showMessage();
+                            pro.showMessage();
 
                         }
                     }
@@ -119,7 +119,7 @@ prepros.directive('fileContextMenu', [
 
                         } else {
 
-                            if (!Prepros.IS_PRO) return pro.showMessage();
+                            pro.showMessage();
                         }
                     }
                 }));
@@ -146,7 +146,7 @@ prepros.directive('fileContextMenu', [
 
                             } else {
 
-                                if (!Prepros.IS_PRO) return pro.showMessage();
+                                pro.showMessage();
                             }
                         }
                     });

diff --git a/application/app/scripts/directives/image-context-menu.js b/application/app/scripts/directives/image-context-menu.js
@@ -37,7 +37,7 @@ prepros.directive('imageContextMenu', [
 
                         } else {
 
-                            if (!Prepros.IS_PRO) return pro.showMessage();
+                            pro.showMessage();
 
                         }
                     }
@@ -56,15 +56,7 @@ prepros.directive('imageContextMenu', [
 
                         } else {
 
-                            if (!Prepros.IS_PRO) return pro.showMessage();
-
-                            _.each(scope.multiSelect.images, function (i) {
-
-                                scope.$apply(function () {
-                                    scope.optimizeImage(i.pid, i.id);
-                                });
-
-                            })
+                            pro.showMessage();
 
                         }
                     }
@@ -82,12 +74,7 @@ prepros.directive('imageContextMenu', [
 
                         } else {
 
-                            if (!Prepros.IS_PRO) return pro.showMessage();
-
-                            _.each(scope.multiSelect.images, function (i) {
-
-                                scope.showImageInFolder(i.pid, i.id);
-                            })
+                            pro.showMessage();
 
                         }
                     }

diff --git a/chrome-extension/manifest.json b/chrome-extension/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "Prepros",
-    "version": "3.0.0",
+    "version": "4.0.0",
     "manifest_version": 2,
     "description": "Live refresh extension for Prepros App",
     "permissions": ["tabs", "<all_urls>"],