Skip to content

Commit

Permalink
Update recline to latest version from ckan-updates
Browse files Browse the repository at this point in the history
branch and minify all javascript and css files
using 'paster minify'
  • Loading branch information
johnglover committed Nov 7, 2012
1 parent a037ee8 commit 6e9c8c3
Show file tree
Hide file tree
Showing 26 changed files with 1,138 additions and 182 deletions.
2 changes: 1 addition & 1 deletion ckan/public/base/css/main.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckan/public/base/datapreview/css/recline.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions ckan/public/base/datapreview/preview_recline.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions ckan/public/base/datapreview/preview_recline.min.js.old
@@ -0,0 +1,5 @@
ckan.module('reclinepreview',function(jQuery,_){return{options:{i18n:{errorLoadingPreview:"Could not load preview",errorDataProxy:"DataProxy returned an error",errorDataStore:"DataStore returned an error",previewNotAvailableForDataType:"Preview not available for data type: "}},initialize:function(){this.loadPreviewDialog(preload_resource);},loadPreviewDialog:function(resourceData){var self=this;function showError(msg){msg=msg||_('error loading preview');return self.el.append('<div></div>').addClass('alert alert-error fade in').html(msg);}
resourceData.formatNormalized=this.normalizeFormat(resourceData.format);resourceData.url=this.normalizeUrl(resourceData.url);if(resourceData.formatNormalized===''){var tmp=resourceData.url.split('/');tmp=tmp[tmp.length-1];tmp=tmp.split('?');tmp=tmp[0];var ext=tmp.split('.');if(ext.length>1){resourceData.formatNormalized=ext[ext.length-1];}}
recline.Backend.Ckan.API_ENDPOINT=jQuery('body').data('site-root')+'api';if(resourceData.datastore_active){resourceData.backend='ckan';var dataset=new recline.Model.Dataset(resourceData);var errorMsg=this.options.i18n.errorLoadingPreview+': '+this.options.i18n.errorDataStore;dataset.fetch().done(function(dataset){self.initializeDataExplorer(dataset);}).fail(function(error){if(error.message)errorMsg+=' ('+error.message+')';showError(errorMsg);});}else if(resourceData.formatNormalized in{'csv':'','xls':''}){resourceData.format=resourceData.formatNormalized;resourceData.backend='dataproxy';var dataset=new recline.Model.Dataset(resourceData);var errorMsg=this.options.i18n.errorLoadingPreview+': '+this.options.i18n.errorDataProxy;dataset.fetch().done(function(dataset){dataset.bind('query:fail',function(error){jQuery('.data-view-container',self.el).hide();jQuery('.header',self.el).hide();});self.initializeDataExplorer(dataset);jQuery('.recline-query-editor .text-query').hide();}).fail(function(error){if(error.message)errorMsg+=' ('+error.message+')';showError(errorMsg);});}},initializeDataExplorer:function(dataset){var views=[{id:'grid',label:'Grid',view:new recline.View.SlickGrid({model:dataset})},{id:'graph',label:'Graph',view:new recline.View.Graph({model:dataset})},{id:'map',label:'Map',view:new recline.View.Map({model:dataset})}];var dataExplorer=new recline.View.MultiView({el:this.el,model:dataset,views:views,config:{readOnly:true}});jQuery('.menu-right a[data-action="fields"]',self.el).click();},normalizeFormat:function(format){var out=format.toLowerCase();out=out.split('/');out=out[out.length-1];return out;},normalizeUrl:function(url){if(url.indexOf('https')===0){return'http'+url.slice(5);}else{return url;}},makeEmbedLink:function(explorerState){var state=explorerState.toJSON();state.state_version=1;var queryString='?';var items=[];jQuery.each(state,function(key,value){if(typeof(value)==='object'){value=JSON.stringify(value);}
items.push(key+'='+escape(value));});queryString+=items.join('&');var iframeWidth=jQuery('.iframe-width',self.el);var iframeHeight=jQuery('.iframe-height',self.el);var width=iframeWidth.val();var height=iframeHeight.val();var link=embedPath+queryString;link+='&width='+width+'&height='+height;return link;},loadEmbeddedPreview:function(resourceData,reclineState){var self=this;var dataset=recline.Model.Dataset.restore(reclineState);var views=null;if(reclineState.currentView==='grid'){views=[{id:'grid',label:'Grid',view:new recline.View.SlickGrid({model:dataset,state:reclineState['view-grid']})}];}else if(reclineState.currentView==='graph'){views=[{id:'graph',label:'Graph',view:new recline.View.Graph({model:dataset,state:reclineState['view-graph']})}];}else if(reclineState.currentView==='map'){views=[{id:'map',label:'Map',view:new recline.View.Map({model:dataset,state:reclineState['view-map']})}];}
var dataExplorer=new recline.View.MultiView({el:self.el,model:dataset,state:reclineState,views:views});}};});

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6e9c8c3

Please sign in to comment.