Merge lp:~daker/loco-team-portal/fix.1081783 into lp:loco-team-portal

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 642
Merged at revision: 643
Proposed branch: lp:~daker/loco-team-portal/fix.1081783
Merge into: lp:loco-team-portal
Diff against target: 25 lines (+6/-2)
1 file modified
loco_directory/media/js/jquery-pixie.js (+6/-2)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.1081783
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+163404@code.launchpad.net

Commit message

Fixed pix.ie issue

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/media/js/jquery-pixie.js'
2--- loco_directory/media/js/jquery-pixie.js 2012-12-09 15:08:12 +0000
3+++ loco_directory/media/js/jquery-pixie.js 2013-05-11 16:20:32 +0000
4@@ -24,7 +24,6 @@
5 perpage: options.amount,
6 sortby: 'recent',
7 extras: 'items_item_owner,items_item_Description,items_item_sizes_all',
8- callback: ''
9 };
10 options = $.extend(defaults, options);
11
12@@ -54,7 +53,12 @@
13 $('a.' + options.lightbox_class).lightBox();
14 }
15
16- $.getJSON('http://api.pix.ie/v0.81/account/' + options.id + '/photos.json?' + $.param(data) + '&jsonp=?', parseResponse);
17+ $.ajax({
18+ url: 'http://api.pix.ie/v0.81/account/' + options.id + '/photos.json?' + $.param(data),
19+ dataType: 'jsonp',
20+ cache: true,
21+ success: parseResponse
22+ });
23
24 // Return the html objects untouched (the photo's are added when loaded)
25 return this;

Subscribers

People subscribed via source and target branches