Merge pull request #14 from davidyack/revert-11-master

Revert "added DnD switcher"
davidyack · Apr 3, 2015 · c006838 · c006838
2 parents c850149 + e769705
commit c006838
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 64 deletions.
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -17,7 +17,6 @@ require('angular-ui-router');
 require('angular-loading-bar');
 require('ngDraggable');
 require('angular-animate');
-require('flux-angular');
 
 angular.module('underscore', [])
   .factory('_', function() {
@@ -30,7 +29,7 @@ angular.module('underscore', [])
 
 angular
   .module('navEditorApp', ['templates-main','underscore', 'ui.router', 'ui.bootstrap', 'ngDraggable',
-          'angular-szn-autocomplete', 'angular-loading-bar', 'ngAnimate', 'flux'])
+          'angular-szn-autocomplete', 'angular-loading-bar', 'ngAnimate'])
   .config(function($urlRouterProvider, $locationProvider, cfpLoadingBarProvider) {
     $urlRouterProvider.otherwise('/');
     // $locationProvider.html5Mode(true);

diff --git a/app/scripts/directives/actions.js b/app/scripts/directives/actions.js
@@ -18,11 +18,7 @@ angular.module('navEditorApp')
       controllerAs: 'actionsCtrl'
     };
   })
-  .controller('ActionsCtrl', function(AreaService, ModalService, $state, SettingsStore, flux, $scope) {
-    $scope.reorderingMode = SettingsStore.reorderingMode;
-    $scope.$listenTo(SettingsStore, 'reorderingModeChanged', function() {
-      $scope.reorderingMode = SettingsStore.reorderingMode;
-    });
+  .controller('ActionsCtrl', function(AreaService, ModalService, $state) {
     this.save = function() {
       this.saving = true;
       AreaService.save().then(function() {
@@ -43,7 +39,4 @@ angular.module('navEditorApp')
         $state.go('area.group', {areaid: newArea.Id});
       });
     };
-    this.changeReorderingMode = function() {
-      flux.dispatch('changeReorderingMode');
-    };
   });
diff --git a/app/scripts/directives/area.dir.js b/app/scripts/directives/area.dir.js
@@ -50,12 +50,7 @@ angular.module('navEditorApp')
       controllerAs: 'areaCtrl'
     };
   })
-  .controller('AreaCtrl', function(AreaService, ModalService, $stateParams, $state, _, $scope, SettingsStore) {
-    $scope.reorderingMode = SettingsStore.reorderingMode;
-    $scope.$listenTo(SettingsStore, 'reorderingModeChanged', function() {
-      $scope.reorderingMode = SettingsStore.reorderingMode;
-    });
-
+  .controller('AreaCtrl', function(AreaService, ModalService, $stateParams, $state, _) {
     this.areas = AreaService.getAreas();
     this.$stateParams = $stateParams;
 

diff --git a/app/scripts/directives/group.dir.js b/app/scripts/directives/group.dir.js
@@ -20,11 +20,7 @@ angular.module('navEditorApp')
       url: '^/group/:areaid'
     });
   })
-  .controller('GroupCtrl', function(AreaService, ModalService, $stateParams, $state, _, $templateCache, $scope, SettingsStore) {
-    $scope.reorderingMode = SettingsStore.reorderingMode;
-    $scope.$listenTo(SettingsStore, 'reorderingModeChanged', function() {
-      $scope.reorderingMode = SettingsStore.reorderingMode;
-    });
+  .controller('GroupCtrl', function(AreaService, ModalService, $stateParams, $state, _, $templateCache) {
     this.groups = AreaService.getGroups($stateParams.areaid);
     this.$stateParams = $stateParams;
 

diff --git a/app/scripts/directives/subarea.dir.js b/app/scripts/directives/subarea.dir.js
@@ -10,11 +10,7 @@ require('angular-ui-router');
  * # group
  */
 angular.module('navEditorApp')
-  .controller('SubAreaCtrl', function(AreaService, ModalService, $stateParams, $scope, _, SettingsStore) {
-    $scope.reorderingMode = SettingsStore.reorderingMode;
-    $scope.$listenTo(SettingsStore, 'reorderingModeChanged', function() {
-      $scope.reorderingMode = SettingsStore.reorderingMode;
-    });
+  .controller('SubAreaCtrl', function(AreaService, ModalService, $stateParams, $scope, _) {
     this.subareas = AreaService.getSubAreas($stateParams.areaid, $scope.group.Id);
     this.$stateParams = $stateParams;
 

diff --git a/app/scripts/services/settings.service.js b/app/scripts/services/settings.service.js
diff --git a/app/views/actions.view.html b/app/views/actions.view.html
@@ -1,11 +1,7 @@
 <div class="well">
   <div class="btn-group" role="group">
-    <button class="btn btn-default" ng-click="actionsCtrl.addArea()">Add area</button>
-    <button ng-disabled="actionsCtrl.downloading" class="btn btn-default" ng-click="actionsCtrl.download()">Download</button>
-    <button ng-disabled="actionsCtrl.saving" class="btn btn-primary" ng-click="actionsCtrl.save()">Save</button>
+    <button class="btn btn-default navbar-btn" ng-click="actionsCtrl.addArea()">Add area</button>
+    <button ng-disabled="actionsCtrl.downloading" class="btn btn-default navbar-btn" ng-click="actionsCtrl.download()">Download</button>
+    <button ng-disabled="actionsCtrl.saving" class="btn btn-primary navbar-btn" ng-click="actionsCtrl.save()">Save</button>
   </div>
-  <button class="btn btn-default pull-right" data-toggle="button" ng-click="actionsCtrl.changeReorderingMode()">
-    <span ng-if="reorderingMode">DnD on</span>
-    <span ng-if="!reorderingMode">DnD off</span>
-  </button>
 </div>
diff --git a/app/views/area.view.html b/app/views/area.view.html
@@ -3,7 +3,7 @@
     class="entities__frame col-lg-3 col-md-4 col-sm-4 col-xs-6"
     ng-drop-success="areaCtrl.onDropComplete($index, $data, $event)"
     ng-drop="true">
-    <div class='entity area-entity' ng-drag="reorderingMode" ng-drag-data="area"
+    <div class='entity area-entity' ng-drag="true" ng-drag-data="area"
       ng-class="{'area-entity--selected': areaCtrl.$stateParams.areaid === area.Id}">
         <a draggable="false" class="entity-link" ui-sref="area.group({areaid: area.Id})">
           <span class="entity-link__frame">{{area.Title}}</span>

diff --git a/app/views/group.view.html b/app/views/group.view.html
@@ -4,7 +4,7 @@
         class='entities__frame col-lg-3 col-md-4 col-sm-4 col-xs-6'>
       <div ng-drop-success="groupCtrl.onDropComplete($index, $data, $event)"
         ng-drop="true">
-        <div class='entity group-entity' ng-drag="reorderingMode" ng-drag-data="group">
+        <div class='entity group-entity' ng-drag="true" ng-drag-data="group">
           <span class="entity-link__frame">{{group.Title}}</span>
           <div class="entity-menu-icon"></div>
           <div class="entity-menu-container">

diff --git a/app/views/subarea.view.html b/app/views/subarea.view.html
@@ -2,7 +2,7 @@
   <div ng-repeat="subarea in subAreaCtrl.subareas" class=" voffset"
       ng-drop-success="subAreaCtrl.onDropComplete($index, $data, $event)"
       ng-drop="true">
-    <div class='entity subarea-entity' ng-drag="reorderingMode"
+    <div class='entity subarea-entity' ng-drag="true"
       ng-drag-data="subarea">
       <div ng-if="subarea.IconPreviewUrl !== undefined" class="entity-image-container">
         <img ng-src="{{subarea.IconPreviewUrl}}" />

diff --git a/package.json b/package.json
@@ -9,9 +9,7 @@
     "angular-szn-autocomplete": "^1.0.2",
     "angular-ui-router": "^0.2.13",
     "bootstrap": "3.3.4",
-    "flux-angular": "git://github.com/kalinichenko/flux-angular",
     "jquery": "^2.1.3",
-    "napa": "^1.2.0",
     "underscore": "^1.8.2"
   },
   "repository": {},