blob42
/
angularjs-batarang
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code cleanup

Browse Source
test-unit-sauce
Brian Ford 12 years ago
parent 8e0f1b0201
commit e6c28a4c09
5 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File

4
js/controllers/OptionsCtrl.js
Unescape Escape View File

@ -71,8 +71,6 @@ panelApp.controller('OptionsCtrl', function OptionsCtrl($scope, appContext, chro
}; };
// TODO: rules for ng-app (is it added as a class?) // TODO: rules for ng-app (is it added as a class?)
addCssRule('[ng-app]', 'border: 1px solid green'); addCssRule('[ng-app]', 'border: 1px solid green');
//addCssRule('ng-app:', 'border: 1px solid green');
addCssRule('[app-run]', 'border: 1px solid green');
}); });
} else { } else {
chromeExtension.eval(function () { chromeExtension.eval(function () {
@ -87,8 +85,6 @@ panelApp.controller('OptionsCtrl', function OptionsCtrl($scope, appContext, chro
} }
}; };
removeCssRule('[ng-app]', 'border: 1px solid green'); removeCssRule('[ng-app]', 'border: 1px solid green');
//removeCssRule('ng-app:', 'border: 1px solid green');
removeCssRule('[app-run]', 'border: 1px solid green');
}); });
} }
}); });

1
js/controllers/PerfCtrl.js
Unescape Escape View File

@ -80,6 +80,7 @@ panelApp.controller('PerfCtrl', function PerfCtrl($scope, appContext, filesystem
var updateTree = function () { var updateTree = function () {
var rts = appContext.getListOfRoots(); var rts = appContext.getListOfRoots();
if (!rts) { if (!rts) {
// if app not bootstrapped, return undefined
return; return;
} }
var roots = []; var roots = [];

31
js/directives/d3.js vendored
Unescape Escape View File

@ -103,24 +103,24 @@ panelApp.directive('batD3', function (d3) {
// Instantiate and Style D3 Objects // Instantiate and Style D3 Objects
// -------------------------------- // --------------------------------
var cluster = d3.layout.cluster() var cluster = d3.layout.cluster().
.size([360, ry - 120]) size([360, ry - 120]).
.sort(function(a, b) { return d3.ascending(a.key, b.key); }); sort(function(a, b) { return d3.ascending(a.key, b.key); });
var bundle = d3.layout.bundle(); var bundle = d3.layout.bundle();
var line = d3.svg.line.radial() var line = d3.svg.line.radial().
.interpolate("bundle") interpolate("bundle").
.tension(.85) tension(.85).
.radius(function(d) { return d.y; }) radius(function(d) { return d.y; }).
.angle(function(d) { return d.x / 180 * Math.PI; }); angle(function(d) { return d.x / 180 * Math.PI; });
var svg = div.append("svg:svg") var svg = div.append("svg:svg").
.attr("preserveAspectRatio", "xMinYMin meet") attr("preserveAspectRatio", "xMinYMin meet").
.attr("viewBox", [0, 0, w, h].join(' ')) attr("viewBox", [0, 0, w, h].join(' ')).
.attr("height", h) attr("height", h).
.append("svg:g") append("svg:g").
.attr("transform", "translate(" + rx + "," + ry + ")"); attr("transform", "translate(" + rx + "," + ry + ")");
// Render the data whenever "val" changes // Render the data whenever "val" changes
// -------------------------------------- // --------------------------------------
@ -269,9 +269,6 @@ panelApp.directive('batD3', function (d3) {
function dot(a, b) { function dot(a, b) {
return a[0] * b[0] + a[1] * b[1]; return a[0] * b[0] + a[1] * b[1];
} }
// compile and go!
$compile(element.contents())(scope.$new());
} }
}; };
}); });

1
js/inject/debug.js
Unescape Escape View File

@ -18,7 +18,6 @@ var inject = function () {
return true; return true;
}; };
// TODO: remove needless recursion
if (!ngLoaded()) { if (!ngLoaded()) {
(function () { (function () {
// TODO: var name // TODO: var name

26
panel.html
Unescape Escape View File

@ -1,11 +1,11 @@
<!doctype html> <!doctype html>
<html ng-csp ng-app="panelApp"> <html ng-csp ng-app="panelApp">
<head> <head>
<link rel="stylesheet" type="text/css" href="css/jquery-ui.css"> <link rel="stylesheet" href="css/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="css/bootstrap.css"> <link rel="stylesheet" href="css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="css/bootstrap-responsive.css"> <link rel="stylesheet" href="css/bootstrap-responsive.css">
<link rel="stylesheet" type="text/css" href="css/d3.css"> <link rel="stylesheet" href="css/d3.css">
<link rel="stylesheet" type="text/css" href="css/panel.css"> <link rel="stylesheet" href="css/panel.css">
<!-- libs --> <!-- libs -->
<script src="js/lib/angular.js"></script> <script src="js/lib/angular.js"></script>
@ -41,16 +41,16 @@
<div class="row-fluid"> <div class="row-fluid">
<ul class="nav nav-tabs span12"> <ul class="nav nav-tabs span12">
<li ng-repeat="tabId in ['Model', 'Performance', 'Dependencies', 'Options', 'Help']" <li ng-repeat="tabId in ['Model', 'Performance', 'Dependencies', 'Options', 'Help']"
ng-class="{active: $parent.selectedTab == tabId}" ng-class="{active: selectedTab == tabId}"
ng-click="$parent.selectedTab = tabId"> ng-click="$parent.selectedTab = tabId">
<a href="#">{{tabId}}</a> <a href>{{tabId}}</a>
</li> </li>
</ul> </ul>
</div> </div>
<div ng-class="{hidden: $parent.selectedTab != 'Model'}" ng-controller="TreeCtrl" class="row-fluid"> <div ng-class="{hidden: selectedTab != 'Model'}" ng-controller="TreeCtrl" class="row-fluid">
<h2>Model Tree</h2> <h2>Model Tree</h2>
<div ng-class="{hidden: roots.length <= 1}"> <div ng-class="{hidden: roots.length <= 1}">
<label for="select-root">Root <select id="select-root" ng-options="p.value as p.label for p in roots" ng-model="selectedRoot"></select></label> <label for="select-root">Root <select id="select-root" ng-options="p.value as p.label for p in roots" ng-model="selectedRoot"></select></label>
@ -61,7 +61,7 @@
</div> </div>
<div ng-class="{hidden: $parent.selectedTab != 'Performance'}" ng-controller="PerfCtrl" class="row-fluid"> <div ng-class="{hidden: selectedTab != 'Performance'}" ng-controller="PerfCtrl" class="row-fluid">
<h2>Performance</h2> <h2>Performance</h2>
<form class="well form-inline" class="row-fluid"> <form class="well form-inline" class="row-fluid">
@ -122,16 +122,16 @@
</div> </div>
</div> </div>
<div ng-class="{hidden: $parent.selectedTab != 'Dependencies'}" ng-controller="DepsCtrl" class="row-fluid"> <div ng-class="{hidden: selectedTab != 'Dependencies'}" ng-controller="DepsCtrl" class="row-fluid">
<div class="span12"> <div class="span12">
<h2>Service Dependencies</h2> <h2>Service Dependencies</h2>
<div class="well"> <div class="well">
<d3 val="deps"></d3> <bat-d3 val="deps"></d3>
</div> </div>
</div> </div>
</div> </div>
<div ng-class="{hidden: $parent.selectedTab != 'Options'}" ng-controller="OptionsCtrl" class="row-fluid"> <div ng-class="{hidden: selectedTab != 'Options'}" ng-controller="OptionsCtrl" class="row-fluid">
<div class="span6"> <div class="span6">
<h2>Options</h2> <h2>Options</h2>