update

xjsender · Mar 27, 2015 · 07980ff · 07980ff
1 parent b0af952
commit 07980ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/array2table.js b/lib/array2table.js
@@ -101,7 +101,7 @@ module.exports = function ConvertJsonToTable(parsedJson, tableId, tableClassName
             if (headers) {
                 var urlRegExp = new RegExp(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig);
                 var javascriptRegExp = new RegExp(/(^javascript:[\s\S]*;$)/ig);
-                var idRegExp = new RegExp(/[a-zA-Z0-9]{18}/ig);
+                var idRegExp = new RegExp(/[a-zA-Z0-9]{15,18}/ig);
 
                 for (i = 0; i < parsedJson.length; i++) {
                     for (j = 0; j < headers.length; j++) {

diff --git a/views/template/header.html b/views/template/header.html
@@ -116,6 +116,13 @@ <h4 class="modal-title">Connect to Salesforce</h4>
                                         </div>
                                     </div>
 
+                                    <div class="form-group">
+                                        <label for="clientId" class="control-label col-sm-3">Callback URL: </label>
+                                        <div class="col-sm-9">
+                                            <p class="form-control">https://node-jstree.herokuapp.com/oauth/callback</p>
+                                        </div>
+                                    </div>
+
                                     <div class="form-group">
                                         <label for="clientId" class="control-label col-sm-3">Client ID: </label>
                                         <div class="col-sm-9">