Merge remote-tracking branch 'upstream/master'

classes/modules/adminModule.php

@@ -167,8 +167,10 @@ class AdminModule extends abstractModule{
     <button type='button' class='close' data-dismiss='modal' aria-hidden='true'>&times;</button>
     <h3>Embed this code</h3>
     </div>
-    <div id='embed-body' class='modal-body'>
-    
+    <div  class='modal-body'>
+     <form class='form-inline'><fieldset><label>Width:</label> <input type='text' class='input-small embed-size' id='embed-width' value='600px'/>  <label>Height:</label> <input type='text' class='input-small embed-size' id='embed-height' value='400px'/></fieldset></form>
+     <div id='embed-body'>
+     </div>
     </div>
     <div class='modal-footer'>
     <a href='#' class='btn' data-dismiss='modal'>Close</a>

doc/examples/originalComponents/static/admin/js/editor.js

@@ -112,6 +112,15 @@ $(document).ready(function(){
         }
     });   
 
+    function updateEmbeddableCode(e){
+      var url = $("#embed-button").attr('data-url').replace("../", home);
+      var width = $("#embed-width").val(),
+          height = $("#embed-height").val();
+      var code = "<iframe src='"+url+"' style='overflow-x: hidden;overflow-y: hidden;' frameborder='0' width='"+width+"' height='"+height+"'></iframe>";
+      $("#embed-body").html(code);
+      $("#embed-box").modal('show');
+    }   
+    
  function executePost(url, data, message){
       $.ajax({
          type: 'POST',
@@ -380,11 +389,8 @@ $(document).ready(function(){
        }
    });
    
-   $("#embed-button").on('click', function(e){
-                   var url = $(this).attr('data-url').replace("../", home);
-                   var code = "<iframe src='"+url+"' style='overflow-x: hidden;overflow-y: hidden;' frameborder='0' width='600px' height='400px'></iframe>";
-                   $("#embed-body").html(code);
-                   $("#embed-box").modal('show');
-   })
+   $("#embed-button").on('click', updateEmbeddableCode);
+   $(".embed-size").on('keyup', updateEmbeddableCode);
+   
  }
 });