Commit 798d283a authored by Leo Iannacone's avatar Leo Iannacone

Merge branch 'develop' into portable

parents 7648ccbe 54946d83
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
, "version": "0.0.1" , "version": "0.0.1"
, "private": true , "private": true
, "dependencies": { , "dependencies": {
"express": "3.4.8" "express": "3.x"
, "ejs": ">= 0.0.1" , "ejs": ">= 0.0.1"
, "socket.io": "*" , "socket.io": "*"
, "tail": "*" , "tail": "*"
......
...@@ -112,8 +112,8 @@ function Page_Distrubion(socket) ...@@ -112,8 +112,8 @@ function Page_Distrubion(socket)
$('#packages ul').append('<li class="text-muted">No packages yet</li>') $('#packages ul').append('<li class="text-muted">No packages yet</li>')
} }
packages.show() packages.show()
sticky.reset()
}, },
clean: function () { clean: function () {
$('#packages ul').html('') $('#packages ul').html('')
}, },
...@@ -180,7 +180,7 @@ function Page_Distrubion(socket) ...@@ -180,7 +180,7 @@ function Page_Distrubion(socket)
$('#logs').show() $('#logs').show()
files.select() files.select()
} }
if (socket_data.package.debs && socket_data.package.debs.length > 0) { if (socket_data.package.debs && socket_data.package.debs.length > 0) {
// update view // update view
view.package.debs = Utils.clone(socket_data.package.debs) view.package.debs = Utils.clone(socket_data.package.debs)
...@@ -190,7 +190,7 @@ function Page_Distrubion(socket) ...@@ -190,7 +190,7 @@ function Page_Distrubion(socket)
}) })
$('#debs').show() $('#debs').show()
} }
if (socket_data.package.sources && socket_data.package.sources.length > 0) { if (socket_data.package.sources && socket_data.package.sources.length > 0) {
// update view // update view
view.package.sources = Utils.clone(socket_data.package.sources) view.package.sources = Utils.clone(socket_data.package.sources)
...@@ -201,6 +201,7 @@ function Page_Distrubion(socket) ...@@ -201,6 +201,7 @@ function Page_Distrubion(socket)
$('#sources').show() $('#sources').show()
} }
files.show() files.show()
sticky.reset()
}, },
clean: function() { clean: function() {
$('#logs ul').html(''); $('#logs ul').html('');
...@@ -251,7 +252,7 @@ function Page_Distrubion(socket) ...@@ -251,7 +252,7 @@ function Page_Distrubion(socket)
append: function(new_content) { append: function(new_content) {
var content = $("#file pre") var content = $("#file pre")
content.append(new_content) content.append(new_content)
if (config.preferences.autoscroll) { if (config.preferences.autoscroll) {
// scroll down if file is covering footer // scroll down if file is covering footer
var file_height = $("#fileOffset").offset().top var file_height = $("#fileOffset").offset().top
...@@ -432,7 +433,7 @@ function Page_Distrubion(socket) ...@@ -432,7 +433,7 @@ function Page_Distrubion(socket)
} }
$("#file pre").css('font-size', config.preferences.file_fontsize) $("#file pre").css('font-size', config.preferences.file_fontsize)
} }
var select = function() { var select = function() {
unselect() unselect()
if (Utils.check_view_distribution(view)) { if (Utils.check_view_distribution(view)) {
...@@ -464,7 +465,7 @@ function Page_Distrubion(socket) ...@@ -464,7 +465,7 @@ function Page_Distrubion(socket)
if ( ! old_view if ( ! old_view
|| ! Utils.check_view_distribution(old_view) || ! Utils.check_view_distribution(old_view)
|| ! Utils.check_view_distribution(view) || ! Utils.check_view_distribution(view)
|| view.distribution.name != old_view.distribution.name || view.distribution.name != old_view.distribution.name
|| ! view.package.orig_name || ! view.package.orig_name
) )
{ // new distribution view { // new distribution view
......
...@@ -145,4 +145,5 @@ footer { ...@@ -145,4 +145,5 @@ footer {
#file .no-background { #file .no-background {
background: none; background: none;
border: none; border: none;
} color: #101010;
\ No newline at end of file }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment