January 2013 - tor-commits - lists.torproject.org

[compass/master] Some CSS changes to support new features like loading spinners
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit d32755ff993cce5570b4256f52a4d6af6c244bdd Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Sun Dec 23 00:27:50 2012 -0500 Some CSS changes to support new features like loading spinners --- static/css/style.css | 3 +-- templates/index.html | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 66e0ef6..88fb6de 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -3,5 +3,4 @@ margin: 0 auto; padding-top: 50px; padding-bottom: 100px; - display: none; -} \ No newline at end of file +} diff --git a/templates/index.html b/templates/index.html index 9876ad8..3eb6442 100644 --- a/templates/index.html +++ b/templates/index.html @@ -17,6 +17,15 @@ padding-top: 60px; padding-bottom: 40px; } + td#extra_table_title { + font-weight: bold; + } + th.spinner-small { + background-repeat: no-repeat; + background-position: right center; + background-size: 15px 15px; + padding-right: 20px; + } </style>

1 0

[compass/master] Changed the way select_relay gets called
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 071765df2d8326c46555607f78af2f918d0c96f2 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Sun Dec 23 00:26:43 2012 -0500 Changed the way select_relay gets called --- app.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index f200f8f..665f9f2 100644 --- a/app.py +++ b/app.py @@ -120,18 +120,12 @@ def json_result(): options = Opt(dict(request.args.items())) stats = compass.RelayStats(options) - results = stats.select_relays(stats.relays, - by_country=options.by_country, - by_as_number=options.by_as, - links=options.links) - + results = stats.select_relays(stats.relays, options) relays = stats.sort_and_reduce(results, options) - return Response(json.dumps(relays, cls=ResultEncoder), mimetype='application/json') - - + return Response(json.dumps(relays, cls=ResultEncoder), mimetype='application/json') @app.route('/result', methods=['GET']) def result():

1 0

[compass/master] Completely rebuilt and sanitized the way sorting works.
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 90927efb83c3d8ffb68ed51470b2b0785dc502be Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Sun Dec 23 00:30:27 2012 -0500 Completely rebuilt and sanitized the way sorting works. There is now a directive to make a sortable-header which auto-shows a loading indicator. --- static/img/ajax-loader.gif | Bin 0 -> 2545 bytes static/js/angularize.js | 75 ++++++++++++++++++++------------------------ templates/index.html | 55 +++++++++++++++++++++++--------- 3 files changed, 74 insertions(+), 56 deletions(-) diff --git a/static/img/ajax-loader.gif b/static/img/ajax-loader.gif new file mode 100644 index 0000000..71e29bc Binary files /dev/null and b/static/img/ajax-loader.gif differ diff --git a/static/js/angularize.js b/static/js/angularize.js index bd786fd..9c6614e 100644 --- a/static/js/angularize.js +++ b/static/js/angularize.js @@ -1,4 +1,4 @@ -var compassModule = angular.module("Compass", ['ui']) +var compassModule = angular.module("Compass", ['ui','oblique.directives']) compassModule.value('ui.config', { select2: { @@ -21,22 +21,39 @@ compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http) { sort: 'cw', reverse: true } - - // We set this to true if the request - // asked for all of the relays - $scope.full_request = false - $scope.request = function(success_cb) { + /** Make a sorting request + * + * Call 'success_cb' if the request is successful + */ + $scope.ajax_sort = function(sortBy, invert, success_cb) { + $scope.query.sort = sortBy + $scope.query.sort_reverse = invert - if ($scope.state != 'sorting') { - $scope.state = 'loading' - } + $http.get('result.json',{"params":$scope.query}) + .success(function(data) { + if (data.results.length > 0) { + $scope.data = data - if ($scope.query.top == '-1') { - $scope.full_request = true - } else { - $scope.full_request = false - } + if (success_cb !== null){ + success_cb() + } + + $('body').animate({scrollTop:$("div#result_table").offset().top},500) + } + else { + $scope.state = "result_empty" + } + }) + + } + + /** Make a data request from the form + * + * Call 'success_cb' if the request is successful + */ + $scope.request = function(success_cb) { + $scope.state = 'loading' $http.get('result.json',{"params":$scope.query}) .success(function(data) { @@ -44,10 +61,11 @@ compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http) { $scope.data = data $scope.state = "loaded" if (success_cb != null){ - success_cb + success_cb() } + $('body').animate({scrollTop:$("div#result_table").offset().top},500) } - else { + else { $scope.state = "result_empty" } }) @@ -57,31 +75,6 @@ compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http) { $scope.state="hidden" } - $scope.setsort = function(field,init) { - $scope.state = 'sorting' - - if (field == $scope.query.sort) { - $scope.query.sort_reverse = !($scope.query.sort_reverse) - } - else { - $scope.query.sort = field - $scope.query.sort_reverse = init - } - - if (! $scope.full_request) { - // We don't have the data we need to sort - $scope.request($scope.query, function() { - $scope.table.sort = $scope.query.sort - $scope.table.reverse = $scope.query.sort_reverse - }); - } - else { - $scope.table.sort = $scope.query.sort - $scope.table.reverse = $scope.query.sort_reverse - } - - } - $http.get("static/data/cc.json").success(function(data) { $scope.cc_data = data }) diff --git a/templates/index.html b/templates/index.html index 3eb6442..741a176 100644 --- a/templates/index.html +++ b/templates/index.html @@ -163,24 +163,48 @@ <div class="hero-unit" ng-show="state == 'result_empty'"> <p>No results found</p> </div> - <div class="hero-unit" ng-show="state == 'loaded' || state == 'sorting'"> + <div id='result_table' class="hero-unit" ng-show="state == 'loaded' || state == 'sorting'"> <table class="table table-striped"> <thead> <tr> - <th ng-click="setsort('index',false)">#</th> - <th ng-click="setsort('cw', true)"> - <span rel="tooltip" title="Relative bandwidth weight assigned to this relay by the directory authorities">Consensus Weights</span> + <th >#</th> + <th sortable='ajax_sort' ui-jq='tooltip' sort_by='cw' invert='true' + class='spinner-small' + icon="static/img/ajax-loader.gif" + title="Relative bandwidth weight assigned to this relay by the directory authorities"> + Consensus Weights </th> - <th ng-click="setsort('adv_bw',true)"><span rel="tooltip" title="Relative advertised bandwidth of this relay compared to the total advertised bandwidth in the network">Advertised Bandwidth</span></th> - <th ng-click="setsort('p_guard',true)"><span rel="tooltip" title=" Probability of this relay to be selected for the guard position">Guard Probability</span></th> - <th ng-click="setsort('p_middle',true)"><span rel="tooltip" title="Probability of this relay to be selected for the middle position">Middle Probability</span></th> - <th ng-click="setsort('p_exit',true)"><span rel="tooltip" title="Probability of this relay to be selected for the exit position">Exit Probability</span></th> - <th ng-click="setsort('nick',false)">Nickname</th> - <th ng-click="setsort('fp',false)">Fingerprint</th> - <th ng-click="setsort('exit',false)">Exit</th> - <th ng-click="setsort('guard',false)">Guard</th> - <th ng-click="setsort('cc',false)">Country</th> - <th ng-click="setsort('as_info',false)">Autonomous System</th> + <th sortable='ajax_sort' ui-jq='tooltip' sort_by='adv_bw' invert='true' + class='spinner-small' + icon="static/img/ajax-loader.gif" + title="Relative advertised bandwidth of this relay compared to the total advertised bandwidth in the network">Advertised Bandwidth</th> + <th sortable='ajax_sort' ui-jq='tooltip' sort_by='p_guard' invert=true + icon="static/img/ajax-loader.gif" class='spinner-small' + title=" Probability of this relay to be selected for the guard position">Guard Probability</th> + <th sortable='ajax_sort' ui-jq='tooltip' sort_by='p_middle' invert=true + icon="static/img/ajax-loader.gif" class='spinner-small' + title="Probability of this relay to be selected for the middle position"> Middle Probability</th > + <th sortable='ajax_sort' ui-jq='tooltip' sort_by='p_exit' invert=true + icon="static/img/ajax-loader.gif" class='spinner-small' + title="Probability of this relay to be selected for the exit position" > Exit Probability</th > + <th sortable='ajax_sort' sort_by='nick' invert=false + icon="static/img/ajax-loader.gif" class='spinner-small' + >Nickname</th> + <th sortable='ajax_sort' sort_by='fp' invert=false + icon="static/img/ajax-loader.gif" class='spinner-small' + >Fingerprint</th> + <th sortable='ajax_sort' sort_by='exit' invert=false + icon="static/img/ajax-loader.gif" class='spinner-small' + >Exit</th> + <th sortable='ajax_sort' sort_by='guard' invert=false + icon="static/img/ajax-loader.gif" class='spinner-small' + >Guard</th> + <th sortable='ajax_sort' sort_by='cc' invert=false + icon="static/img/ajax-loader.gif" class='spinner-small' + >Country</th> + <th sortable='ajax_sort' sort_by='as_info' invert=false + icon="static/img/ajax-loader.gif" class='spinner-small' + >Autonomous System</th> </tr> </thead> <tfoot> @@ -214,7 +238,7 @@ </tr> </tfoot> <tbody> - <tr ng-repeat="relay in data.results | orderBy:table.sort:table.reverse"> + <tr ng-repeat="relay in data.results "> <td> {{ relay.index }} </td> <td> {{ relay.cw | number:4 }}%</td> <td> {{ relay.adv_bw | number:4}}%</td> @@ -254,6 +278,7 @@ <script src="static/lib/select2/select2.js" type="text/javascript"></script> <script src="static/js/angular/angular.js"> </script> <script src="static/lib/angular-ui/angular-ui.js"></script> + <script src="static/js/sortable.js"></script> <script src="static/js/angularize.js"></script> </body> </html>

1 0

[compass/master] Bolded the 'extra stuff' heading in the table
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 5ec0d6419bbf560bfa19bd8cc7d4d2eeed596eb6 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Sun Dec 23 00:31:01 2012 -0500 Bolded the 'extra stuff' heading in the table --- templates/index.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/index.html b/templates/index.html index 87c0d4b..3183084 100644 --- a/templates/index.html +++ b/templates/index.html @@ -218,7 +218,7 @@ <td>{{ data.excluded.p_guard | number:4 }}%</td> <td>{{ data.excluded.p_middle | number:4 }}%</td> <td>{{ data.excluded.p_exit | number:4 }}%</td> - <td>{{ data.excluded.nick }}</td> + <td id="extra_table_title">{{ data.excluded.nick }}</td> <td> {{data.excluded.fp }} </td> <td>{{ data.excluded.exit }}</td> <td>{{ data.excluded.guard }}</td> @@ -232,7 +232,7 @@ <td>{{ data.total.p_guard | number:4 }}%</td> <td>{{ data.total.p_middle | number:4 }}%</td> <td>{{ data.total.p_exit | number:4 }}%</td> - <td>{{ data.total.nick }}</td> + <td id='extra_table_title'>{{ data.total.nick }}</td> <td> {{data.total.fp }} </td> <td>{{ data.total.exit }}</td> <td>{{ data.total.guard }}</td>

1 0

[compass/master] Fixed display of links when grouping by country or AS.
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 6a4763db641317b30acfc3ea919f49fad3df427b Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Thu Dec 27 18:08:04 2012 -0500 Fixed display of links when grouping by country or AS. --- compass.py | 6 +++++- static/js/angularize.js | 2 +- static/js/directives.js | 37 +++++++++++++++++++++++++++++++++++++ static/js/filters.js | 26 ++++++++++++++++++++++++++ static/js/sortable.js | 37 ------------------------------------- templates/index.html | 8 ++++++-- util.py | 2 +- 7 files changed, 76 insertions(+), 42 deletions(-) diff --git a/compass.py b/compass.py index b83ee5f..7987e49 100755 --- a/compass.py +++ b/compass.py @@ -328,6 +328,10 @@ class RelayStats(object): # Add selected relays to the result set for i,relay in enumerate(relay_set): + # We have no links if we're grouping + if options.by_country or options.by_as: + relay.link = False + if i < options.top: relay.index = i + 1 output_relays.append(relay) @@ -381,8 +385,8 @@ class RelayStats(object): group_weights[weight] += relay.get(weight, 0) result.nick = relay['nickname'] - result.link = options.links result.fp = relay['fingerprint'] + result.link = options.links if 'Exit' in set(relay['flags']) and not 'BadExit' in set(relay['flags']): result.exit = 'Exit' diff --git a/static/js/angularize.js b/static/js/angularize.js index 9c6614e..35c7f5e 100644 --- a/static/js/angularize.js +++ b/static/js/angularize.js @@ -1,4 +1,4 @@ -var compassModule = angular.module("Compass", ['ui','oblique.directives']) +var compassModule = angular.module("Compass", ['ui','oblique.directives','oblique.filters']) compassModule.value('ui.config', { select2: { diff --git a/static/js/directives.js b/static/js/directives.js new file mode 100644 index 0000000..04c10a9 --- /dev/null +++ b/static/js/directives.js @@ -0,0 +1,37 @@ +// Generated by CoffeeScript 1.4.0 + +/* +This is part of the Oblique AngularJS components +available at http://github.com/cwacek/Oblique +*/ + + +(function() { + var module; + + module = angular.module('oblique.directives', []); + + module.directive('sortable', function() { + var linkFn; + linkFn = function(scope, element, attrs) { + return element.bind('click', function(event) { + var callback; + element.css('background-image', 'url("' + attrs.icon + '")'); + ' Call the requested function '; + + callback = scope.$eval(attrs.sortable); + callback(attrs.sortBy, attrs.invert, function() { + return element.css('background-image', ""); + }); + return attrs.invert = !attrs.invert; + }); + }; + return { + link: linkFn, + restrict: 'A', + link: linkFn, + scope: true + }; + }); + +}).call(this); diff --git a/static/js/filters.js b/static/js/filters.js new file mode 100644 index 0000000..4d8cc68 --- /dev/null +++ b/static/js/filters.js @@ -0,0 +1,26 @@ +// Generated by CoffeeScript 1.4.0 + +/* +This is part of the Oblique AngularJS components +available at http://github.com/cwacek/Oblique +*/ + + +(function() { + var module; + + module = angular.module('oblique.filters', []); + + module.filter('truncate', function() { + return function(input, limit, threshold) { + var out; + if (!limit || !threshold || input.length > threshold) { + out =input.substring(0, limit); + } else { + out = input; + } + return out; + }; + }); + +}).call(this); diff --git a/static/js/sortable.js b/static/js/sortable.js deleted file mode 100644 index 04c10a9..0000000 --- a/static/js/sortable.js +++ /dev/null @@ -1,37 +0,0 @@ -// Generated by CoffeeScript 1.4.0 - -/* -This is part of the Oblique AngularJS components -available at http://github.com/cwacek/Oblique -*/ - - -(function() { - var module; - - module = angular.module('oblique.directives', []); - - module.directive('sortable', function() { - var linkFn; - linkFn = function(scope, element, attrs) { - return element.bind('click', function(event) { - var callback; - element.css('background-image', 'url("' + attrs.icon + '")'); - ' Call the requested function '; - - callback = scope.$eval(attrs.sortable); - callback(attrs.sortBy, attrs.invert, function() { - return element.css('background-image', ""); - }); - return attrs.invert = !attrs.invert; - }); - }; - return { - link: linkFn, - restrict: 'A', - link: linkFn, - scope: true - }; - }); - -}).call(this); diff --git a/templates/index.html b/templates/index.html index 02aa99e..5105d28 100644 --- a/templates/index.html +++ b/templates/index.html @@ -249,7 +249,10 @@ <td>{{ relay.p_exit | number:4 }}%</td> <td>{{ relay.nick }}</td> <td> - <a href="https://atlas.torproject.org/#details/{{relay.fp}}" >{{relay.fp.substring(0,8)}}</a> + <span ng-show="relay.link"> + <a href="https://atlas.torproject.org/#details/{{relay.fp}}" >{{relay.fp | truncate:8:30}}</a> + </span> + <span ng-show="!relay.link">{{relay.fp | truncate:8:30}}</span> </td> <td>{{ relay.exit }}</td> <td>{{ relay.guard }}</td> @@ -280,7 +283,8 @@ <script src="static/lib/select2/select2.js" type="text/javascript"></script> <script src="static/js/angular/angular.js"> </script> <script src="static/lib/angular-ui/angular-ui.js"></script> - <script src="static/js/sortable.js"></script> + <script src="static/js/directives.js"></script> + <script src="static/js/filters.js"></script> <script src="static/js/angularize.js"></script> </body> </html> diff --git a/util.py b/util.py index 893abcc..7dfc543 100644 --- a/util.py +++ b/util.py @@ -41,7 +41,7 @@ class Result(): self.p_middle = 0.0 if zero_probs else None self.nick = "" self.fp = "" - self.link = "" + self.link = True self.exit = "" self.guard = "" self.cc = ""

1 0

[compass/master] Fixed some debugging things that shouldn't be there
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 4b86e4173bbdd7ebcb26fad669bed1393fb82c87 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Sun Dec 23 00:35:39 2012 -0500 Fixed some debugging things that shouldn't be there --- app.py | 3 +-- templates/index.html | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/app.py b/app.py index 665f9f2..5e78d05 100644 --- a/app.py +++ b/app.py @@ -174,5 +174,4 @@ def result(): if __name__ == '__main__': # Bind to PORT if defined, otherwise default to 5000. port = int(os.environ.get('PORT', 5000)) - app.debug=True - app.run(host='0.0.0.0', port=port, debug=True) + app.run(host='0.0.0.0', port=port) diff --git a/templates/index.html b/templates/index.html index 3183084..02aa99e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -154,7 +154,6 @@ <div class="form-actions"> <button class="btn btn-primary" ng-click="request()">Submit</button> <button class="btn" ng-click="reset()">Reset</button> - <span>{{state}}</span> </div> </fieldset> </form>

1 0

[compass/master] Added functionality to bookmark searches.
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit ab2769a7a9c454d5e6ecc0ce0be52d6ea673c9c7 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Fri Dec 28 00:59:25 2012 -0500 Added functionality to bookmark searches. Queries now update the location bar. This allows users to save the url as a saved query. The app also now watches for changes to the location bar query parameters, and uses those to load a saved search. Fixed a minor bug around country list parsing. --- static/js/angularize.js | 21 +++++++++++++++------ util.py | 5 ++++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/static/js/angularize.js b/static/js/angularize.js index 35c7f5e..81b7c27 100644 --- a/static/js/angularize.js +++ b/static/js/angularize.js @@ -7,20 +7,23 @@ compassModule.value('ui.config', { } }); -compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http) { +compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http,$location) { $scope.state = "hidden" $scope.query = { exit_filter:"all_relays", links:true, sort:'cw', - sort_reverse:true, country: null } - $scope.table = { - sort: 'cw', - reverse: true - } + + /** Watch the location bar to allow us to load saved searches **/ + $scope.$watch($location.search(), function(newv, oldv, scope) { + if ($location.search().top) { + $scope.query=$location.search() + $scope.request() + } + }) /** Make a sorting request * @@ -30,6 +33,9 @@ compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http) { $scope.query.sort = sortBy $scope.query.sort_reverse = invert + //Update the location bar to track sorting + $location.search($scope.query) + $http.get('result.json',{"params":$scope.query}) .success(function(data) { if (data.results.length > 0) { @@ -55,6 +61,9 @@ compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http) { $scope.request = function(success_cb) { $scope.state = 'loading' + //Set the location bar for this search + $location.search($scope.query) + $http.get('result.json',{"params":$scope.query}) .success(function(data) { if (data.results.length > 0) { diff --git a/util.py b/util.py index 7dfc543..2ae6a37 100644 --- a/util.py +++ b/util.py @@ -1,7 +1,10 @@ import json def Container(val): - return json.loads(val) + try: + return json.loads(val) + except ValueError: + return [] def NullFn(val): return val

1 0

[compass/master] Fixed a bug in initial sorting
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 585f0fc0bdf3b631e98a7e7b10a901bb5915857c Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Sat Dec 29 14:36:47 2012 -0500 Fixed a bug in initial sorting --- static/js/angularize.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/static/js/angularize.js b/static/js/angularize.js index 81b7c27..780e279 100644 --- a/static/js/angularize.js +++ b/static/js/angularize.js @@ -14,6 +14,7 @@ compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http,$locati exit_filter:"all_relays", links:true, sort:'cw', + sort_reverse: true, country: null }

1 0

[compass/master] Fixed relative path urls for apache
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 9e9e9db8b2eb172540c74053eee5195d29605c8d Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Mon Dec 31 11:28:44 2012 -0500 Fixed relative path urls for apache --- app.py | 3 ++- templates/index.html | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app.py b/app.py index 5e78d05..f323ebc 100644 --- a/app.py +++ b/app.py @@ -113,7 +113,8 @@ def parse(output_string, grouping=False, sort_key=None): @app.route('/') def index(): - return app.open_resource("templates/index.html").read() + + return app.open_resource("templates/index.html").read().replace('',request.script_root) @app.route('/result.json', methods=['GET']) def json_result(): diff --git a/templates/index.html b/templates/index.html index 5105d28..158ae53 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,6 +2,11 @@ <html lang="en" ng-app="Compass"> <head> <meta charset="utf-8"> +  + <base href="/"> <title>Compass</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="description" content="Tor relay stats"> @@ -160,7 +165,7 @@ </div> <div class="hero-unit" ng-show="state == 'loading'" > - <div class='loading'><img src="/static/img/loader.gif" /></div> + <div class='loading'><img src="static/img/loader.gif" /></div> </div> <div class="hero-unit" ng-show="state == 'result_empty'"> <p>No results found</p>

1 0

[compass/master] Included missing sortable.js asset
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit a9f525fff156e56022dbea1139471e6613f9cdc0 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Sun Dec 23 00:31:24 2012 -0500 Included missing sortable.js asset --- static/js/sortable.js | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/static/js/sortable.js b/static/js/sortable.js new file mode 100644 index 0000000..04c10a9 --- /dev/null +++ b/static/js/sortable.js @@ -0,0 +1,37 @@ +// Generated by CoffeeScript 1.4.0 + +/* +This is part of the Oblique AngularJS components +available at http://github.com/cwacek/Oblique +*/ + + +(function() { + var module; + + module = angular.module('oblique.directives', []); + + module.directive('sortable', function() { + var linkFn; + linkFn = function(scope, element, attrs) { + return element.bind('click', function(event) { + var callback; + element.css('background-image', 'url("' + attrs.icon + '")'); + ' Call the requested function '; + + callback = scope.$eval(attrs.sortable); + callback(attrs.sortBy, attrs.invert, function() { + return element.css('background-image', ""); + }); + return attrs.invert = !attrs.invert; + }); + }; + return { + link: linkFn, + restrict: 'A', + link: linkFn, + scope: true + }; + }); + +}).call(this);

1 0