Fixing Youtube embeds and correctly handling keyboard events when sha…

…re is in transit.
i14h · Aug 27, 2012 · c3dbe76 · c3dbe76
1 parent 82060a6
commit c3dbe76
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/apps/api/views.py b/apps/api/views.py
@@ -15,7 +15,7 @@
 from apps.reader.models import UserSubscription, UserSubscriptionFolders
 from utils import json_functions as json
 from utils import log as logging
-from utils.scrubber import Scrubber
+from utils.scrubber import SelectiveScriptScrubber
 from utils.feed_functions import relative_timesince
 from utils.story_functions import strip_tags
 
@@ -257,7 +257,7 @@ def share_story(request, token):
 
     parsed_url = urlparse.urlparse(story_url)
     base_url = "%s://%s%s" % (parsed_url.scheme, parsed_url.hostname, parsed_url.path)
-    scrubber = Scrubber(base_url=base_url)
+    scrubber = SelectiveScriptScrubber(base_url=base_url)
     content = scrubber.scrub(content)
     title = strip_tags(title)
 

diff --git a/templates/api/share_bookmarklet.js b/templates/api/share_bookmarklet.js
@@ -16,7 +16,8 @@
         this.folders  = {{ folders|safe }};
         this.domain   = "{% current_domain %}";
         this.flags    = {
-            'new_folder': false
+            'new_folder': false,
+            'in_transit': false
         };
         this.images   = {
             'accept_image': "{{ accept_image }}"
@@ -407,10 +408,13 @@
             var $share = $(".NB-bookmarklet-comment-submit", this.$modal);
             var $error = $(".NB-bookmarklet-comment-error", this.$modal);
 
+            this.flags.in_transit = true;
+
             $error.html('');
             $share.addClass('NB-disabled').text('Sharing...');
             this.feed = this.feed || {};
 
+
             $.ajax({
                 url: '//'+this.domain+"{% url api-share-story token %}",
                 type: 'POST',
@@ -429,6 +433,7 @@
 
         post_share_story: function(data) {
             var $share = $(".NB-bookmarklet-comment-submit", this.$modal);
+            this.flags.in_transit = false;
 
             if (data.code < 0) {
                 return this.error_share_story(data);
@@ -448,6 +453,7 @@
         error_share_story: function(data) {
             var $share = $(".NB-bookmarklet-comment-submit", this.$modal);
             var $error = $(".NB-bookmarklet-comment-error", this.$modal);
+            this.flags.in_transit = false;
 
             $share.removeClass('NB-disabled');
             $error.show();
@@ -610,6 +616,8 @@
         },
 
         update_share_button_title: function() {
+            if (this.flags.in_transit) return;
+
             var $comment = $('textarea[name=newsblur_comment]', this.$modal);
             var $submit = $('.NB-bookmarklet-comment-submit', this.$modal);
             var $error = $(".NB-bookmarklet-comment-error", this.$modal);

diff --git a/utils/scrubber/__init__.py b/utils/scrubber/__init__.py
@@ -283,8 +283,8 @@ class SelectiveScriptScrubber(Scrubber):
     allowed_tags = Scrubber.allowed_tags | set(('script', 'noscript', 'iframe'))
     allowed_attributes = Scrubber.allowed_attributes | set(('scrolling', 'frameborder'))
 
-    def __init__(self):
-        super(SelectiveScriptScrubber, self).__init__()
+    def __init__(self, *args, **kwargs):
+        super(SelectiveScriptScrubber, self).__init__(*args, **kwargs)
 
         self.allowed_script_srcs = set((
             'http://www.statcounter.com/counter/counter_xhtml.js',
@@ -311,6 +311,8 @@ def __init__(self):
 
         self.allowed_iframe_srcs = set(re.compile(text) for text in (
             r'^http://www\.google\.com/calendar/embed\?[\w&;=\%]+$', # Google Calendar
+            r'^https?://www\.youtube\.com/', # YouTube
+            r'^http://player\.vimeo\.com/', # Vimeo
         ))
 
     def _scrub_tag_script(self, script):