tiny_mce_plugin_imageselector 0.0.4 → 0.0.5

data/lib/assets/plugins/imageselector/js/media_selector.js

@@ -206,12 +206,20 @@
 		    });
 
 		  // and append what is returned from oembed to result object for that size name
-		  $.get(result.oembedUrlFor(size))
+		  $.ajax({ url: result.oembedUrlFor(size), dataType: 'json' })
 		  .success(function(response) {
 		      // TODO: make this detect xml or json and parse accordingly
 		      // TODO: this is limited to same domain only for now, update to handle JSONP
 		      // probably need to switch to $.ajax and more complete parameters call for jsonp
-		      result[size.name] = $.parseJSON(response);
+		      result[size.name] = response;
+		      
+                      if (typeof(result[size.name]) === 'string' ||
+			  result[size.name]  === '' ||
+			  typeof(result[size.name]) === 'undefined') {
+
+                          result[size.name] = $.parseJSON(response);
+                      }
+
 
 		      // scope issue, response is set in calling scope, and not getting set with recursive call
 		      result.updateWithNeededSizesThenRender(context);
@@ -260,12 +268,19 @@
 	  // params['id'] decodes to normal url, but we need escaped version
 	  var oembedUrl = this.params['id'];
 
-	  $.get(oembedUrl)
+	  $.ajax({ url: oembedUrl, dataType: 'json' })
 	    .success(function(response) {
 		// TODO: make this detect xml or json and parse accordingly
 		// TODO: this is limited to same domain only for now, update to handle JSONP
 		// probably need to switch to $.ajax and more complete parameters call for jsonp
-		var selectionFromResponse = $.parseJSON(response);
+		var selectionFromResponse = response;
+
+		if (typeof(selectionFromResponse) === 'string' ||
+		    selectionFromResponse  === '' ||
+		    typeof(selectionFromResponse) === 'undefined') {
+
+		  selectionFromResponse = $.parseJSON(response);
+		}
 
 		// add alt value for selection so we can use it in template
 		var alt = selectionFromResponse.title;
@@ -333,7 +348,10 @@
 	      // plain response is probably already json object if parse returns null
 	      var responseAsJSON = response;
 
-	      if (typeof(responseAsJSON) == 'string' || responseAsJSON === '' || typeof(responseAsJSON) === 'undefined') {
+	      if (typeof(responseAsJSON) == 'string' ||
+		  responseAsJSON === '' ||
+		  typeof(responseAsJSON) === 'undefined') {
+
 		responseAsJSON = $.parseJSON(response);
 	      }
 

data/tiny_mce_plugin_imageselector.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "tiny_mce_plugin_imageselector"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   s.authors = ["Walter McGinnis"]
   s.email = "walter@katipo.co.nz"
   s.homepage = "http://github.com/kete/tiny_mce_plugin_imageselector"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_mce_plugin_imageselector
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Walter McGinnis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 +13:00
+date: 2011-10-04 00:00:00 +13:00
 default_executable: 
 dependencies: []