version bump

cyril-sf · cyril-sf · commit 31eb8e8d6014 · 2013-09-05T22:24:46.000-07:00
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+### 0.3.0
+
+- `conductor.configure` replaces `Conductor.configure`
+- Oasis.js 0.3.0
+
 ### 0.2.0
 
 - `Conductor.configure('eventCallback', function (eventHandler) {})` to configure
diff --git a/dist/conductor-0.3.0.amd.js b/dist/conductor-0.3.0.amd.js
@@ -184,7 +184,7 @@ define("conductor",
       this.oasis = new Oasis();
       this.conductorURL = this.options.conductorURL ||
                           oasis.configuration.oasisURL ||
-                          '/dist/conductor-0.2.0.js.html';
+                          '/dist/conductor-0.3.0.js.html';
 
       this.data = {};
       this.cards = {};
diff --git a/dist/conductor-0.3.0.js.html b/dist/conductor-0.3.0.js.html
@@ -3832,7 +3832,7 @@
     this.oasis = new Oasis();
     this.conductorURL = this.options.conductorURL ||
                         oasis.configuration.oasisURL ||
-                        '/dist/conductor-0.2.0.js.html';
+                        '/dist/conductor-0.3.0.js.html';
 
     this.data = {};
     this.cards = {};
diff --git a/example/playground/index.html b/example/playground/index.html
@@ -6,7 +6,7 @@
     <title>Conductor.js Playground</title>
     <link rel="stylesheet" href="css/playground.css">
     <script src="../libs/jquery-1.9.1.js"></script>
-    <script src="../../dist/conductor-0.2.0.js.html"></script>
+    <script src="../../dist/conductor-0.3.0.js.html"></script>
     <script src="js/playground.js"></script>
     <script src="js/playground-card.js"></script>
     <script src="js/playground-data.js"></script>
diff --git a/lib/conductor.js b/lib/conductor.js
@@ -9,7 +9,7 @@ var Conductor = function(options) {
   this.oasis = new Oasis();
   this.conductorURL = this.options.conductorURL ||
                       oasis.configuration.oasisURL ||
-                      '/dist/conductor-0.2.0.js.html';
+                      '/dist/conductor-0.3.0.js.html';
 
   this.data = {};
   this.cards = {};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "conductor",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Conductor.js is a library, built on top of Oasis.js, for embedding untrusted rich content that can still participate in a larger ecosystem.",
   "main": "index.js",
   "scripts": {
diff --git a/test/helpers/suite.js b/test/helpers/suite.js
@@ -20,7 +20,7 @@ function newConductor( options ) {
   options = options || {};
   options.testing = true;
   if( !options.conductorURL ) {
-    options.conductorURL = destinationUrl + '/dist/conductor-0.2.0.js.html';
+    options.conductorURL = destinationUrl + '/dist/conductor-0.3.0.js.html';
   }
 
   conductor = new Conductor( options );
diff --git a/test/index.html b/test/index.html
@@ -8,7 +8,7 @@
   <script src="vendor/jquery-1.9.1.js"></script>
   <script src="lib/sinon.js"></script>
   <script src="lib/sinon-qunit-1.0.0.js"></script>
-  <script src="/dist/conductor-0.2.0.js.html"></script>
+  <script src="/dist/conductor-0.3.0.js.html"></script>
   <script src="/tmp/conductor_tests.js"></script>
 </head>
 <body>
diff --git a/test/vendor/conductor-custom-url.js.html b/test/vendor/conductor-custom-url.js.html
@@ -1 +1 @@
-../../dist/conductor-0.2.0.js.html
+../../dist/conductor-0.3.0.js.html

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "conductor",`
`3`		`- "version": "0.2.0",`
	`3`	`+ "version": "0.3.0",`
`4`	`4`	`"description": "Conductor.js is a library, built on top of Oasis.js, for embedding untrusted rich content that can still participate in a larger ecosystem.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ function newConductor( options ) {`
`20`	`20`	`options = options \|\| {};`
`21`	`21`	`options.testing = true;`
`22`	`22`	`if( !options.conductorURL ) {`
`23`		`- options.conductorURL = destinationUrl + '/dist/conductor-0.2.0.js.html';`
	`23`	`+ options.conductorURL = destinationUrl + '/dist/conductor-0.3.0.js.html';`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`conductor = new Conductor( options );`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../../dist/conductor-0.2.0.js.html`
	`1`	`+../../dist/conductor-0.3.0.js.html`