From a2e7f6b541541974285d0e621068f7370bceb178 Mon Sep 17 00:00:00 2001 From: brunosimon Date: Sun, 14 Aug 2016 15:23:41 +0200 Subject: [PATCH] [update] Add label on tree --- site/public/javascript/controllers/project.js | 1 + site/public/javascript/services/project.js | 6 ++---- site/views/pages/index/project.jade | 6 ++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/site/public/javascript/controllers/project.js b/site/public/javascript/controllers/project.js index 6f00361..f319c31 100644 --- a/site/public/javascript/controllers/project.js +++ b/site/public/javascript/controllers/project.js @@ -43,6 +43,7 @@ application.controller( file = file.data; file.notif = 0; + file.new = false; file.active = true; $scope.file = file; diff --git a/site/public/javascript/services/project.js b/site/public/javascript/services/project.js index 9f35793..93ca165 100644 --- a/site/public/javascript/services/project.js +++ b/site/public/javascript/services/project.js @@ -83,6 +83,7 @@ application.factory( file = Object.assign( {}, data ); file.notif = 0; + file.new = true; for( var _version of file.versions ) { _version = reformat_version( _version ); @@ -93,8 +94,6 @@ application.factory( result.tree.add_file( data.path.full, file ) } - file.notif++; - // Apply callback if( typeof update_callback === 'function' ) update_callback.apply( this, [ data ] ); @@ -152,6 +151,7 @@ application.factory( // Format data file.notif = 0; + file.new = true; for( var _version of file.versions ) { _version = reformat_version( _version ); @@ -161,8 +161,6 @@ application.factory( result.tree.add_file( _file_key, file ) } - - file.notif++; } // Apply callback diff --git a/site/views/pages/index/project.jade b/site/views/pages/index/project.jade index 7933cd8..3f0a278 100644 --- a/site/views/pages/index/project.jade +++ b/site/views/pages/index/project.jade @@ -10,8 +10,10 @@ script(type="text/ng-template",id="folder_template.html") span(ng-click="file_click(_file)") i.fa.fa-file-text | {{_file.name}} - span.notif - | ({{_file.data.notif}}) + span.notif(ng-if="_file.data.notif") + | [{{_file.data.notif}}] + span.new(ng-if="_file.data.new") + | [new] section.page-project(ng-controller="ProjectController as controller",ng-init="init('" + project_slug + "')") aside.aside