Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of https://confluence.tngtech.com/plugins/servl…

  • Loading branch information...
commit 4e19c9520b93e91533428643d80b251b32b0bbc0 2 parents 2f3e3b4 + 581331d
Martin Sander authored
2  atlassian-extension.json
@@ -8,6 +8,6 @@
8 8 "url": "http://example.com/extension-homepage.html",
9 9 "email": "jane@example.com" },
10 10
11   - "screenshot": "screenshot.png",
  11 + "screenshot": "images/bad_ass.jpg",
12 12 "permissions": []
13 13 }
7 js/chuckNorris/main.js
@@ -20,12 +20,11 @@ $(document).ready(function() {
20 20
21 21 $('#chuckImage').load(function() {
22 22 $.ajax({
  23 + dataType: 'json',
23 24 url: 'http://api.icndb.com/jokes/random',
24 25 success: function(data) {
25   - var joke = JSON.parse(data);
26   -
27   - if (joke.type === 'success') {
28   - $('#chuck-norris-facts').html(joke.value.joke);
  26 + if (data.type === 'success') {
  27 + $('#chuck-norris-facts').text(data.value.joke.replace(/"/g, '"'));
29 28 }
30 29
31 30 }
10 ui/web-items.json
... ... @@ -1,11 +1,7 @@
1 1 /*
2   - Web Items allow you to insert navigation items (menu items, tabs etc) into
3   - various places within the product interface.
  2 + Web Items allow you to insert navigation items (menu items, tabs etc) into
  3 + various places within the product interface.
4 4 */
5 5 [
6   - { "section" : "speakeasy.user-profile/top",
7   - "label" : "Yahoo",
8   - "url" : "http://yahoo.com",
9   - "cssName" : "yahoo-web-item",
10   - "weight" : 40}
  6 +
11 7 ]

0 comments on commit 4e19c95

Please sign in to comment.
Something went wrong with that request. Please try again.