Merge pull request #34 from zephod/master

Minimising use of Showdown.js (from zephod).
okfn · Oct 6, 2011 · 8a4fc98 · 8a4fc98
2 parents 6a83ad1 + b3f1869
commit 8a4fc98
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -1,4 +1,3 @@
-var showdown = new Showdown.converter();
 this.CKAN = this.CKAN || {};
 
 // Global object that stores all CKAN models.
@@ -189,6 +188,8 @@ CKAN.Model = function ($, _, Backbone, undefined) {
       var title = this.get('title');
       out.displaytitle = title ? title : 'No title ...';
       var notes = this.get('notes');
+      // Don't use a global Showdown; CKAN doesn't need that library
+      var showdown = new Showdown.converter();
       out.notesHtml = showdown.makeHtml(notes ? notes : '');
       out.snippet = this.makeSnippet(out.notesHtml);
       return out;

diff --git a/lib/view.js b/lib/view.js
@@ -2,7 +2,6 @@ var CKAN = CKAN || {};
 
 CKAN.View = function($) {
   var my = {};
-  var showdown = new Showdown.converter();
 
   // Flash a notification message
   // 

diff --git a/pkg/ckanjs.js b/pkg/ckanjs.js
@@ -208,7 +208,6 @@ this.CKAN.Client = (function (CKAN, $, _, Backbone, undefined) {
   return Client;
 
 })(this.CKAN, this.$, this._, this.Backbone);
-var showdown = new Showdown.converter();
 this.CKAN = this.CKAN || {};
 
 // Global object that stores all CKAN models.
@@ -399,6 +398,8 @@ CKAN.Model = function ($, _, Backbone, undefined) {
       var title = this.get('title');
       out.displaytitle = title ? title : 'No title ...';
       var notes = this.get('notes');
+      // Don't use a global Showdown; CKAN doesn't need that library
+      var showdown = new Showdown.converter();
       out.notesHtml = showdown.makeHtml(notes ? notes : '');
       out.snippet = this.makeSnippet(out.notesHtml);
       return out;
@@ -544,7 +545,6 @@ var CKAN = CKAN || {};
 
 CKAN.View = function($) {
   var my = {};
-  var showdown = new Showdown.converter();
 
   // Flash a notification message
   //