start rewriting vis in only angular

temporarily use 0.4.0-SNAPSHOT release of angular-ui-bootstrap (with additional patch to support tooltip-placement="mouse") while the fix for angular-ui/bootstrap#387 has not yet been released
getlantern · Jun 16, 2013 · cae3246 · cae3246
1 parent 09ea288
commit cae3246
Show file tree

Hide file tree

Showing 9 changed files with 3,038 additions and 2,246 deletions.
diff --git a/app/index.html b/app/index.html
@@ -27,17 +27,25 @@
     <script src="lib/angular/i18n/angular-locale_fa-ir.js"></script>
     <script src="lib/angular/i18n/angular-locale_ar.js"></script>
     -->
+
     <script src="components/angular-ui-utils/modules/if/if.js"></script>
     <script src="components/angular-ui-utils/modules/showhide/showhide.js"></script>
+    <!--
     <script src="components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
+    -->
+    <script src="lib/ui-bootstrap-tpls-0.4.0-SNAPSHOT.js"></script>
+
     <!--
     <script src="lib/bootstrap.js"></script>
     <script src="lib/select2/select2.js"></script>
     -->
 
     <script src="components/lodash/lodash.js"></script>
     <script src="components/d3/d3.js"></script>
+    <script src="lib/topojson.js"></script>
+    <!--
     <script src="components/topojson/topojson.js"></script>
+    -->
 
     <script src="js/version.js"></script>
     <script src="js/app.js"></script>

diff --git a/app/js/app.js b/app/js/app.js
@@ -30,9 +30,4 @@ var app = angular.module('app', [
   // angular-ui config
   .value('ui.config', {
     animate: 'ui-hide',
-    jq: {
-      tooltip: {
-        container: 'body'
-      }
-    }
   });
diff --git a/app/js/controllers.js b/app/js/controllers.js
@@ -220,7 +220,7 @@ function ContactCtrl($scope, MODAL, $filter, CONTACT_FORM_MAXLEN) {
   }, true);
 }
 
-function SettingsCtrl($scope, $timeout, modelSrvc, logFactory, MODAL) {
+function SettingsCtrl($scope, logFactory, MODAL) {
   var log = logFactory('SettingsCtrl');
 
   $scope.$watch('model.settings.runAtSystemStart', function(runAtSystemStart) {
@@ -249,10 +249,6 @@ function ProxiedSitesCtrl($scope, $timeout, $filter, logFactory, MODAL, SETTING,
       proxiedSites = [],
       proxiedSitesDirty = [];
 
-  $scope.$watch('model.modal', function(modal) {
-    $scope.show = modal === MODAL.proxiedSites;
-  });
-
   $scope.$watch('searchText', function(searchText) {
     $scope.inputFiltered = (searchText ? fltr(proxiedSitesDirty, searchText) : proxiedSitesDirty).join('\n');
   });