app/assets/javascripts/spud/admin/media/picker.js in spud_media-0.9.5 vs app/assets/javascripts/spud/admin/media/picker.js in spud_media-0.9.6

- old
+ new

@@ -1,7 +1,7 @@ spud.admin.mediapicker = new function(){ - + var self = this; var supportsHtml5Upload = false; var selectedFile = {}; self.init = function(){ @@ -16,10 +16,11 @@ $('.spud_media_picker_button_insert').on('click', self.clickedInsert); $('.spud_media_picker_item').first().click(); $('.spud_media_picker_tabs a').first().click(); $('.spud_media_picker_tab_advanced').on('spud_media_picker_tab_activated', self.activatedAdvancedTab); $('.spud_media_picker_option_dimensions').on('blur', 'input', self.dimensionsChanged); + $('.spud_media_picker_option').on('keyup', 'input[type=text]', self.pickerOptionKeyDown); }; self.clickedTab = function(e){ e.preventDefault(); self.goToTab($(this).attr('href')); @@ -148,10 +149,11 @@ self.getOriginalImageDimensions(selectedFile.url); } else{ $('.spud_media_picker_option_target').show(); $('.spud_media_picker_option_text').show(); + $('.spud_media_picker_option_text input').val(tinyMCEPopup.editor.selection.getContent()); $('.spud_media_picker_option_float').hide(); $('.spud_media_picker_option_title').hide(); $('.spud_media_picker_option_dimensions').hide(); } }; @@ -160,11 +162,10 @@ self.getOriginalImageDimensions = function(url){ var img = new Image(); img.onload = function(){ _originalWidth = img.width; _originalHeight = img.height; - console.log(_originalWidth, _originalHeight); }; img.src = url; }; self.dimensionsChanged = function(e){ @@ -199,10 +200,20 @@ selectedFile.style = style; } else{ selectedFile.target = $('select[name="spud_media_picker_option_target"]').val(); selectedFile.text = $('input[name="spud_media_picker_option_text"]').val(); + if(!selectedFile.text){ + window.alert("Link Text is a required field."); + return; + } } tinyMCEPopup.editor.execCommand('spudMediaInsertSelected', false, selectedFile); tinyMCEPopup.close(); + }; + + self.pickerOptionKeyDown = function(e){ + if(e.keyCode == 13){ + self.clickedInsert(e); + } }; }; \ No newline at end of file