Author: echatellier Date: 2013-08-22 21:16:31 +0200 (Thu, 22 Aug 2013) New Revision: 2926 Url: http://chorem.org/projects/jtimer/repository/revisions/2926 Log: Update to angular 1.2.0-rc1 Modified: branches/ng-jtimer/jtimer-server/src/main/config/wro.xml branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html branches/ng-jtimer/pom.xml Modified: branches/ng-jtimer/jtimer-server/src/main/config/wro.xml =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-08-22 19:16:31 UTC (rev 2926) @@ -1,7 +1,9 @@ <groups xmlns="http://www.isdc.ro/wro"> <group name='jtimer'> + <group-ref>jquery</group-ref> <group-ref>angular</group-ref> - <group-ref>jquery</group-ref> + <group-ref>angular-route</group-ref> + <group-ref>angular-animate</group-ref> <group-ref>bootstrap</group-ref> <group-ref>font-awesome</group-ref> <group-ref>moment</group-ref> Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-08-22 19:16:31 UTC (rev 2926) @@ -18,25 +18,24 @@ * - $toggleState une fonction qui permet de changer l'etat d'un noeud ('open' <-> 'close') * - * @param {ngAnimator} $animator permet l'ajout, suppression des noeuds dans le DOM + * @param {ngAnimate} $animator permet l'ajout, suppression des noeuds dans le DOM * @param {ngFilter} $filter permet de filtrer les elements de l'arbre a afficher (filtre, tri, ...) * @param {ngParse} $parse permet de parser des expressions qui doivent etre evaluer regulierement sur une scope */ -var wtTreeRepeatDirective = ['$animator', '$filter', '$parse', function($animator, $filter, $parse) { +var wtTreeRepeatDirective = ['$animate', '$filter', '$parse', function($animate, $filter, $parse) { return { transclude: 'element', priority: 1000, terminal: true, compile: function(element, attr, linker) { return function($scope, $element, $attr){ - var animate = $animator($scope, $attr); // use to add/remove element // sert a surveiller les changements sur la donnee ou les filtres // qui engendrerait un besoin de rafraichissement. // (ce tableau contient les fonctions permettant leur desenregistrement) var watchers = []; // element genere HTML et scope du dernier arbre represente - var cache = new Cache(animate); + var cache = new Cache($animate); // indique si l'element root doit etre affiche ou non (faux par defaut) var displayRoot = $parse($attr.wtDisplayRoot || 'false'); // indique si l'arbre doit etre ouvert de facon forcee ou non (faux par defaut) @@ -80,7 +79,7 @@ var update = function(tree) { // les objets HTML et scope utilise durant cette mise a jour // qui pourront etre reutilise durant la mis a jour suivante - var newCache = new Cache(animate); + var newCache = new Cache($animate); // l'index de parcours du noeud, on met dans un tableau // pour avoir une reference lors du passage en argument @@ -141,12 +140,12 @@ }); if (!isNewElement) { - animate.move(cacheEntry.element, null, lastElement); + $animate.move(cacheEntry.element, null, lastElement); lastElement = cacheEntry.element; newCache.put(node, cacheEntry.element, cacheEntry.scope); } else { linker(childScope, function(clone) { - animate.enter(clone, null, lastElement); + $animate.enter(clone, null, lastElement); lastElement = clone; newCache.put(node, clone, childScope); }); @@ -195,7 +194,7 @@ }]; -angular.module('webtimer', ['webtimerFilters']) +angular.module('webtimer', ['webtimerFilters', 'ngRoute', 'ngAnimate']) .config(['$routeProvider', function($routeProvider) { $routeProvider. when('/tasks', {templateUrl: 'partials/tasks.html', controller: TasksCtrl}). Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-08-22 19:16:31 UTC (rev 2926) @@ -1,49 +1,3 @@ -<script type="text/ng-template" id="tree_item_renderer_details.html"> - <div class="tr" ng-class="{'current-row' : ($node.task === currentTask), 'selected-row' : ($node.task === selectedTask)}" - ng-click="setSelectedTask($node.task)" - ng-dblclick="timeTask($node.task)" - ng-keydown="keyPressed($event)"> - <div class="td" ng-show="showName"> - <span class="spacer level{{$level}}"></span> - <i class="icon-ban-circle" ng-show="$state=='empty'"></i> - <i class="icon-plus-sign" ng-click="$toggleState()" ng-show="$state=='close'"></i> - <i class="icon-minus-sign" ng-click="$toggleState()" ng-show="$state=='open'"></i> - - <form ng-submit="saveTask($node)" ng-show="$node.edit == 'name'"> - <input ng-model="$node.task.name"> - </form> - - <span ng-click="editTask($node, 'name')" ng-show="$node.edit != 'name'">{{$node.task.name}} </span> - - <span class="btn-group action"> - <a class="btn btn-mini" href="" ng-click="timeTask($node.task)"> - <i ng-class="{'icon-play' : ($node.task != currentTask), 'icon-stop' : ($node.task == currentTask)}"></i> - </a> - <a class="btn btn-mini" href="" ng-click="addSubTask($node)"><i class="icon-plus"></i></a> - <a class="btn btn-mini" href="" ng-click="removeTask($node)"><i class="icon-minus"></i></a> - </span> - </div> - - <div class="td today" ng-show="showToday"> - {{$node.getTime().today | time}} - </div> - - <div class="td global" ng-show="showGlobal">{{$node.getTime().global | time}}</div> - - <div class="td tags" ng-show="showTags" ng-click="editTask($node, 'tags')"> - <form ng-submit="saveTask($node)" ng-show="$node.edit == 'tags'"> - <input ng-model="$node.task.tags" ng-list> - </form> - - <span class="label label-info" ng-repeat="tag in $node.task.tags" style="margin-right: 10px;" ng-show="$node.edit != 'tags'"> - {{tag}} - </span> - - <span ng-show="$node.task.tags.length == 0 && $node.edit != 'tags'">No tag</span> - </div> - </div> -</script> - <div id="header"> <span class='left'> <input class='search-query input-small' ng-model="query" placeholder="Search"> @@ -79,10 +33,55 @@ <div class='th global' ng-show="showGlobal">Total</div> <div class='th tags' ng-show="showTags">Tags</div> </div> + <div class="tbody" wt-tree-repeat="tree | filter:query | orderBy:'task.name'" - wt-force-open="query || forceExpanded" - ng-include="'tree_item_renderer_details.html'"></div> + wt-force-open="query || forceExpanded"> + <div class="tr" ng-class="{'current-row' : ($node.task === currentTask), 'selected-row' : ($node.task === selectedTask)}" + ng-click="setSelectedTask($node.task)" + ng-dblclick="timeTask($node.task)" + ng-keydown="keyPressed($event)"> + <div class="td" ng-show="showName"> + <span class="spacer level{{$level}}"></span> + <i class="icon-ban-circle" ng-show="$state=='empty'"></i> + <i class="icon-plus-sign" ng-click="$toggleState()" ng-show="$state=='close'"></i> + <i class="icon-minus-sign" ng-click="$toggleState()" ng-show="$state=='open'"></i> + + <form ng-submit="saveTask($node)" ng-show="$node.edit == 'name'"> + <input ng-model="$node.task.name"> + </form> + + <span ng-click="editTask($node, 'name')" ng-show="$node.edit != 'name'">{{$node.task.name}} </span> + + <span class="btn-group action"> + <a class="btn btn-mini" href="" ng-click="timeTask($node.task)"> + <i ng-class="{'icon-play' : ($node.task != currentTask), 'icon-stop' : ($node.task == currentTask)}"></i> + </a> + <a class="btn btn-mini" href="" ng-click="addSubTask($node)"><i class="icon-plus"></i></a> + <a class="btn btn-mini" href="" ng-click="removeTask($node)"><i class="icon-minus"></i></a> + </span> + </div> + + <div class="td today" ng-show="showToday"> + {{$node.getTime().today | time}} + </div> + + <div class="td global" ng-show="showGlobal">{{$node.getTime().global | time}}</div> + + <div class="td tags" ng-show="showTags" ng-click="editTask($node, 'tags')"> + <form ng-submit="saveTask($node)" ng-show="$node.edit == 'tags'"> + <input ng-model="$node.task.tags" ng-list> + </form> + + <span class="label label-info" ng-repeat="tag in $node.task.tags" style="margin-right: 10px;" ng-show="$node.edit != 'tags'"> + {{tag}} + </span> + + <span ng-show="$node.task.tags.length == 0 && $node.edit != 'tags'">No tag</span> + </div> + </div> + </div> + </div> </div> Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/pom.xml 2013-08-22 19:16:31 UTC (rev 2926) @@ -53,7 +53,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular</artifactId> - <version>1.1.5-1</version> + <version>1.2.0-rc1-1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId>