furk4ngg/keppler
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/brunosimon/keppler

Browse Source
This commit is contained in:
Bruno SIMON
2016-09-16 17:25:29 +02:00
parent 3407481ceb 7d1b204446
commit 80580433ac
23 changed files with 843 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site/public/javascript/services/project.js
+34 -2
View File
@@ -16,6 +16,20 @@ application.factory(
_version.date_formated = _version.moment_date.format( 'LTS' );
_version.time_from_now = _version.moment_date.fromNow();
// Project last update date
if( _version.moment_date.isAfter( result.last_update_moment_date ) )
{
result.last_update_moment_date = _version.moment_date;
result.last_update_date_formated = _version.date_formated;
result.last_update_time_from_now = _version.time_from_now;
}
// Lines
_version.lines = [];
var length = _version.content.split(/\r\n|\r|\n/).length;
for( var i = 1; i < length + 1; i++ )
_version.lines.push( i );
// Differences
var count = 0,
modified = 0;
@@ -65,6 +79,7 @@ application.factory(
'html' : [ 'html', 'htm' ],
'sass' : [ 'sass', 'scss' ],
'less' : [ 'less' ],
'stylus' : [ 'stylus', 'styl' ],
'css' : [ 'css' ],
'php' : [ 'php' ],
'json' : [ 'json' ],
@@ -105,7 +120,9 @@ application.factory(
var result = {};
result.name = '';
result.files = {};
result.tree = new Tree( { auto_wash: false } );
result.files_count = 0;
result.tree = new FileTree( { auto_wash: false } );
result.date_formated = '';
result.on_update = null;
result.on_new_version = null;
@@ -134,6 +151,8 @@ application.factory(
result.files[ data.path.full ] = file;
result.tree.add_file( data.path.full, file )
result.files_count++;
}
// Apply callback
@@ -170,6 +189,8 @@ application.factory(
{
result.tree.remove_file( file.path.full )
result.files_count--;
delete result.files[ data.path.full ]
// Apply callback
@@ -181,7 +202,18 @@ application.factory(
// Update project event
socket.on( 'update_project', function( data )
{
result.name = data.name;
result.name = data.name;
result.files_count = data.files.count;
// Date
result.moment_date = moment( data.date );
result.date_formated = result.moment_date.format( 'LTS' );
result.time_from_now = result.moment_date.fromNow();
// Last update date
result.last_update_moment_date = moment( data.last_update_date );
result.last_update_date_formated = result.last_update_moment_date.format( 'LTS' );
result.last_update_time_from_now = result.last_update_moment_date.fromNow();
// Duplicate files
for( var _file_key in data.files.items )