[gitg] Signal when js has been loaded for initial diff
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Signal when js has been loaded for initial diff
- Date: Sun, 29 Jun 2014 07:59:43 +0000 (UTC)
commit f3b6b394cd966555300d1b12e0050f8bfe03bd42
Author: Jesse van den Kieboom <jessevdk gnome org>
Date: Sun Jun 29 09:58:54 2014 +0200
Signal when js has been loaded for initial diff
libgitg/gitg-diff-view.vala | 17 +++++++++--------
libgitg/resources/diff-view.js | 2 ++
2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/libgitg/gitg-diff-view.vala b/libgitg/gitg-diff-view.vala
index 34ca96d..9d0c2c1 100644
--- a/libgitg/gitg-diff-view.vala
+++ b/libgitg/gitg-diff-view.vala
@@ -36,6 +36,9 @@ namespace Gitg
case "selection-changed":
d_view.update_has_selection(parameter("value") ==
"yes");
break;
+ case "loaded":
+ d_view.loaded();
+ break;
}
return false;
@@ -334,14 +337,6 @@ namespace Gitg
d_loaded = false;
- load_changed.connect((v, ev) => {
- if (ev == WebKit.LoadEvent.FINISHED)
- {
- d_loaded = true;
- update();
- }
- });
-
// Load the diff base html
var uri = "gitg-diff:///resource/org/gnome/gitg/gtk/diff-view/diff-view.html?viewid="
+ s_diff_id.to_string();
@@ -355,6 +350,12 @@ namespace Gitg
Object();
}
+ public void loaded()
+ {
+ d_loaded = true;
+ update();
+ }
+
private void update()
{
if (!d_loaded)
diff --git a/libgitg/resources/diff-view.js b/libgitg/resources/diff-view.js
index 4cd46b4..68248ac 100644
--- a/libgitg/resources/diff-view.js
+++ b/libgitg/resources/diff-view.js
@@ -480,6 +480,8 @@ addEventListener('DOMContentLoaded', function () {
loader.attr('src', gravatar);
},
});
+
+ xhr_get('internal', {action: 'loaded'});
}, false);
// vi:ts=4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]