From 23babe6efd0912166785f99728a1a5a546304c2d Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanhammond@lavabit.com>
Date: Tue, 4 Mar 2014 12:47:22 +0100
Subject: [PATCH] Build minified js files

This is needed so that the js customizations on this branch get into the
package.
---
 ckan/public/base/javascript/modules/image-upload.min.js     | 2 +-
 ckan/public/base/javascript/modules/resource-reorder.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckan/public/base/javascript/modules/image-upload.min.js b/ckan/public/base/javascript/modules/image-upload.min.js
index 77e9a43b0bc..26b317849c9 100644
--- a/ckan/public/base/javascript/modules/image-upload.min.js
+++ b/ckan/public/base/javascript/modules/image-upload.min.js
@@ -1,2 +1,2 @@
 this.ckan.module('image-upload',function($,_){return{options:{is_url:true,is_upload:false,field_upload:'image_upload',field_url:'image_url',field_clear:'clear_upload',upload_label:'',i18n:{upload:_('Upload'),url:_('Link'),remove:_('Remove'),upload_label:_('Image'),upload_tooltip:_('Upload a file on your computer'),url_tooltip:_('Link to a URL on the internet (you can also link to an API)'),remove_tooltip:_('Reset this')},template:[''].join("\n")},state:{attached:1,blank:2,web:3},initialize:function(){$.proxyAll(this,/_on/);var options=this.options;var field_upload='input[name="'+options.field_upload+'"]';var field_url='input[name="'+options.field_url+'"]';var field_clear='input[name="'+options.field_clear+'"]';this.input=$(field_upload,this.el);this.field_url=$(field_url,this.el).parents('.control-group');this.field_image=this.input.parents('.control-group');var checkbox=$(field_clear,this.el);if(checkbox.length>0){options.is_upload=true;checkbox.parents('.control-group').remove();}
-this.field_clear=$('<input type="hidden" name="clear_upload">').appendTo(this.el);this.button_url=$('<a href="javascript:;" class="btn"><i class="icon-globe"></i> '+this.i18n('url')+'</a>').prop('title',this.i18n('url_tooltip')).on('click',this._onFromWeb).insertAfter(this.input);this.button_upload=$('<a href="javascript:;" class="btn"><i class="icon-cloud-upload"></i>'+this.i18n('upload')+'</a>').insertAfter(this.input);this.button_remove=$('<a href="javascript:;" class="btn btn-danger" />').text(this.i18n('remove')).on('click',this._onRemove).insertAfter(this.button_upload);$('<a href="javascript:;" class="btn btn-danger btn-remove-url"><i class="icon-remove"></i></a>').prop('title',this.i18n('remove_tooltip')).on('click',this._onRemove).insertBefore($('input',this.field_url));$('label[for="field-image-upload"]').text(options.upload_label||this.i18n('upload_label'));this.input.on('mouseover',this._onInputMouseOver).on('mouseout',this._onInputMouseOut).on('change',this._onInputChange).prop('title',this.i18n('upload_tooltip')).css('width',this.button_upload.outerWidth());this.fields=$('<i />').add(this.button_remove).add(this.button_upload).add(this.button_url).add(this.input).add(this.field_url).add(this.field_image);if(options.is_url){this.changeState(this.state.web);}else if(options.is_upload){this.changeState(this.state.attached);}else{this.changeState(this.state.blank);}},changeState:function(state){this.fields.hide();if(state==this.state.blank){this.button_upload.add(this.field_image).add(this.button_url).add(this.input).show();}else if(state==this.state.attached){this.button_remove.add(this.field_image).show();}else if(state==this.state.web){this.field_url.show();}},_onFromWeb:function(){this.changeState(this.state.web);$('input',this.field_url).focus();if(this.options.is_upload){this.field_clear.val('true');}},_onRemove:function(){this.changeState(this.state.blank);$('input',this.field_url).val('');this.field_clear.val('true');},_onInputChange:function(){this.file_name=this.input.val();this.field_clear.val('');this.changeState(this.state.attached);},_onInputMouseOver:function(){this.button_upload.addClass('hover');},_onInputMouseOut:function(){this.button_upload.removeClass('hover');}}});
\ No newline at end of file
+this.field_clear=$('<input type="hidden" name="clear_upload">').appendTo(this.el);this.button_url=$('<a href="javascript:;" class="btn"><i class="icon-globe"></i> '+this.i18n('url')+'</a>').prop('title',this.i18n('url_tooltip')).on('click',this._onFromWeb).insertAfter(this.input);this.button_upload=$('<a href="javascript:;" class="btn"><i class="icon-cloud-upload"></i>'+this.i18n('upload')+'</a>').insertAfter(this.input);this.button_remove=$('<a href="javascript:;" class="btn btn-danger" />').text(this.i18n('remove')).on('click',this._onRemove).insertAfter(this.button_upload);$('<a href="javascript:;" class="btn btn-danger btn-remove-url"><i class="icon-remove"></i></a>').prop('title',this.i18n('remove_tooltip')).on('click',this._onRemove).insertBefore($('input',this.field_url));$('label[for="field-image-upload"]').text(options.upload_label||this.i18n('upload_label'));this.input.on('mouseover',this._onInputMouseOver).on('mouseout',this._onInputMouseOut).on('change',this._onInputChange).prop('title',this.i18n('upload_tooltip')).css('width',this.button_upload.outerWidth());this.fields=$('<i />').add(this.button_remove).add(this.button_upload).add(this.button_url).add(this.input).add(this.field_url).add(this.field_image);if(options.is_url){this.changeState(this.state.web);}else if(options.is_upload){this.changeState(this.state.attached);}else{this.changeState(this.state.blank);}},changeState:function(state){this.fields.hide();if(state==this.state.blank){this.button_upload.add(this.field_image).add(this.input).show();}else if(state==this.state.attached){this.button_remove.add(this.field_image).show();}else if(state==this.state.web){this.field_url.show();}},_onFromWeb:function(){this.changeState(this.state.web);$('input',this.field_url).focus();if(this.options.is_upload){this.field_clear.val('true');}},_onRemove:function(){this.changeState(this.state.blank);$('input',this.field_url).val('');this.field_clear.val('true');},_onInputChange:function(){this.file_name=this.input.val();this.field_clear.val('');this.changeState(this.state.attached);},_onInputMouseOver:function(){this.button_upload.addClass('hover');},_onInputMouseOut:function(){this.button_upload.removeClass('hover');}}});
\ No newline at end of file
diff --git a/ckan/public/base/javascript/modules/resource-reorder.min.js b/ckan/public/base/javascript/modules/resource-reorder.min.js
index 0555cd56cfa..d1561abb634 100644
--- a/ckan/public/base/javascript/modules/resource-reorder.min.js
+++ b/ckan/public/base/javascript/modules/resource-reorder.min.js
@@ -1 +1 @@
-this.ckan.module('resource-reorder',function($,_){return{options:{id:false,i18n:{label:_('Reorder resources'),save:_('Save order'),saving:_('Saving...'),cancel:_('Cancel')}},template:{title:'<h1></h1>',button:['<a href="javascript:;" class="btn">','<i class="icon-reorder"></i>','<span></span>','</a>'].join('\n'),form_actions:['<div class="form-actions">','<a href="javascript:;" class="cancel btn pull-left"></a>','<a href="javascript:;" class="save btn btn-primary"></a>','</div>'].join('\n'),handle:['<a href="javascript:;" class="handle">','<i class="icon-move"></i>','</a>'].join('\n'),saving:['<span class="saving muted m-right">','<i class="icon-spinner icon-spin"></i>','<span></span>','</span>'].join('\n')},is_reordering:false,cache:false,initialize:function(){jQuery.proxyAll(this,/_on/);this.html_title=$(this.template.title).text(this.i18n('label')).insertBefore(this.el).hide();var button=$(this.template.button).on('click',this._onHandleStartReorder).appendTo('.page_primary_action');$('span',button).text(this.i18n('label'));this.html_form_actions=$(this.template.form_actions).hide().insertAfter(this.el);$('.save',this.html_form_actions).text(this.i18n('save')).on('click',this._onHandleSave);$('.cancel',this.html_form_actions).text(this.i18n('cancel')).on('click',this._onHandleCancel);this.html_handles=$(this.template.handle).hide().appendTo($('.resource-item',this.el));this.html_saving=$(this.template.saving).hide().insertBefore($('.save',this.html_form_actions));$('span',this.html_saving).text(this.i18n('saving'));this.cache=this.el.html();this.el.sortable().sortable('disable');},_onHandleStartReorder:function(){if(!this.is_reordering){this.html_form_actions.add(this.html_handles).add(this.html_title).show();this.el.addClass('reordering').sortable('enable');$('.page_primary_action').hide();this.is_reordering=true;}},_onHandleCancel:function(){if(this.is_reordering&&!$('.cancel',this.html_form_actions).hasClass('disabled')){this.reset();this.is_reordering=false;this.el.html(this.cache).sortable().sortable('disable');this.html_handles=$('.handle',this.el);}},_onHandleSave:function(){if(!$('.save',this.html_form_actions).hasClass('disabled')){var module=this;module.html_saving.show();$('.save, .cancel',module.html_form_actions).addClass('disabled');var order=[];$('.resource-item',module.el).each(function(){order.push($(this).data('id'));});module.sandbox.client.call('POST','package_resource_reorder',{id:module.options.id,order:order},function(){module.html_saving.hide();$('.save, .cancel',module.html_form_actions).removeClass('disabled');module.cache=module.el.html();module.reset();module.is_reordering=false;});}},reset:function(){this.html_form_actions.add(this.html_handles).add(this.html_title).hide();this.el.removeClass('reordering').sortable('disable');$('.page_primary_action').show();}};});
\ No newline at end of file
+this.ckan.module('resource-reorder',function($,_){return{options:{id:false,i18n:{label:_('Reorder files'),save:_('Save order'),saving:_('Saving...'),cancel:_('Cancel')}},template:{title:'<h1></h1>',button:['<a href="javascript:;" class="btn">','<i class="icon-reorder"></i>','<span></span>','</a>'].join('\n'),form_actions:['<div class="form-actions">','<a href="javascript:;" class="cancel btn pull-left"></a>','<a href="javascript:;" class="save btn btn-primary"></a>','</div>'].join('\n'),handle:['<a href="javascript:;" class="handle">','<i class="icon-move"></i>','</a>'].join('\n'),saving:['<span class="saving muted m-right">','<i class="icon-spinner icon-spin"></i>','<span></span>','</span>'].join('\n')},is_reordering:false,cache:false,initialize:function(){jQuery.proxyAll(this,/_on/);this.html_title=$(this.template.title).text(this.i18n('label')).insertBefore(this.el).hide();var button=$(this.template.button).on('click',this._onHandleStartReorder).appendTo('.page_primary_action');$('span',button).text(this.i18n('label'));this.html_form_actions=$(this.template.form_actions).hide().insertAfter(this.el);$('.save',this.html_form_actions).text(this.i18n('save')).on('click',this._onHandleSave);$('.cancel',this.html_form_actions).text(this.i18n('cancel')).on('click',this._onHandleCancel);this.html_handles=$(this.template.handle).hide().appendTo($('.resource-item',this.el));this.html_saving=$(this.template.saving).hide().insertBefore($('.save',this.html_form_actions));$('span',this.html_saving).text(this.i18n('saving'));this.cache=this.el.html();this.el.sortable().sortable('disable');},_onHandleStartReorder:function(){if(!this.is_reordering){this.html_form_actions.add(this.html_handles).add(this.html_title).show();this.el.addClass('reordering').sortable('enable');$('.page_primary_action').hide();this.is_reordering=true;}},_onHandleCancel:function(){if(this.is_reordering&&!$('.cancel',this.html_form_actions).hasClass('disabled')){this.reset();this.is_reordering=false;this.el.html(this.cache).sortable().sortable('disable');this.html_handles=$('.handle',this.el);}},_onHandleSave:function(){if(!$('.save',this.html_form_actions).hasClass('disabled')){var module=this;module.html_saving.show();$('.save, .cancel',module.html_form_actions).addClass('disabled');var order=[];$('.resource-item',module.el).each(function(){order.push($(this).data('id'));});module.sandbox.client.call('POST','package_resource_reorder',{id:module.options.id,order:order},function(){module.html_saving.hide();$('.save, .cancel',module.html_form_actions).removeClass('disabled');module.cache=module.el.html();module.reset();module.is_reordering=false;});}},reset:function(){this.html_form_actions.add(this.html_handles).add(this.html_title).hide();this.el.removeClass('reordering').sortable('disable');$('.page_primary_action').show();}};});
\ No newline at end of file