');
+ var droppedUrl;
+
+ if(!!droppedString)
+ {
+ droppedUrl = droppedString;
+ }
+ else if(!!$droppedElm.length)
+ {
+ $context.append($droppedElm);
+ droppedUrl = $context.find('[href]').attr('href');
+ }
+
+ if(!!droppedUrl && isValidUrl(droppedUrl))
+ {
+ $ui.urlInput.val(droppedUrl);
+ $ui.previewBtn.click();
+ }
+ });
+
+ $(document).on('dragover drop', function(event) {
+ event.preventDefault();
+ });
+ };
+
+ opinaryEmbed.prototype.cleanModel = function(){
+ return {
+ title: null,
+ url: null,
+ object_type: defaults.object_type
+ };
+ };
+
+ opinaryEmbed.prototype.clearForm = function($el) {
+ var self = this;
+
+ self.parent.clearForm($el, self);
+
+ showIntro(self);
+
+ self.$ui.previewPost.empty();
+ };
+
+ opinaryEmbed.prototype.getModelFromForm = function($form) {
+ var self = this;
+ var promise = $.Deferred();
+
+ // Gather fields data
+ self.parent.getModelFromForm($form.find('form').first(), self);
+
+ if(!!self.model.object_id)
+ {
+ // Not a new embed. Don't need to check for duplication when editing.
+ promise.resolve(self.model);
+ }
+ else
+ {
+ // Get Opinary embeds that have matching URL
+ EntityEmbed.apiService.get({
+ path: self.options.httpPaths.getAll,
+ data: {
+ url: self.model.url,
+ object_type: self.options.object_type
+ }
+ })
+ .done(function(resp) {
+ var items = resp.response && resp.response.data || [];
+
+ if(!!items.length && items[0].url === self.model.url)
+ {
+ // Use object_id from first item
+ self.model.object_id = items[0].object_id;
+ // Make sure original title is used
+ self.model.title = items[0].title;
+ self.$ui.titleInput.val(self.model.title);
+ }
+ })
+ .always(function() {
+ // Always resolve to keep things moving.
+ promise.resolve(self.model);
+ });
+ }
+
+ return promise;
+ };
+
+ opinaryEmbed.prototype.populateFormWithModel = function($form) {
+ var self = this;
+ var $ui = self.$ui;
+
+ self.parent.populateFormWithModel($form.find('form').first(), self);
+
+ // Show video player and title
+ if(!self.model.object_id)
+ {
+ showIntro(self);
+ }
+ else
+ {
+ showPreview(self);
+ }
+ };
+
+ opinaryEmbed.prototype.parseForEditor = function(){
+ var html = [
+ '
',
+ ''
+ ].join('');
+
+ return html;
+ };
+
+})();
\ No newline at end of file
diff --git a/src/js/embeds/twitterEmbed.js b/src/js/embeds/twitterEmbed.js
index a8d10cf..6cb571e 100644
--- a/src/js/embeds/twitterEmbed.js
+++ b/src/js/embeds/twitterEmbed.js
@@ -199,7 +199,7 @@ var EntityEmbed = EntityEmbed || {};
$.validator.addMethod('validTwitterUrl', function(value, element, params) {
var isValid = isValidUrl(value);
return this.optional(element) || isValid;
- }, 'The URL must be to a valid Facebook post or video.');
+ }, 'The URL must be to a valid Twitter status.');
$ui.previewBtn.on('click', function(evt) {
@@ -304,7 +304,7 @@ var EntityEmbed = EntityEmbed || {};
}
else
{
- // Get Video embeds that have matching URL
+ // Get Twitter embeds that have matching URL
EntityEmbed.apiService.get({
path: self.options.httpPaths.getAll,
data: {
diff --git a/src/js/embeds/videoEmbed.js b/src/js/embeds/videoEmbed.js
index 3d0195b..84a77ac 100644
--- a/src/js/embeds/videoEmbed.js
+++ b/src/js/embeds/videoEmbed.js
@@ -296,7 +296,7 @@ var EntityEmbed = EntityEmbed || {};
$.validator.addMethod('validVideoDomain', function(value, element, params) {
var isValid = value.indexOf('youtube.com') != -1 || value.indexOf('vimeo.com') != -1;
return this.optional(element) || isValid;
- }, 'The video must be from YouTube or Vimeo');
+ }, 'The video must be from YouTube or Vimeo.');
$ui.previewBtn.on('click', function(e) {
diff --git a/src/js/templateCache.js b/src/js/templateCache.js
old mode 100755
new mode 100644
index 7b72644..c5c14e5
--- a/src/js/templateCache.js
+++ b/src/js/templateCache.js
@@ -10,6 +10,7 @@ templateCache["modal/modal_image.html"] = "