Embed: make "size" input optional

theonion · Aug 6, 2014 · dd5c8d6 · dd5c8d6
1 parent a0fe6ea
commit dd5c8d6
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 38 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "onion-editor",
- "version": "0.2.11",
+ "version": "0.2.12",
  "homepage": "https://github.com/theonion/editor",
  "authors": [
  "Mike Wnuk <mwnuk@theonion.com>"

diff --git a/build/onion-editor.js b/build/onion-editor.js
@@ -10414,9 +10414,7 @@ define('scribe-plugin-embed',[],function () {
  $captionInput = $(".embed-caption", $modal),
  $embedBtn = $(".set-embed-button", $modal),
  $error = $(".embed-error", $modal);
-
-
-
+ $sizeInput = $("[name=size]", $modal);
 
  $modal.on("hide.bs.modal", function() {
  $embedBtn.unbind("click");
@@ -10434,19 +10432,19 @@ define('scribe-plugin-embed',[],function () {
  $("[value=" + sizeCropPair + "]", $modal).attr("checked", true);
  $modal.modal("show");
  $embedBtn.click(function () {
- var embed_body = $bodyInput.val();
- if (embed_body.trim() === "") {
+ var embedBody = $bodyInput.val();
+ if (embedBody.trim() === "") {
  $error.show();
  }
  else {
  $error.hide();
- callback(block,
- {code: embed_body,
+ callback(block, {
+ code: embedBody,
  caption: $captionInput.val(),
- escaped_code: escape(embed_body),
+ escaped_code: escape(embedBody),
  size: getSize(),
  crop: getCrop()
- })
+ });
  $modal.modal("hide");
 
  }
@@ -10460,30 +10458,39 @@ define('scribe-plugin-embed',[],function () {
  $modal.modal("show");
 
  $embedBtn.click(function () {
- var embed_body = $bodyInput.val();
+ var embedBody = $bodyInput.val();
 
- if (embed_body.trim() === "") {
+ if (embedBody.trim() === "") {
  $error.show();
  }
  else {
  $error.hide();
- callback(
- {code: embed_body,
+ callback({
+ code: embedBody,
  caption: $captionInput.val(),
- escaped_code: escape(embed_body),
+ escaped_code: escape(embedBody),
  size: getSize(),
  crop: getCrop()
- })
+ });
  $modal.modal("hide");
  }
  });
  }
+
  function getSize() {
- return $("[name=size]:checked", $modal).val().split("-")[0];
+ var value = 'original';
+ if ($sizeInput.length > 0) {
+ $sizeInput.val().split("-")[0]; 
+ }
+ return value;
  }
 
  function getCrop() {
- return $("[name=size]:checked", $modal).val().split("-")[1];
+ var value = 'original';
+ if ($sizeInput.length > 0) {
+ $sizeInput.val().split("-")[1]; 
+ }
+ return value;
  }
 
  };

diff --git a/build/onion-editor.min.js b/build/onion-editor.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "onion-editor",
- "version": "0.2.10",
+ "version": "0.2.12",
  "author": {
  "name": "Mike Wnuk",
  "email": "mwnuk@theonion.com"

diff --git a/src/js/plugins/scribe-plugin-embed.js b/src/js/plugins/scribe-plugin-embed.js
@@ -10,9 +10,7 @@ define('scribe-plugin-embed',[],function () {
  $captionInput = $(".embed-caption", $modal),
  $embedBtn = $(".set-embed-button", $modal),
  $error = $(".embed-error", $modal);
-
-
-
+ $sizeInput = $("[name=size]", $modal);
 
  $modal.on("hide.bs.modal", function() {
  $embedBtn.unbind("click");
@@ -30,19 +28,19 @@ define('scribe-plugin-embed',[],function () {
  $("[value=" + sizeCropPair + "]", $modal).attr("checked", true);
  $modal.modal("show");
  $embedBtn.click(function () {
- var embed_body = $bodyInput.val();
- if (embed_body.trim() === "") {
+ var embedBody = $bodyInput.val();
+ if (embedBody.trim() === "") {
  $error.show();
  }
  else {
  $error.hide();
- callback(block,
- {code: embed_body,
+ callback(block, {
+ code: embedBody,
  caption: $captionInput.val(),
- escaped_code: escape(embed_body),
+ escaped_code: escape(embedBody),
  size: getSize(),
  crop: getCrop()
- })
+ });
  $modal.modal("hide");
 
  }
@@ -56,30 +54,39 @@ define('scribe-plugin-embed',[],function () {
  $modal.modal("show");
 
  $embedBtn.click(function () {
- var embed_body = $bodyInput.val();
+ var embedBody = $bodyInput.val();
 
- if (embed_body.trim() === "") {
+ if (embedBody.trim() === "") {
  $error.show();
  }
  else {
  $error.hide();
- callback(
- {code: embed_body,
+ callback({
+ code: embedBody,
  caption: $captionInput.val(),
- escaped_code: escape(embed_body),
+ escaped_code: escape(embedBody),
  size: getSize(),
  crop: getCrop()
- })
+ });
  $modal.modal("hide");
  }
  });
  }
+
  function getSize() {
- return $("[name=size]:checked", $modal).val().split("-")[0];
+ var value = 'original';
+ if ($sizeInput.length > 0) {
+ $sizeInput.val().split("-")[0]; 
+ }
+ return value;
  }
 
  function getCrop() {
- return $("[name=size]:checked", $modal).val().split("-")[1];
+ var value = 'original';
+ if ($sizeInput.length > 0) {
+ $sizeInput.val().split("-")[1]; 
+ }
+ return value;
  }
 
  };