From a3eec668c5bfdfc4097e434000d5a4bdf06662df Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 28 Aug 2015 15:52:12 +0100 Subject: [PATCH] Tried to fix github readme decoding --- assets/build-assets.py | 2 +- package.json | 2 +- src/global.js | 6 ++++-- src/injections/github.js | 6 +++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/assets/build-assets.py b/assets/build-assets.py index 447816f..e13ca6c 100644 --- a/assets/build-assets.py +++ b/assets/build-assets.py @@ -23,7 +23,7 @@ image_decoder = {"images":images} image_decoder_json = json.dumps(image_decoder, indent=2, sort_keys=True) js_file = None -with open('src/injector.js', "r") as file: +with open('src/global.js', "r") as file: js_file = file.read() js_file = js_file.replace("%image_decoder%", image_decoder_json) diff --git a/package.json b/package.json index 5a87b9f..4cfc690 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build-chrome": "crx pack chrome -o chrome/hipchat-emoticons-for-all.crx", "release-chrome": "crx pack chrome -o chrome/hipchat-emoticons-for-all.crx -p chrome/key.pem", "test-firefox": "cd firefox/ && jpm run -b /usr/bin/firefox && cd -", - "test": "npm run build-assets && npm run build-js && npm run distribute && npm run test-firefox", + "test": "npm run develop && npm run test-firefox", "build-js": "bash build-js.sh", "develop": "npm run build-assets && npm run build-js && npm run distribute ", "build-assets": "python3 assets/build-assets.py", diff --git a/src/global.js b/src/global.js index 2d66ae5..d9f0093 100644 --- a/src/global.js +++ b/src/global.js @@ -1,7 +1,8 @@ function insert_emoticons(ident, classes) { classes = classes || ""; + decoder = image_decoder.images; + console.log("Replacing " + $(ident).length + " of " + ident); $(ident).each(function() { - decoder = image_decoder.images; for (var i = 0; i < decoder.length; i++) { key = Object.keys(decoder[i]); image = decoder[i][key]; @@ -11,6 +12,7 @@ function insert_emoticons(ident, classes) { )); } }); + console.log("Swapped " + ident); } function markdown_decoder(ident) { @@ -25,6 +27,6 @@ function markdown_decoder(ident) { } } -console.log("Hipchat-emoticons-for-all is enabled."); +console.log("Hipchat-emoticons-for-all is enabled on " + location.href); var image_decoder = %image_decoder% \ No newline at end of file diff --git a/src/injections/github.js b/src/injections/github.js index 9f6ec10..2bb1ef4 100644 --- a/src/injections/github.js +++ b/src/injections/github.js @@ -7,6 +7,7 @@ function change_readme() { } function change_wiki() { + console.log("Changing wiki"); insert_emoticons('#wiki-body'); } @@ -18,8 +19,11 @@ $('form .timeline-comment textarea[placeholder="Leave a comment"]').on('change i markdown_decoder('form .timeline-comment textarea[placeholder="Leave a comment"]'); }); +$('#wiki-body').on('load change', change_wiki); + $(document).on('ready', function() { + console.log("Ready"); change_comments(); change_readme(); - change_wiki(); }); +console.log('Github'); \ No newline at end of file