From 2d3356eb398eb7425f04e8fd8774648477880c8e Mon Sep 17 00:00:00 2001 From: Arvind Date: Mon, 7 Jul 2014 18:08:06 +0530 Subject: [PATCH] Adding changes of swtmaker.js, checks if a given URL is an image or not, loads the respective component of swtr app. --- swtr/static/js/swtmaker.js | 81 ++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/swtr/static/js/swtmaker.js b/swtr/static/js/swtmaker.js index ef002f5..86c89c3 100644 --- a/swtr/static/js/swtmaker.js +++ b/swtr/static/js/swtmaker.js @@ -67,13 +67,13 @@ return false; } /*if(!swtr.access_token) { - throw new Error('Access Token required to get query that API'); - }*/ + throw new Error('Access Token required to get query that API'); + }*/ // setting up params var where = options.where, who = options.who || null; - url = swtr.swtstoreURL() + swtr.endpoints.get + '?where=' + - encodeURIComponent(where) + '&access_token=' + swtr.access_token; + url = swtr.swtstoreURL() + swtr.endpoints.get + '?where=' + + encodeURIComponent(where) + '&access_token=' + swtr.access_token; if(who) { url += '&who=' + who; } @@ -108,7 +108,7 @@ } var url = swtr.swtstoreURL() + swtr.endpoints.post + - '?access_token=' + swtr.access_token; + '?access_token=' + swtr.access_token; this.sync('create', dummy_collection, { url: url, @@ -294,19 +294,26 @@ }, setImage: function(event) { event.preventDefault(); - this.imgURL = $('#img-url-input').val(); - if(!this.imgURL) { + var url = $('#img-url-input').val(); + if(url.contains('.jpg') || url.contains('.png') || + url.contains('.gif') || url.contains('.jpeg')) { + this.imgURL = $('#img-url-input').val(); + if(!this.imgURL) { + return false; + } + if(this.$img.attr('src') === this.imgURL) { + return; + } + anno.reset(); + var self = this; + this.$overlay.show(); + this.helpview.step(7); + this.$img.attr('src', this.imgURL); return false; } - if(this.$img.attr('src') === this.imgURL) { - return; + else { + window.location.href = '/annotate?where=' + url; } - anno.reset(); - var self = this; - this.$overlay.show(); - this.helpview.step(7); - this.$img.attr('src', this.imgURL); - return false; }, imageLoaded: function(event) { var self = event.data; @@ -534,28 +541,28 @@ step: function(n) { var text = ''; switch (n) { - case 0 : text = 'Getting annotations..'; - break; - case 1: text = 'Enter the URL of an image below, and start annotating!'; - break; - case 2: text = 'Annotate the image, or see other annotations'; - break; - case 3: text = 'Now you can sweet this annotation, or add more annotations'; - break; - case 4: text = 'Click Sweet button to publish these annotations to the Sweet Store'; - break; - case 5: text = 'Publishing your sweets'; - break; - case 6: text = 'Sweets successfully posted'; - break; - case 7: text = 'Fetching your image..'; - break; - case 8: text = 'Oops! Seems like the image URL is wrong! Or we couldn\'t fetch the image.'; - break; - case 9: text = 'You have to be signed in to sweet store to post sweets'; - break; - case 10: text = 'Oops! Something went wrong. We couldn\'t publish the sweets. Try again.' - break; + case 0 : text = 'Getting annotations..'; + break; + case 1: text = 'Enter the URL of an image below, and start annotating!'; + break; + case 2: text = 'Annotate the image, or see other annotations'; + break; + case 3: text = 'Now you can sweet this annotation, or add more annotations'; + break; + case 4: text = 'Click Sweet button to publish these annotations to the Sweet Store'; + break; + case 5: text = 'Publishing your sweets'; + break; + case 6: text = 'Sweets successfully posted'; + break; + case 7: text = 'Fetching your image..'; + break; + case 8: text = 'Oops! Seems like the image URL is wrong! Or we couldn\'t fetch the image.'; + break; + case 9: text = 'You have to be signed in to sweet store to post sweets'; + break; + case 10: text = 'Oops! Something went wrong. We couldn\'t publish the sweets. Try again.' + break; } $(this.el).html(text); $(window).scrollTop(0, 0); -- 1.7.10.4