diff --git a/media/system/js/repeatable-uncompressed.js b/media/system/js/repeatable-uncompressed.js
index 6357645ea231b..8e69e2e76d5b9 100644
--- a/media/system/js/repeatable-uncompressed.js
+++ b/media/system/js/repeatable-uncompressed.js
@@ -483,6 +483,12 @@
         		$select.attr('href', oldHref.replace(/&fieldid=(.+)&/, '&fieldid=' + inputId + '&'));
 				jMediaRefreshPreview(inputId);
         	});
+		
+		// fix media field in ISIS Template
+		$row.find('.field-media-wrapper').each(function(){
+			var $el = $(this);
+			$el.fieldMedia();
+		});
 
         	// another modals
         	if(window.SqueezeBox && window.SqueezeBox.assign){
diff --git a/media/system/js/repeatable.js b/media/system/js/repeatable.js
index c5c24dab085be..934f6d793e44a 100644
--- a/media/system/js/repeatable.js
+++ b/media/system/js/repeatable.js
@@ -1 +1 @@
-(function($){"use strict";$.JRepeatable=function(input,options){var self=this;if(!self||self===window){return new $.JRepeatable(input,options)}self.$input=$(input);if(self.$input.data("JRepeatable")){return self}self.$input.data("JRepeatable",self);self.init=function(){self.options=$.extend({},$.JRepeatable.defaults,options);self.$container=$(self.options.container);$("body").append(self.$container);self.$rowsContainer=self.$container.find(self.options.repeatableElement).parent();self.prepareModal();self.inputs=[];self.values={};self.prepareTemplate();var val=self.$input.val();if(val){try{self.values=JSON.parse(val)}catch(e){if(e instanceof SyntaxError){try{val=val.replace(/'/g,'"').replace(/\\"/g,"'");self.values=JSON.parse(val)}catch(e){if(window.console){console.log(e)}}}else if(window.console){console.log(e)}}}self.buildRows();$(document).on("click",self.options.btModalOpen,function(e){e.preventDefault();self.$modalWindow.modal("show")});self.$modalWindow.on("click",self.options.btModalClose,function(e){e.preventDefault();self.$modalWindow.modal("hide");self.buildRows()});self.$modalWindow.on("click",self.options.btModalSaveData,function(e){e.preventDefault();self.$modalWindow.modal("hide");self.refreshValue()});self.$container.on("click",self.options.btAdd,function(e){e.preventDefault();var after=$(this).parents(self.options.repeatableElement);if(!after.length){after=null}self.addRow(after)});self.$container.on("click",self.options.btRemove,function(e){e.preventDefault();var row=$(this).parents(self.options.repeatableElement);self.removeRow(row)});self.$input.trigger("weready")};self.prepareTemplate=function(){var $rows=self.$container.find(self.options.repeatableElement);var $row=$($rows.get(0));try{self.clearScripts($row)}catch(e){if(window.console){console.log(e)}}var inputs=$row.find("*[name]");for(var i=0,l=inputs.length;i<l;i++){var name=$(inputs[i]).attr("name");if(self.values[name]){continue}self.inputs.push({name:name,type:$(inputs[i]).attr("type")||inputs[i].tagName.toLowerCase()});self.values[name]=[]}self.template=$row.prop("outerHTML");$rows.remove();self.$input.trigger("prepare-template",self.template)};self.prepareModal=function(){var modalEl=$(self.options.modalElement);modalEl.css({position:"absolute",width:"auto","max-width":"100%"});modalEl.on("shown",function(){self.resizeModal()});$(window).resize(function(){self.resizeModal()});self.$modalWindow=modalEl.modal({show:false,backdrop:"static"});self.$input.trigger("prepare-modal",self.$modalWindow)};self.resizeModal=function(){if(!self.$modalWindow.is(":visible")){return}var docHalfWidth=$(document).width()/2,modalHalfWidth=self.$modalWindow.width()/2,rowsHalfWidth=self.$rowsContainer.width()/2,marginLeft=modalHalfWidth>=docHalfWidth?0:-modalHalfWidth,left=marginLeft?"50%":0,top=$(document).scrollTop()+$(window).height()*.2;self.$modalWindow.css({top:top,left:left,"margin-left":marginLeft,overflow:rowsHalfWidth>modalHalfWidth?"auto":"visible"})};self.buildRows=function(){var $oldRows=self.$rowsContainer.children();if($oldRows.length){self.removeRow($oldRows)}var count=self.values[Object.keys(self.values)[0]].length||1,row=null;for(var i=0;i<count;i++){row=self.addRow(row,i)}};self.addRow=function(after,valueKey){var count=self.$container.find(self.options.repeatableElement).length;if(count>=self.options.maximum){return null}var row=$.parseHTML(self.template);if(after){$(after).after(row)}else{self.$rowsContainer.append(row)}var $row=$(row);self.fixUniqueAttributes($row,count+1);if(valueKey!==null&&valueKey!==undefined){for(var i=0,l=self.inputs.length;i<l;i++){var name=self.inputs[i].name,type=self.inputs[i].type,value=null;if(self.values[name]){value=self.values[name][valueKey]}if(value===null||value===undefined){continue}if(type==="radio"){$row.find('*[name*="'+name+'"][value="'+value+'"]').attr("checked","checked")}else if(type==="checkbox"){if(value.length){for(var v=0,vl=value.length;v<vl;v++){$row.find('*[name*="'+name+'"][value="'+value[v]+'"]').attr("checked","checked")}}else{$row.find('*[name*="'+name+'"][value="'+value+'"]').attr("checked","checked")}}else{$row.find('*[name*="'+name+'"]').val(value)}}}try{self.fixScripts($row)}catch(e){if(window.console){console.log(e)}}self.$input.trigger("row-add",$row);return $row};self.removeRow=function(row){self.$input.trigger("row-remove",row);$(row).remove()};self.fixUniqueAttributes=function($row,count){var haveIds=$row.find("*[id]");self.increaseAttrName(haveIds,"id",count);var haveFor=$row.find("label[for]");self.increaseAttrName(haveFor,"for",count);var haveName=$row.find("*[name]");self.increaseAttrName(haveName,"name",count)};self.increaseAttrName=function(elements,attr,count){for(var i=0,l=elements.length;i<l;i++){var $el=$(elements[i]);var oldValue=$el.attr(attr);$el.attr(attr,count+"-"+oldValue)}};self.refreshValue=function(){var $rows=self.$container.find(self.options.repeatableElement);self.values={};for(var i=0,l=self.inputs.length;i<l;i++){var name=self.inputs[i].name,type=self.inputs[i].type;self.values[name]=[];for(var r=0,rl=$rows.length;r<rl;r++){var $row=$($rows[r]),val=null;if(type==="radio"){val=$row.find('*[name*="'+name+'"]:checked').val()}else if(type==="checkbox"){var checked=$row.find('*[name*="'+name+'"]:checked');if(checked.length>1){val=[];for(var c=0,cl=checked.length;c<cl;c++){val.push($(checked[c]).val())}}else{val=checked.val()}}else{val=$row.find('*[name*="'+name+'"]').val()}val=val===null?"":val;self.values[name].push(val)}}self.$input.val(JSON.stringify(self.values));self.$input.trigger("value-update",self.values)};self.clearScripts=function($row){if($.fn.chosen){$row.find("select").each(function(){var $el=$(this);if($el.data("chosen")){$el.chosen("destroy");$el.addClass("here-was-chosen")}})}if($.fn.minicolors){$row.find(".minicolors input").each(function(){$(this).minicolors("destroy",$(this))})}};self.fixScripts=function($row){if($.fn.chosen){$row.find("select.here-was-chosen").removeClass("here-was-chosen").chosen()}$row.find(".minicolors").each(function(){var $el=$(this);$el.minicolors({control:$el.attr("data-control")||"hue",position:$el.attr("data-position")||"right",theme:"bootstrap"})});$row.find('a[onclick*="jInsertFieldValue"]').each(function(){var $el=$(this),inputId=$el.siblings('input[type="text"]').attr("id"),$select=$el.prev(),oldHref=$select.attr("href");$el.attr("onclick","jInsertFieldValue('', '"+inputId+"');return false;");$select.attr("href",oldHref.replace(/&fieldid=(.+)&/,"&fieldid="+inputId+"&"));jMediaRefreshPreview(inputId)});if(window.SqueezeBox&&window.SqueezeBox.assign){SqueezeBox.assign($row.find("a.modal").get(),{parse:"rel"})}};self.init()};$.JRepeatable.defaults={modalElement:"#modal-container",btModalOpen:"#open-modal",btModalClose:".close-modal",btModalSaveData:".save-modal-data",btAdd:"a.add",btRemove:"a.remove",maximum:10,repeatableElement:"table tbody tr"};$.fn.JRepeatable=function(options){return this.each(function(){var options=options||{},data=$(this).data();for(var p in data){if(data.hasOwnProperty(p)){options[p]=data[p]}}new $.JRepeatable(this,options)})};$(window).on("load",function(){$("input.form-field-repeatable").JRepeatable()})})(jQuery);
\ No newline at end of file
+!function(e){"use strict";e.JRepeatable=function(t,n){var a=this;return a&&a!==window?(a.$input=e(t),a.$input.data("JRepeatable")?a:(a.$input.data("JRepeatable",a),a.init=function(){a.options=e.extend({},e.JRepeatable.defaults,n),a.$container=e(a.options.container),e("body").append(a.$container),a.$rowsContainer=a.$container.find(a.options.repeatableElement).parent(),a.prepareModal(),a.inputs=[],a.values={},a.prepareTemplate();var t=a.$input.val();if(t)try{a.values=JSON.parse(t)}catch(e){if(e instanceof SyntaxError)try{t=t.replace(/'/g,'"').replace(/\\"/g,"'"),a.values=JSON.parse(t)}catch(e){window.console&&console.log(e)}else window.console&&console.log(e)}a.buildRows(),e(document).on("click",a.options.btModalOpen,function(e){e.preventDefault(),a.$modalWindow.modal("show")}),a.$modalWindow.on("click",a.options.btModalClose,function(e){e.preventDefault(),a.$modalWindow.modal("hide"),a.buildRows()}),a.$modalWindow.on("click",a.options.btModalSaveData,function(e){e.preventDefault(),a.$modalWindow.modal("hide"),a.refreshValue()}),a.$container.on("click",a.options.btAdd,function(t){t.preventDefault();var n=e(this).parents(a.options.repeatableElement);n.length||(n=null),a.addRow(n)}),a.$container.on("click",a.options.btRemove,function(t){t.preventDefault();var n=e(this).parents(a.options.repeatableElement);a.removeRow(n)}),a.$input.trigger("weready")},a.prepareTemplate=function(){var t=a.$container.find(a.options.repeatableElement),n=e(t.get(0));try{a.clearScripts(n)}catch(e){window.console&&console.log(e)}for(var o=n.find("*[name]"),i=0,r=o.length;i<r;i++){var l=e(o[i]).attr("name");a.values[l]||(a.inputs.push({name:l,type:e(o[i]).attr("type")||o[i].tagName.toLowerCase()}),a.values[l]=[])}a.template=n.prop("outerHTML"),t.remove(),a.$input.trigger("prepare-template",a.template)},a.prepareModal=function(){var t=e(a.options.modalElement);t.css({position:"absolute",width:"auto","max-width":"100%"}),t.on("shown",function(){a.resizeModal()}),e(window).resize(function(){a.resizeModal()}),a.$modalWindow=t.modal({show:!1,backdrop:"static"}),a.$input.trigger("prepare-modal",a.$modalWindow)},a.resizeModal=function(){if(a.$modalWindow.is(":visible")){var t=e(document).width()/2,n=a.$modalWindow.width()/2,o=a.$rowsContainer.width()/2,i=n>=t?0:-n,r=i?"50%":0,l=e(document).scrollTop()+.2*e(window).height();a.$modalWindow.css({top:l,left:r,"margin-left":i,overflow:o>n?"auto":"visible"})}},a.buildRows=function(){var e=a.$rowsContainer.children();e.length&&a.removeRow(e);for(var t=a.values[Object.keys(a.values)[0]].length||1,n=null,o=0;o<t;o++)n=a.addRow(n,o)},a.addRow=function(t,n){var o=a.$container.find(a.options.repeatableElement).length;if(o>=a.options.maximum)return null;var i=e.parseHTML(a.template);t?e(t).after(i):a.$rowsContainer.append(i);var r=e(i);if(a.fixUniqueAttributes(r,o+1),null!==n&&void 0!==n)for(var l=0,d=a.inputs.length;l<d;l++){var s=a.inputs[l].name,c=a.inputs[l].type,p=null;if(a.values[s]&&(p=a.values[s][n]),null!==p&&void 0!==p)if("radio"===c)r.find('*[name*="'+s+'"][value="'+p+'"]').attr("checked","checked");else if("checkbox"===c)if(p.length)for(var u=0,f=p.length;u<f;u++)r.find('*[name*="'+s+'"][value="'+p[u]+'"]').attr("checked","checked");else r.find('*[name*="'+s+'"][value="'+p+'"]').attr("checked","checked");else r.find('*[name*="'+s+'"]').val(p)}try{a.fixScripts(r)}catch(e){window.console&&console.log(e)}return a.$input.trigger("row-add",r),r},a.removeRow=function(t){a.$input.trigger("row-remove",t),e(t).remove()},a.fixUniqueAttributes=function(e,t){var n=e.find("*[id]");a.increaseAttrName(n,"id",t);var o=e.find("label[for]");a.increaseAttrName(o,"for",t);var i=e.find("*[name]");a.increaseAttrName(i,"name",t)},a.increaseAttrName=function(t,n,a){for(var o=0,i=t.length;o<i;o++){var r=e(t[o]),l=r.attr(n);r.attr(n,a+"-"+l)}},a.refreshValue=function(){var t=a.$container.find(a.options.repeatableElement);a.values={};for(var n=0,o=a.inputs.length;n<o;n++){var i=a.inputs[n].name,r=a.inputs[n].type;a.values[i]=[];for(var l=0,d=t.length;l<d;l++){var s=e(t[l]),c=null;if("radio"===r)c=s.find('*[name*="'+i+'"]:checked').val();else if("checkbox"===r){var p=s.find('*[name*="'+i+'"]:checked');if(p.length>1){c=[];for(var u=0,f=p.length;u<f;u++)c.push(e(p[u]).val())}else c=p.val()}else c=s.find('*[name*="'+i+'"]').val();c=null===c?"":c,a.values[i].push(c)}}a.$input.val(JSON.stringify(a.values)),a.$input.trigger("value-update",a.values)},a.clearScripts=function(t){e.fn.chosen&&t.find("select").each(function(){e(this).data("chosen")&&e(this).chosen("destroy")}),e.fn.minicolors&&t.find(".minicolors input").each(function(){e(this).minicolors("destroy",e(this))})},a.fixScripts=function(t){t.find(".minicolors").each(function(){var t=e(this);t.minicolors({control:t.attr("data-control")||"hue",position:t.attr("data-position")||"right",theme:"bootstrap"})}),t.find('a[onclick*="jInsertFieldValue"]').each(function(){var t=e(this),n=t.siblings('input[type="text"]').attr("id"),a=t.prev(),o=a.attr("href");t.attr("onclick","jInsertFieldValue('', '"+n+"');return false;"),a.attr("href",o.replace(/&fieldid=(.+)&/,"&fieldid="+n+"&")),jMediaRefreshPreview(n)}),t.find(".field-media-wrapper").each(function(){e(this).fieldMedia()}),window.SqueezeBox&&window.SqueezeBox.assign&&SqueezeBox.assign(t.find("a.modal").get(),{parse:"rel"})},void a.init())):new e.JRepeatable(t,n)},e.JRepeatable.defaults={modalElement:"#modal-container",btModalOpen:"#open-modal",btModalClose:".close-modal",btModalSaveData:".save-modal-data",btAdd:"a.add",btRemove:"a.remove",maximum:10,repeatableElement:"table tbody tr"},e.fn.JRepeatable=function(t){return this.each(function(){var t=t||{},n=e(this).data();for(var a in n)n.hasOwnProperty(a)&&(t[a]=n[a]);new e.JRepeatable(this,t)})},e(window).on("load",function(){e("input.form-field-repeatable").JRepeatable()})}(jQuery);
\ No newline at end of file