diff --git a/media/js/src/modules/site.js b/media/js/src/modules/site.js index f7b6a92..127314c 100644 --- a/media/js/src/modules/site.js +++ b/media/js/src/modules/site.js @@ -76,7 +76,7 @@ return false; }); - $('div.modal a.close').click(function() { + $('section.main').on('click', 'a.close', function() { $(this).parent().parent().modal('hide'); window.ui_halted = false; return false; diff --git a/media/js/src/modules/snipt.js b/media/js/src/modules/snipt.js index f3f8a8f..45be1e6 100644 --- a/media/js/src/modules/snipt.js +++ b/media/js/src/modules/snipt.js @@ -72,7 +72,7 @@ window.$selected = false; }, detail: function() { - window.location = this.model.get('get_absolute_url'); + window.location = this.model.get('absolute_url'); }, edit: function() { @@ -336,7 +336,7 @@ created: $created.attr('title'), created_formatted: $created.text(), embed_url: $('div.embed-url', $el).text(), - get_absolute_url: $h1.attr('href'), + absolute_url: $h1.attr('href'), id: parseInt($el.attr('id').replace('snipt-', ''), 0), key: $('div.key', $el).text(), lexer: $('div.lexer', $el).text(), @@ -350,7 +350,7 @@ tags_list: $('div.tags-list', $el).text(), title: $h1.text(), user: { - get_absolute_url: $user.attr('href'), + absolute_url: $user.attr('href'), username: $user.text() } }; @@ -376,6 +376,7 @@ title: '', lexer: 'text', lexer_name: 'Text only', + new_from_js: true, user: { username: '' } diff --git a/snipts/api.py b/snipts/api.py index eee3b05..e458e13 100644 --- a/snipts/api.py +++ b/snipts/api.py @@ -53,7 +53,7 @@ class PublicSniptResource(ModelResource): class Meta: queryset = Snipt.objects.filter(public=True).order_by('-created') resource_name = 'snipt' - fields = ['title', 'slug', 'lexer', 'code', 'line_count', + fields = ['id', 'title', 'slug', 'lexer', 'code', 'line_count', 'stylized', 'created', 'modified',] include_absolute_url = True allowed_methods = ['get'] diff --git a/snipts/templates/snipts/snipt-js-template.html b/snipts/templates/snipts/snipt-js-template.html index 31080cc..70a6236 100644 --- a/snipts/templates/snipts/snipt-js-template.html +++ b/snipts/templates/snipts/snipt-js-template.html @@ -7,7 +7,7 @@

<%= snipt.lexer_name %>

-

<%= snipt.title %>

+

<%= snipt.title %>

<%= snipt.stylized %> @@ -51,9 +51,11 @@