Skip to content

Commit cae3246

Browse files
committed
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
1 parent 09ea288 commit cae3246

9 files changed

+3038
-2246
lines changed

app/index.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,25 @@
2727
<script src="lib/angular/i18n/angular-locale_fa-ir.js"></script>
2828
<script src="lib/angular/i18n/angular-locale_ar.js"></script>
2929
-->
30+
3031
<script src="components/angular-ui-utils/modules/if/if.js"></script>
3132
<script src="components/angular-ui-utils/modules/showhide/showhide.js"></script>
33+
<!--
3234
<script src="components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
35+
-->
36+
<script src="lib/ui-bootstrap-tpls-0.4.0-SNAPSHOT.js"></script>
37+
3338
<!--
3439
<script src="lib/bootstrap.js"></script>
3540
<script src="lib/select2/select2.js"></script>
3641
-->
3742

3843
<script src="components/lodash/lodash.js"></script>
3944
<script src="components/d3/d3.js"></script>
45+
<script src="lib/topojson.js"></script>
46+
<!--
4047
<script src="components/topojson/topojson.js"></script>
48+
-->
4149

4250
<script src="js/version.js"></script>
4351
<script src="js/app.js"></script>

app/js/app.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,4 @@ var app = angular.module('app', [
3030
// angular-ui config
3131
.value('ui.config', {
3232
animate: 'ui-hide',
33-
jq: {
34-
tooltip: {
35-
container: 'body'
36-
}
37-
}
3833
});

app/js/controllers.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function ContactCtrl($scope, MODAL, $filter, CONTACT_FORM_MAXLEN) {
220220
}, true);
221221
}
222222

223-
function SettingsCtrl($scope, $timeout, modelSrvc, logFactory, MODAL) {
223+
function SettingsCtrl($scope, logFactory, MODAL) {
224224
var log = logFactory('SettingsCtrl');
225225

226226
$scope.$watch('model.settings.runAtSystemStart', function(runAtSystemStart) {
@@ -249,10 +249,6 @@ function ProxiedSitesCtrl($scope, $timeout, $filter, logFactory, MODAL, SETTING,
249249
proxiedSites = [],
250250
proxiedSitesDirty = [];
251251

252-
$scope.$watch('model.modal', function(modal) {
253-
$scope.show = modal === MODAL.proxiedSites;
254-
});
255-
256252
$scope.$watch('searchText', function(searchText) {
257253
$scope.inputFiltered = (searchText ? fltr(proxiedSitesDirty, searchText) : proxiedSitesDirty).join('\n');
258254
});

0 commit comments

Comments
 (0)