refactoring angular modules

sixertoy · Aug 4, 2015 · 2588446 · 2588446
1 parent 1098b98
commit 2588446
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 14 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -28,20 +28,20 @@ module.exports = function (config) {
             'src/html/js/app.js',
             // Viewer
             'src/html/js/app/viewer/index.js',
-            'src/html/js/app/viewer/controllers/viewer-controller.js',
+            'src/html/js/app/viewer/viewer-controller.js',
             // Toolbar
             'src/html/js/app/toolbar/index.js',
-            'src/html/js/app/toolbar/controllers/toolbar-controller.js',
+            'src/html/js/app/toolbar/toolbar-controller.js',
             //
             // Sidebar
             'src/html/js/app/sidebar/index.js',
-            'src/html/js/app/sidebar/services/projects-service.js',
-            'src/html/js/app/sidebar/controllers/sidebar-controller.js',
+            'src/html/js/app/sidebar/sidebar-service.js',
+            'src/html/js/app/sidebar/sidebar-controller.js',
             //
             /* *** specs *** */
-            'spec/src/html/js/app/sidebar/services/projects-service.spec.js',
-            'spec/src/html/js/app/viewer/controllers/viewer-controller.spec.js',
-            'spec/src/html/js/app/sidebar/controllers/sidebar-controller.spec.js'
+            'spec/src/html/js/app/sidebar/sidebar-service.spec.js',
+            'spec/src/html/js/app/viewer/viewer-controller.spec.js',
+            'spec/src/html/js/app/sidebar/sidebar-controller.spec.js'
         ]
     });
 };
diff --git a/...ar/controllers/sidebar-controller.spec.js → ...js/app/sidebar/sidebar-controller.spec.js b/...ar/controllers/sidebar-controller.spec.js → ...js/app/sidebar/sidebar-controller.spec.js
diff --git a/...sidebar/services/projects-service.spec.js → ...ml/js/app/sidebar/sidebar-service.spec.js b/...sidebar/services/projects-service.spec.js → ...ml/js/app/sidebar/sidebar-service.spec.js
diff --git a/...wer/controllers/viewer-controller.spec.js → ...l/js/app/viewer/viewer-controller.spec.js b/...wer/controllers/viewer-controller.spec.js → ...l/js/app/viewer/viewer-controller.spec.js
diff --git a/src/html/index.tpl b/src/html/index.tpl
@@ -41,7 +41,7 @@
     {{$include 'templates/projecttree_repeat'}}
 
     <!-- livereload -->
-    {{$livereload}}
+    {{!-- $livereload --}}
 
 </body>
 

diff --git a/...heet/controllers/cheatsheet-controller.js → ...s/app/cheatsheet/cheatsheet-controller.js b/...heet/controllers/cheatsheet-controller.js → ...s/app/cheatsheet/cheatsheet-controller.js
diff --git a/...sidebar/controllers/sidebar-controller.js → ...html/js/app/sidebar/sidebar-controller.js b/...sidebar/controllers/sidebar-controller.js → ...html/js/app/sidebar/sidebar-controller.js
@@ -86,7 +86,7 @@
                         }
                         $scope.projects.push(data);
                         list = $scope.projects;
-                        list.sort(sortProjectByName);
+                        //list.sort(sortProjectByName);
                         $scope.projects = list;
                         $scope.initProject(data);
                         $scope.projectForm = {

diff --git a/...p/sidebar/controllers/modal-controller.js → ...s/app/sidebar/sidebar-modal-controller.js b/...p/sidebar/controllers/modal-controller.js → ...s/app/sidebar/sidebar-modal-controller.js
diff --git a/.../app/sidebar/services/projects-service.js → src/html/js/app/sidebar/sidebar-service.js b/.../app/sidebar/services/projects-service.js → src/html/js/app/sidebar/sidebar-service.js
diff --git a/...toolbar/controllers/toolbar-controller.js → ...html/js/app/toolbar/toolbar-controller.js b/...toolbar/controllers/toolbar-controller.js → ...html/js/app/toolbar/toolbar-controller.js
diff --git a/...p/viewer/controllers/viewer-controller.js → src/html/js/app/viewer/viewer-controller.js b/...p/viewer/controllers/viewer-controller.js → src/html/js/app/viewer/viewer-controller.js
diff --git a/src/html/partials/commons/scripts.hbs b/src/html/partials/commons/scripts.hbs
@@ -20,12 +20,12 @@ app
 <script type="text/javascript" src="js/app/controller.js"></script>
 <!-- toolbar -->
 <script type="text/javascript" src="js/app/toolbar/index.js"></script>
-<script type="text/javascript" src="js/app/toolbar/controllers/toolbar-controller.js"></script>
+<script type="text/javascript" src="js/app/toolbar/toolbar-controller.js"></script>
 <!-- sidebar -->
 <script type="text/javascript" src="js/app/sidebar/index.js"></script>
-<script type="text/javascript" src="js/app/sidebar/controllers/sidebar-controller.js"></script>
-<script type="text/javascript" src="js/app/sidebar/controllers/modal-controller.js"></script>
-<script type="text/javascript" src="js/app/sidebar/services/projects-service.js"></script>
+<script type="text/javascript" src="js/app/sidebar/sidebar-controller.js"></script>
+<script type="text/javascript" src="js/app/sidebar/sidebar-modal-controller.js"></script>
+<script type="text/javascript" src="js/app/sidebar/sidebar-service.js"></script>
 <!-- viewer -->
 <script type="text/javascript" src="js/app/viewer/index.js"></script>
-<script type="text/javascript" src="js/app/viewer/controllers/viewer-controller.js"></script>
+<script type="text/javascript" src="js/app/viewer/viewer-controller.js"></script>