API Explorer minor fixes

diff --git a/templates/CRM/Admin/Page/APIExplorer.js b/templates/CRM/Admin/Page/APIExplorer.js
index 5d3276e649e0ce9236d4c8ef5f65544c3ab8e3ae..7fe6b73221f5a92706017918e507944167eeced2 100644 (file)
--- a/templates/CRM/Admin/Page/APIExplorer.js
+++ b/templates/CRM/Admin/Page/APIExplorer.js
@@ -10,6 +10,7 @@
     options = {},
     params = {},
     smartyStub,
+    entityDoc,
     fieldTpl = _.template($('#api-param-tpl').html()),
     optionsTpl = _.template($('#api-options-tpl').html()),
     returnTpl = _.template($('#api-return-tpl').html()),
@@ -599,7 +600,7 @@
           prettyPrint('#example-result');
         });
     } else {
-      $('#example-result').text($('#example-result').attr('title'));
+      $('#example-result').text($('#example-result').attr('placeholder'));
     }
   }
 
@@ -610,9 +611,9 @@
     CRM.utils.setOptions($('#doc-action').prop('disabled', true).addClass('loading'), []);
     $.getJSON(CRM.url('civicrm/ajax/apidoc', {entity: $(this).val()}))
       .done(function(result) {
+        entityDoc = result.doc;
         CRM.utils.setOptions($('#doc-action').prop('disabled', false).removeClass('loading'), result.actions);
         $('#doc-result').html(result.doc);
-        prettyPrint();
       });
   }
 
@@ -634,7 +635,7 @@
           prettyPrint('.api-doc-code pre');
         });
     } else {
-      $('#doc-result').html($('#doc-result').attr('title'));
+      $('#doc-result').html(entityDoc);
     }
   }
 

diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl
index 28e05dbef1f6e60b3377d5efff31606abd0ceb7a..76f87483a0842db59f50b71b1d451e848ec62127 100644 (file)
--- a/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -39,11 +39,13 @@
     font-size: 1.1em;
     margin-bottom: .6em;
   }
+  pre#api-result {
+    max-height: 50em;
+  }
   pre#api-result,
   div#doc-result,
   pre#example-result {
     padding:1em;
-    max-height: 50em;
     border: 1px solid lightgrey;
     margin-top: 1em;
     overflow: auto;
@@ -210,7 +212,7 @@
       <select class="crm-form-select big crm-select2" id="example-action" name="action">
         <option value="" selected="selected">{ts}Choose{/ts}...</option>
       </select>
-<pre id="example-result" class="linenums lang-php" title="{ts escape='html'}Results are displayed here.{/ts}">
+<pre id="example-result" class="linenums lang-php" placeholder="{ts escape='html'}Results are displayed here.{/ts}">
 {ts}Results are displayed here.{/ts}
 </pre>
     </form>
@@ -232,7 +234,7 @@
       <select class="crm-form-select big crm-select2" id="doc-action" name="action">
         <option value="" selected="selected">{ts}Choose{/ts}...</option>
       </select>
-      <div id="doc-result" title="{ts escape='html'}Results are displayed here.{/ts}">
+      <div id="doc-result">
         {ts}Results are displayed here.{/ts}
       </div>
     </form>