From 5c68986c4e39a2e1308a38210688e8a581106922 Mon Sep 17 00:00:00 2001
From: Evan Caldwell <evan.caldwell@gmail.com>
Date: Wed, 21 Oct 2015 17:36:35 -0400
Subject: [PATCH 1/4] cleaned js up with jscs

Enforces consistency through the messy code and makes it easier for others to see the code style for this particular project.
---
 .jscsrc                 |  11 +
 src/js/main.js          | 494 ++++++++++++++++++++++------------------
 src/js/portal/info.js   |  10 +-
 src/js/portal/portal.js |  50 ++--
 src/js/portal/util.js   |  13 +-
 5 files changed, 321 insertions(+), 257 deletions(-)
 create mode 100644 .jscsrc

diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 0000000..697d084
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,11 @@
+{
+    "preset": "airbnb",
+    "disallowMultipleVarDecl": true,
+    "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
+    "requireCapitalizedConstructors": {
+        "allExcept": ["arcgisOAuthInfo"]
+    },
+    "requireTrailingComma": false,
+    "validateQuoteMarks": {"mark": "\"", "escape": true},
+    "validateIndentation": {"value": 4, "allExcept": ["comments"]}
+}
\ No newline at end of file
diff --git a/src/js/main.js b/src/js/main.js
index 728073d..ec31376 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -11,7 +11,7 @@ require([
     "highlight",
     "jquery.ui",
     "bootstrap-shim"
-], function (
+], function(
     jquery,
     portalSelf,
     portalInfo,
@@ -47,11 +47,11 @@ require([
      * Check the url for errors (e.g. no trailing slash)
      * and update it before sending.
      */
-    var validateUrl = function (el, portal) {
+    var validateUrl = function(el, portal) {
         "use strict";
         var inputUrl = jquery.trim(jquery(el).val());
 
-        portalUtil.fixUrl(inputUrl).done(function (portalUrl) {
+        portalUtil.fixUrl(inputUrl).done(function(portalUrl) {
             jquery(el).val(portalUrl);
             var urlError = jquery("#urlErrorTemplate").html();
             var checkbox = jquery(el).parent().parent()
@@ -61,23 +61,24 @@ require([
 
             portal.portalUrl = portalUrl;
             portal.version()
-                .done(function (data) {
+                .done(function(data) {
                     console.log("API v" + data.currentVersion);
                     jquery(".alert-danger.alert-dismissable").remove();
                     jquery(el).next().addClass("glyphicon-ok");
                 })
-                .fail(function (xhr, textStatus) {
+                .fail(function() {
                     // Try it again with enterprise auth.
                     portal.withCredentials = true;
                     portal.version()
-                        .done(function (data) {
+                        .done(function(data) {
                             console.log("API v" + data.currentVersion);
                             jquery(".alert-danger.alert-dismissable").remove();
                             jquery(el).next().addClass("glyphicon-ok");
                             jquery(checkbox).trigger("click");
                         })
-                        .fail(function (xhr, textStatus) {
+                        .fail(function(xhr, textStatus) {
                             // OK, it's really not working.
+                            console.log(xhr, textStatus);
                             portal.withCredentials = false;
                             jquery(".alert-danger.alert-dismissable").remove();
                             jquery(el).parent().parent().after(urlError);
@@ -87,10 +88,10 @@ require([
         });
     };
 
-    var startSession = function () {
+    var startSession = function() {
         "use strict";
         var searchHtml;
-        app.portals.sourcePortal.self().done(function (data) {
+        app.portals.sourcePortal.self().done(function(data) {
             var template = jquery("#sessionTemplate").html();
             var html = mustache.to_html(template, data);
             app.portals.sourcePortal.username = data.user.username;
@@ -98,7 +99,7 @@ require([
             jquery(".nav.navbar-nav").after(html);
             jquery("#logout").show();
             jquery("#actionDropdown").css({
-                "visibility": "visible"
+                visibility: "visible"
             });
             searchHtml = mustache.to_html(jquery("#searchTemplate").html(), {
                 portal: app.portals.sourcePortal.portalUrl,
@@ -109,12 +110,12 @@ require([
 
             // Add a listener for clicking the search icon.
             // Fix me.
-            jquery(document).on("click", "i.glyphicon-search", function () {
+            jquery(document).on("click", "i.glyphicon-search", function() {
                 search();
             });
 
             // Add a listener for the enter key on the search form.
-            jquery("#searchForm").keypress(function (e) {
+            jquery("#searchForm").keypress(function(e) {
                 if (e.which == 13) {
                     search();
                 }
@@ -126,18 +127,13 @@ require([
         });
     };
 
-    var loginPortal = function () {
+    var loginPortal = function() {
         var username = jquery("#portalUsername").val();
         var password = jquery("#portalPassword").val();
         jquery("#portalLoginBtn").button("loading");
         app.portals.sourcePortal.generateToken(username, password)
-            .done(function (response) {
+            .done(function(response) {
                 if (response.token) {
-                    var user = {
-                        token: response.token,
-                        expires: response.expires,
-                        ssl: response.ssl
-                    };
                     app.portals.sourcePortal.token = response.token;
                     jquery("#portalLoginModal").modal("hide");
                     jquery("#splashContainer").css("display", "none");
@@ -149,18 +145,18 @@ require([
                     jquery("#portalLoginForm").before(html);
                 }
             })
-            .fail(function (response) {
+            .fail(function(response) {
                 console.log(response.statusText);
                 var html = jquery("#loginErrorTemplate").html();
                 jquery(".alert-danger.alert-dismissable").remove();
                 jquery("#portalLoginForm").before(html);
             })
-            .always(function () {
+            .always(function() {
                 jquery("#portalLoginBtn").button("reset");
             });
     };
 
-    var loginDestination = function () {
+    var loginDestination = function() {
         var username = jquery("#destinationUsername").val();
         var password = jquery("#destinationPassword").val();
         var portalUrl = jquery("#destinationUrl").val();
@@ -174,10 +170,10 @@ require([
         jquery("#destinationLoginBtn").button("loading");
         jquery("#dropArea").empty();
         app.portals.destinationPortal.generateToken(username, password)
-            .done(function (response) {
+            .done(function(response) {
                 if (response.token) {
                     app.portals.destinationPortal.token = response.token;
-                    app.portals.destinationPortal.self().done(function (data) {
+                    app.portals.destinationPortal.self().done(function(data) {
                         app.portals.destinationPortal.username = data.user.username;
                         app.portals.destinationPortal.portalUrl = "https://" +
                             data.portalHostname + "/";
@@ -194,18 +190,18 @@ require([
                     jquery("#destinationLoginForm").before(html);
                 }
             })
-            .fail(function (response) {
+            .fail(function(response) {
                 console.log(response.statusText);
                 var html = jquery("#loginErrorTemplate").html();
                 jquery(".alert-danger.alert-dismissable").remove();
                 jquery("#destinationLoginForm").before(html);
             })
-            .always(function () {
+            .always(function() {
                 jquery("#destinationLoginBtn").button("reset");
             });
     };
 
-    var logout = function () {
+    var logout = function() {
         sessionStorage.clear();
         app.stats.activities = {};
         jquery("#actionDropdown li").removeClass("active");
@@ -214,7 +210,7 @@ require([
         jquery("#sessionDropdown").remove();
         jquery("#searchForm").remove();
         jquery("#actionDropdown").css({
-            "visibility": "hidden"
+            visibility: "hidden"
         });
         esriId.destroyCredentials();
         delete app.portals.sourcePortal;
@@ -222,16 +218,18 @@ require([
         window.location.reload();
     };
 
-    var search = function () {
+    var search = function() {
 
         var query = jquery("#searchText").val();
         var portalUrl = jquery("#searchMenu li.active").attr("data-url");
         var portal;
+
         // Add the org id for "My Portal" searches.
         if (jquery("#searchMenu li.active").attr("data-id")) {
             query += " accountid:" +
                 jquery("#searchMenu li.active").attr("data-id");
         }
+
         // Add the username for "My Content" searches.
         if (jquery("#searchMenu li.active").text() === "Search My Content") {
             query += " owner:" + app.portals.sourcePortal.username;
@@ -250,29 +248,32 @@ require([
 
         NProgress.start();
         portal.search(query, 100, "numViews", "desc")
-            .done(function (results) {
+            .done(function(results) {
                 listSearchItems(portal.portalUrl, results);
                 NProgress.done();
             });
     };
 
-    var inspectContent = function () {
+    var inspectContent = function() {
         require(["nprogress", "highlight"],
-            function (NProgress, hljs) {
+            function(NProgress, hljs) {
 
                 var portal;
+                var jsonBackup;
+                var jsonValid;
 
-                var validateJson = function (jsonString) {
+                var validateJson = function(jsonString) {
                     try {
                         var o = JSON.parse(jsonString);
                         if (o && typeof o === "object" && o !== null) {
                             return o;
                         }
                     } catch (e) {}
+
                     return false;
                 };
 
-                var startEditing = function (e) {
+                var startEditing = function(e) {
 
                     // Allow removing the button active state.
                     e.stopImmediatePropagation();
@@ -280,8 +281,8 @@ require([
                     var codeBlock = jquery(e.currentTarget)
                         .parent()
                         .next();
-                    editButton = jquery(e.currentTarget);
-                    saveButton = jquery(e.currentTarget)
+                    var editButton = jquery(e.currentTarget);
+                    var saveButton = jquery(e.currentTarget)
                         .parent()
                         .children("[data-action='saveEdits']");
 
@@ -301,7 +302,7 @@ require([
                         editButton.tooltip();
                         jsonBackup = codeBlock.text();
                         codeBlock.attr("contentEditable", "true");
-                        codeBlock.bind("input", function (e) {
+                        codeBlock.bind("input", function() {
                             // Validate the JSON as it is edited.
                             jsonValid = validateJson(codeBlock.text());
                             saveButton.tooltip("destroy");
@@ -323,10 +324,12 @@ require([
                                     "JSON is invalid. Saving not allowed."
                                 );
                             }
+
                             saveButton.tooltip({
                                 container: "body"
                             });
                         });
+
                         editButton.attr("class", "btn btn-default");
                         saveButton.attr("class", "btn btn-default");
                     } else {
@@ -334,9 +337,10 @@ require([
                         // End editing and restore the original json.
                         codeBlock.attr("contentEditable", "false");
                         codeBlock.text(jsonBackup);
-                        codeBlock.each(function (i, e) {
+                        codeBlock.each(function(i, e) {
                             hljs.highlightBlock(e);
                         });
+
                         editButton.attr("class", "btn btn-default");
                         editButton.children("span")
                             .attr("class", "fa fa-lg fa-pencil");
@@ -346,7 +350,7 @@ require([
                     }
 
                     // Post the edited JSON.
-                    saveButton.click(function (e) {
+                    saveButton.click(function() {
                         if (jsonValid) {
                             // JSON is valid. Allow saving.
                             var newJson = codeBlock.text();
@@ -371,8 +375,9 @@ require([
                             } else {
                                 ownerFolder = "/";
                             }
+
                             if (editButton.attr("data-container") === "Description") {
-                                portal.updateDescription(itemInfo.owner, itemInfo.id, ownerFolder, newJson).done(function (response) {
+                                portal.updateDescription(itemInfo.owner, itemInfo.id, ownerFolder, newJson).done(function(response) {
                                     if (response.success) {
                                         saveButton.children("span").attr("class", "fa fa-lg fa-check");
                                         saveButton.css("color", "green");
@@ -383,7 +388,7 @@ require([
                                 });
                             } else if (editButton.attr("data-container") === "Data") {
                                 saveButton.children("span").attr("class", "fa fa-lg fa-spinner fa-spin");
-                                portal.updateData(itemInfo.owner, itemInfo.id, ownerFolder, newJson).done(function (response) {
+                                portal.updateData(itemInfo.owner, itemInfo.id, ownerFolder, newJson).done(function(response) {
                                     if (response.success) {
                                         saveButton.children("span").attr("class", "fa fa-lg fa-check");
                                         saveButton.css("color", "green");
@@ -408,11 +413,10 @@ require([
                 jquery("#inspectBtn").button("reset");
 
                 // Add a listener for clicking on content buttons.
-                jquery(".content").click(function () {
+                jquery(".content").click(function() {
                     var server = jquery(this).attr("data-portal");
                     var id = jquery(this).attr("data-id");
                     var title = jquery(this).text();
-                    var itemDescription;
                     var itemData;
 
                     /**
@@ -425,6 +429,7 @@ require([
                     } else {
                         portal = app.portals.sourcePortal;
                     }
+
                     NProgress.start();
                     jquery(".content").addClass("btn-info");
                     jquery(".content").removeClass("active");
@@ -432,12 +437,12 @@ require([
                     jquery(this).addClass("btn-primary");
                     jquery(this).removeClass("btn-info");
                     portal.itemDescription(id)
-                        .done(function (description) {
+                        .done(function(description) {
                             portal.itemData(id)
-                                .done(function (data) {
+                                .done(function(data) {
                                     itemData = data;
                                 })
-                                .always(function (data) {
+                                .always(function() {
                                     var templateData = {
                                         title: title,
                                         url: portal.portalUrl,
@@ -449,6 +454,7 @@ require([
                                             itemData, undefined, 2
                                         )
                                     };
+
                                     // Add a download link for files.
                                     if (templateData.data === undefined &&
                                         description.typeKeywords
@@ -459,29 +465,28 @@ require([
                                             id +
                                             "/data?token=" + portal.token;
                                     }
+
                                     var html = mustache.to_html(
                                         jquery("#inspectTemplate").html(),
                                         templateData
                                     );
+
                                     // Add the HTML container with the JSON.
                                     jquery("#dropArea").html(html);
                                     /**
                                      * Color code the JSON to make it easier
                                      * to read (uses highlight.js).
                                      */
-                                    jquery("pre").each(function (i, e) {
+                                    jquery("pre").each(function(i, e) {
                                         hljs.highlightBlock(e);
                                     });
-                                    var jsonBackup;
-                                    var jsonValid;
-                                    var editButton;
-                                    var saveButton;
-                                    jquery(".btn-default[data-action='startEdits']").click(function (e) {
+
+                                    jquery(".btn-default[data-action='startEdits']").click(function(e) {
                                         if (!localStorage.hasOwnProperty("editsAllowed")) {
                                             // Show the caution modal.
                                             var editJsonBtn = jquery("#editJsonBtn");
                                             jquery("#editJsonModal").modal("show");
-                                            jquery(".acknowledgeRisk").click(function (e) {
+                                            jquery(".acknowledgeRisk").click(function(e) {
                                                 if (jquery(e.currentTarget).prop("checked")) {
                                                     editJsonBtn.removeClass("disabled");
                                                 } else {
@@ -491,13 +496,15 @@ require([
                                         } else {
                                             startEditing(e);
                                         }
-                                        jquery("#editJsonBtn").click(function () {
+
+                                        jquery("#editJsonBtn").click(function() {
                                             jquery("#editJsonModal").modal("hide");
                                             localStorage.setItem("editsAllowed", true);
                                             startEditing(e);
                                         });
 
                                     });
+
                                     NProgress.done();
                                 });
                         });
@@ -505,7 +512,7 @@ require([
             });
     };
 
-    var updateWebmapServices = function () {
+    var updateWebmapServices = function() {
         var webmapData;
         var owner;
         var folder;
@@ -514,13 +521,14 @@ require([
             jquery(".content[data-type='Web Scene']")
         );
         var portal = app.portals.sourcePortal;
+
         // Highlight supported content.
         supportedContent.addClass("data-toggle btn-info");
         supportedContent.removeAttr("disabled");
         supportedContent.attr("data-toggle", "button");
 
         // Add a listener for clicking on content buttons.
-        jquery(".content").click(function () {
+        jquery(".content").click(function() {
             // Display the selected Web Map's operational layers.
             var id = jquery(this).attr("data-id");
             var webmapTitle = jquery(this).text();
@@ -530,7 +538,7 @@ require([
             jquery(this).addClass("btn-primary");
             jquery(this).removeClass("btn-info");
             portal.itemDescription(id)
-                .done(function (description) {
+                .done(function(description) {
                     owner = description.owner;
                     if (!description.ownerFolder) {
                         // Handle content in the user's root folder.
@@ -539,18 +547,20 @@ require([
                         folder = description.ownerFolder;
                     }
                 });
+
             portal.itemData(id)
-                .done(function (data) {
+                .done(function(data) {
                     webmapData = JSON.stringify(data);
                     var operationalLayers = [];
-                    jquery.each(data.operationalLayers, function (layer) {
+                    jquery.each(data.operationalLayers, function(layer) {
                         if (data.operationalLayers[layer].hasOwnProperty("url")) {
                             operationalLayers.push(data.operationalLayers[layer]);
                         }
                     });
-                    var basemapTitle = data.baseMap.title,
-                        basemapLayers = [];
-                    jquery.each(data.baseMap.baseMapLayers, function (layer) {
+
+                    var basemapTitle = data.baseMap.title;
+                    var basemapLayers = [];
+                    jquery.each(data.baseMap.baseMapLayers, function(layer) {
                         if (data.baseMap.baseMapLayers[layer].hasOwnProperty("url")) {
                             basemapLayers.push(data.baseMap.baseMapLayers[layer]);
                         }
@@ -564,29 +574,33 @@ require([
                         basemapLayers: basemapLayers
                     };
                     var html = mustache.to_html(template, templateData);
+
                     // Add the HTML container with the item JSON.
                     jquery("#dropArea").html(html);
 
                     // Event listener for update button.
-                    jquery("#btnUpdateWebmapServices").click(function (e) {
+                    jquery("#btnUpdateWebmapServices").click(function() {
                         var webmapServices = jquery("[data-original]");
-                        jquery.each(webmapServices, function (service) {
+                        jquery.each(webmapServices, function(service) {
                             var originalUrl = jquery(webmapServices[service])
                                 .attr("data-original");
                             var newUrl = jquery(webmapServices[service]).val();
+
                             // Find and replace each URL.
                             webmapData = webmapData.replace("\"" + originalUrl + "\"", "\"" + newUrl + "\"");
                             jquery(webmapServices[service]).val(newUrl);
                         });
+
                         var webmapId = jquery(".content.active.btn-primary").attr("data-id");
                         var itemData = JSON.parse(webmapData);
-                        portal.updateWebmapData(owner, folder, webmapId, itemData).done(function (response) {
+                        portal.updateWebmapData(owner, folder, webmapId, itemData).done(function(response) {
                             var html;
                             if (response.success) {
                                 // Set the stored original URL to the new value.
-                                jquery.each(webmapServices, function (service) {
+                                jquery.each(webmapServices, function(service) {
                                     jquery(webmapServices[service]).attr("data-original", jquery(webmapServices[service]).val());
                                 });
+
                                 html = mustache.to_html(jquery("#updateSuccessTemplate").html());
                                 jquery("#btnResetWebmapServices").before(html);
                             } else if (response.error.code === 400 || response.error.code === 403) {
@@ -598,11 +612,10 @@ require([
                     });
 
                     // Event listener for reset button.
-                    jquery("#btnResetWebmapServices").click(function (e) {
+                    jquery("#btnResetWebmapServices").click(function() {
                         var webmapServices = jquery("[data-original]");
-                        jquery.each(webmapServices, function (service) {
+                        jquery.each(webmapServices, function(service) {
                             var originalUrl = jquery(webmapServices[service]).attr("data-original");
-                            var currentUrl = jquery(webmapServices[service]).val();
                             jquery(webmapServices[service]).val(originalUrl);
                         });
                     });
@@ -611,43 +624,47 @@ require([
 
     };
 
-    var updateContentUrls = function () {
+    var updateContentUrls = function() {
         var owner;
         var folder;
         var supportedContent = jquery(".content[data-type='Feature Service'], .content[data-type='Map Service'], .content[data-type='Image Service'], .content[data-type='KML'], .content[data-type='WMS'], .content[data-type='Geodata Service'], .content[data-type='Globe Service'], .content[data-type='Geometry Service'], .content[data-type='Geocoding Service'], .content[data-type='Network Analysis Service'], .content[data-type='Geoprocessing Service'], .content[data-type='Web Mapping Application'], .content[data-type='Mobile Application'], .content[data-type='Scene Service']");
         var portal = app.portals.sourcePortal;
+
         // Highlight supported content.
         supportedContent.addClass("data-toggle btn-info");
         supportedContent.removeAttr("disabled");
         supportedContent.attr("data-toggle", "button");
 
         // Add a listener for clicking on content buttons.
-        jquery(".content").click(function () {
+        jquery(".content").click(function() {
+
             // Display the selected item's URL.
             var id = jquery(this).attr("data-id");
-            var title = jquery(this).text();
+
             // Highlight Web Maps.
             supportedContent.addClass("btn-info");
             jquery(".content").removeClass("active");
             jquery(".content").removeClass("btn-primary");
             jquery(this).addClass("btn-primary");
             jquery(this).removeClass("btn-info");
-            portal.itemDescription(id).done(function (description) {
+            portal.itemDescription(id).done(function(description) {
                 owner = description.owner;
                 if (!description.ownerFolder) {
                     folder = ""; // Handle content in the user's root folder.
                 } else {
                     folder = description.ownerFolder;
                 }
+
                 var html = mustache.to_html(jquery("#itemContentTemplate").html(), description);
+
                 // Add the HTML container with the item JSON.
                 jquery("#dropArea").html(html);
 
                 // Event listener for update button.
-                jquery("#btnUpdateContentUrl").click(function (e) {
+                jquery("#btnUpdateContentUrl").click(function() {
                     var contentId = jquery(".content.active.btn-primary").attr("data-id");
                     var url = jquery("[data-original]").val();
-                    portal.updateUrl(owner, folder, contentId, url).done(function (response) {
+                    portal.updateUrl(owner, folder, contentId, url).done(function(response) {
                         var html;
                         if (response.success) {
                             // Set the stored original URL to the new value.
@@ -663,21 +680,20 @@ require([
                 });
 
                 // Event listener for reset button.
-                jquery("#btnResetContentUrl").click(function (e) {
+                jquery("#btnResetContentUrl").click(function() {
                     var originalUrl = jquery("[data-original]").attr("data-original");
-                    var currentUrl = jquery("[data-original]").val();
                     jquery("[data-original]").val(originalUrl);
                 });
             });
         });
     };
 
-    var viewStats = function () {
+    var viewStats = function() {
 
         var portal = app.portals.sourcePortal;
 
-        var statsCalendar = function (activities) {
-            require(["d3", "cal-heatmap"], function (d3, CalHeatMap) {
+        var statsCalendar = function(activities) {
+            require(["d3", "cal-heatmap"], function(d3, CalHeatMap) {
                 // Create a date object for three months ago.
                 var today = new Date();
                 var startDate = new Date();
@@ -713,10 +729,11 @@ require([
         };
 
         portal.userProfile(portal.username)
-            .done(function (user) {
+            .done(function(user) {
 
                 var template = jquery("#statsTemplate").html();
                 var thumbnailUrl;
+
                 // Check that the user has a thumbnail image.
                 if (user.thumbnail) {
                     thumbnailUrl = portal.portalUrl +
@@ -732,7 +749,7 @@ require([
                     thumbnail: thumbnailUrl
                 };
 
-                html = mustache.to_html(template, templateData);
+                var html = mustache.to_html(template, templateData);
                 jquery("body").append(html);
                 statsCalendar(app.stats.activities);
 
@@ -741,8 +758,8 @@ require([
                 // Get the user's 3 most viewed items.
                 var searchQuery = "owner:" + portal.username;
                 portal.search(searchQuery, 3, "numViews", "desc")
-                    .done(function (results) {
-                        jquery.each(results.results, function (result) {
+                    .done(function(results) {
+                        jquery.each(results.results, function(result) {
                             results.results[result].numViews =
                                 results.results[result]
                                 .numViews.toString()
@@ -752,22 +769,25 @@ require([
                                 "home/item.html?id=" +
                                 results.results[result].id;
                         });
+
                         var tableTemplate = jquery("#mostViewedContentTemplate").html();
                         jquery("#mostViewedContent").html(mustache.to_html(tableTemplate, {
                             searchResults: results.results
                         }));
                     });
 
-                jquery("#statsModal").on("shown.bs.modal", function () {
+                jquery("#statsModal").on("shown.bs.modal", function() {
                     // Apply CSS to style the calendar arrows.
                     var calHeight = jquery(".calContainer").height();
+
                     // Center the calendar.
                     jquery(".cal-heatmap-container").css("margin", "auto");
+
                     // Adjust the arrows.
                     jquery(".calArrow").css("margin-top", (calHeight - 20) + "px");
                 });
 
-                jquery("#statsModal").on("hidden.bs.modal", function () {
+                jquery("#statsModal").on("hidden.bs.modal", function() {
                     // Destroy the stats modal so it can be properly rendered next time.
                     jquery("#statsModal").remove();
                 });
@@ -776,7 +796,7 @@ require([
     };
 
     // Make the drop area accept content items.
-    var makeDroppable = function (id) {
+    var makeDroppable = function(id) {
 
         var destinationPortal = app.portals.destinationPortal;
         var portal;
@@ -786,7 +806,7 @@ require([
          * @id {String} ID of the source item
          * @folder {String} id of the destination folder
          */
-        var copyItem = function (id, folder) {
+        var copyItem = function(id, folder) {
             var type = jquery("#" + id).attr("data-type");
             var portalUrl = jquery("#" + id).attr("data-portal");
             /**
@@ -799,22 +819,23 @@ require([
             } else {
                 portal = app.portals.sourcePortal;
             }
+
             // Ensure the content type is supported before trying to copy it.
             if (isSupported(type)) {
                 // Get the full item description and data from the source.
-                portal.itemDescription(id).done(function (description) {
+                portal.itemDescription(id).done(function(description) {
                     var thumbnailUrl = portal.portalUrl +
                         "sharing/rest/content/items/" + id + "/info/" +
                         description.thumbnail + "?token=" +
                         portal.token;
-                    portal.itemData(id).always(function (data) {
+                    portal.itemData(id).always(function(data) {
                         /**
                          * Post it to the destination using always
                          * to ensure that it copies Web Mapping Applications
                          * which don't have a data component and therefore
                          * generate a failed response.
                          */
-                        destinationPortal.addItem(destinationPortal.username, folder, description, data, thumbnailUrl).done(function (response) {
+                        destinationPortal.addItem(destinationPortal.username, folder, description, data, thumbnailUrl).done(function(response) {
                             var html;
                             if (response.success === true) {
                                 // Update the id parameter to reflect the new item's id.
@@ -823,7 +844,7 @@ require([
                                     newUrl = newUrl.replace("id=" + description.id, "id=" + response.id);
                                     var folder = response.folder || "";
                                     destinationPortal.updateUrl(destinationPortal.username, folder, response.id, newUrl)
-                                        .done(function (status) {
+                                        .done(function() {
                                             jquery("#" + id + "_clone").addClass("btn-success");
                                         });
                                 } else {
@@ -837,7 +858,7 @@ require([
                                 });
                                 jquery("#" + id + "_clone").before(html);
                             }
-                        }).fail(function (response) {
+                        }).fail(function() {
                             html = mustache.to_html(jquery("#contentCopyErrorTemplate").html(), {
                                 id: id,
                                 message: "Something went wrong."
@@ -861,7 +882,7 @@ require([
          * Move the content DOM element from the source
          * to the destination container on the page.
          */
-        var moveItem = function (item, destination) {
+        var moveItem = function(item, destination) {
             "use strict";
             var itemId = jquery(item).attr("data-id");
 
@@ -890,35 +911,35 @@ require([
             accept: ".content",
             activeClass: "ui-state-hover",
             hoverClass: "ui-state-active",
-            drop: function (event, ui) {
+            drop: function(event, ui) {
                 moveItem(ui.draggable, jquery(this).parent().parent());
             }
         });
     };
 
-    var cleanUp = function () {
+    var cleanUp = function() {
         jquery("#dropArea").empty(); //Clear any old items.
         jquery(".content").unbind("click"); // Remove old event handlers.
         jquery(".content").removeClass("active btn-primary btn-info ui-draggable");
         jquery(".content").attr("disabled", "disabled");
     };
 
-    var clearResults = function () {
+    var clearResults = function() {
         // Clean up any existing content in the left hand column.
         jquery("#itemsArea").empty();
     };
 
-    var highlightCopyableContent = function () {
+    var highlightCopyableContent = function() {
 
-        var setMaxWidth = function (el) {
+        var setMaxWidth = function(el) {
             // Set the max-width of folder items so they don't fill the body when dragging.
             var maxWidth = jquery("#itemsArea .in").width() ? jquery("#itemsArea .in").width() : 400;
             jquery(el).css("max-width", maxWidth); // Set the max-width so it doesn't fill the body when dragging.
         };
 
-        jquery("#itemsArea .content").each(function (i) {
+        jquery("#itemsArea .content").each(function() {
 
-            var makeDraggable = function (el) {
+            var makeDraggable = function(el) {
                 el.draggable({
                     cancel: false,
                     helper: "clone",
@@ -938,7 +959,7 @@ require([
         });
     };
 
-    var highlightSupportedContent = function () {
+    var highlightSupportedContent = function() {
         // Highlight content supported by the currently selected action.
         switch (jquery("#actionDropdown li.active").attr("data-action")) {
         case "copyContent":
@@ -965,7 +986,7 @@ require([
      * @return (Boolean)
      * List of types available here: http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r3000000ms000000
      */
-    var isSupported = function (type) {
+    var isSupported = function(type) {
         // Check if the content type is supported.
         //
         var supportedTypes = [
@@ -996,43 +1017,43 @@ require([
         }
     };
 
-    var isTypeText = function (type) {
-        var textTypes = [
-            "Web Map",
-            "Feature Collection",
-            "Feature Collection Template",
-            "Operation View",
-            "Symbol Set",
-            "Color Set",
-            "Document Link"
-        ];
-        if (jquery.inArray(type, textTypes) > -1) {
-            return true;
-        }
-    };
-
-    var isTypeUrl = function (type) {
-        var urlTypes = [
-            "Feature Service",
-            "Map Service",
-            "Image Service",
-            "KML",
-            "WMS",
-            "Geodata Service",
-            "Globe Service",
-            "Geometry Service",
-            "Geocoding Service",
-            "Network Analysis Service",
-            "Geoprocessing Service",
-            "Web Mapping Application",
-            "Mobile Application"
-        ];
-        if (jquery.inArray(type, urlTypes) > -1) {
-            return true;
-        }
-    };
-
-    var listSearchItems = function (portalUrl, results) {
+//    var isTypeText = function(type) {
+//        var textTypes = [
+//            "Web Map",
+//            "Feature Collection",
+//            "Feature Collection Template",
+//            "Operation View",
+//            "Symbol Set",
+//            "Color Set",
+//            "Document Link"
+//        ];
+//        if (jquery.inArray(type, textTypes) > -1) {
+//            return true;
+//        }
+//    };
+//
+//    var isTypeUrl = function(type) {
+//        var urlTypes = [
+//            "Feature Service",
+//            "Map Service",
+//            "Image Service",
+//            "KML",
+//            "WMS",
+//            "Geodata Service",
+//            "Globe Service",
+//            "Geometry Service",
+//            "Geocoding Service",
+//            "Network Analysis Service",
+//            "Geoprocessing Service",
+//            "Web Mapping Application",
+//            "Mobile Application"
+//        ];
+//        if (jquery.inArray(type, urlTypes) > -1) {
+//            return true;
+//        }
+//    };
+
+    var listSearchItems = function(portalUrl, results) {
         "use strict";
         clearResults();
 
@@ -1043,14 +1064,15 @@ require([
         };
         var html = mustache.to_html(jquery("#folderTemplate").html(), folderData);
         jquery("#itemsArea").append(html);
+
         // Append the root items to the Root folder.
-        jquery.each(results.results, function (item) {
+        jquery.each(results.results, function() {
             var templateData = {
-                "id": this.id,
-                "title": this.title,
-                "type": this.type,
-                "icon": portalInfo.items(this.type).icon,
-                "portal": portalUrl
+                id: this.id,
+                title: this.title,
+                type: this.type,
+                icon: portalInfo.items(this.type).icon,
+                portal: portalUrl
             };
             var html = mustache.to_html(jquery("#contentTemplate").html(), templateData);
             jquery("#collapse_search").append(html)
@@ -1060,7 +1082,7 @@ require([
         highlightSupportedContent();
     };
 
-    var listUserItems = function () {
+    var listUserItems = function() {
         "use strict";
         var portal = app.portals.sourcePortal;
 
@@ -1075,26 +1097,29 @@ require([
 
         function sortFoldersAlpha(container) {
             var folders = container.children(".panel").get();
-            folders.sort(function (a, b) {
+            folders.sort(function(a, b) {
                 return jquery(a).children("div.panel-heading").attr("data-title").toUpperCase().localeCompare(jquery(b).children("div.panel-heading").attr("data-title").toUpperCase());
             });
-            jquery.each(folders, function (idx, folder) {
+
+            jquery.each(folders, function(idx, folder) {
                 container.append(folder);
             });
+
             container.prepend(jquery("[data-title='Root']").parent());
         }
 
         function sortItemsAlpha(folder) {
             var folderItems = folder.children("button").get();
-            folderItems.sort(function (a, b) {
+            folderItems.sort(function(a, b) {
                 return jquery(a).text().toUpperCase().localeCompare(jquery(b).text().toUpperCase());
             });
-            jquery.each(folderItems, function (idx, item) {
+
+            jquery.each(folderItems, function(idx, item) {
                 folder.append(item);
             });
         }
 
-        portal.userContent(portal.username, "/").done(function (content) {
+        portal.userContent(portal.username, "/").done(function(content) {
             // Append the root folder accordion.
             var folderData = {
                 title: "Root",
@@ -1103,49 +1128,55 @@ require([
             };
             var html = mustache.to_html(jquery("#folderTemplate").html(), folderData);
             jquery("#itemsArea").append(html);
+
             // Append the root items to the Root folder.
-            jquery.each(content.items, function (item) {
+            jquery.each(content.items, function(item) {
                 var templateData = {
-                    "id": this.id,
-                    "title": this.title,
-                    "type": this.type,
-                    "icon": portalInfo.items(this.type).icon,
-                    "portal": portal.portalUrl
+                    id: this.id,
+                    title: this.title,
+                    type: this.type,
+                    icon: portalInfo.items(this.type).icon,
+                    portal: portal.portalUrl
                 };
                 var html = mustache.to_html(jquery("#contentTemplate").html(), templateData);
                 jquery("#collapse_").append(html);
                 storeActivity(content.items[item].modified);
             });
+
             sortItemsAlpha(jquery("#collapse_"));
-            jquery.each(content.folders, function (folder) {
+            jquery.each(content.folders, function(folder) {
                 sortFoldersAlpha(jquery("#itemsArea"));
                 portal.userContent(portal.username, content.folders[folder].id)
-                    .done(function (content) {
+                    .done(function(content) {
                         var folderData = {
                             title: content.currentFolder.title,
                             id: content.currentFolder.id,
                             count: content.items.length
                         };
+
                         // Append an accordion for the folder.
                         var html = mustache.to_html(jquery("#folderTemplate").html(), folderData);
                         jquery("#itemsArea").append(html);
+
                         // Append the items to the folder.
-                        jquery.each(content.items, function (item) {
+                        jquery.each(content.items, function(item) {
                             var templateData = {
-                                "id": this.id,
-                                "title": this.title,
-                                "type": this.type,
-                                "icon": portalInfo.items(this.type).icon,
-                                "portal": portal.portalUrl
+                                id: this.id,
+                                title: this.title,
+                                type: this.type,
+                                icon: portalInfo.items(this.type).icon,
+                                portal: portal.portalUrl
                             };
                             var html = mustache.to_html(jquery("#contentTemplate").html(), templateData);
                             jquery("#collapse_" + content.currentFolder.id).append(html);
                             storeActivity(content.items[item].modified);
                         });
+
                         sortItemsAlpha(jquery("#collapse_" + content.currentFolder.id));
                     });
             });
-            setTimeout(function () {
+
+            setTimeout(function() {
                 // Wait a second to let all of the items populate before sorting and highlighting them.
                 sortFoldersAlpha(jquery("#itemsArea"));
                 highlightSupportedContent();
@@ -1153,75 +1184,85 @@ require([
         });
     };
 
-    var showDestinationFolders = function () {
+    var showDestinationFolders = function() {
         "use strict";
         var portal = app.portals.destinationPortal;
 
         function sortItemsAlpha(folder) {
             var folderItems = folder.children("button").get();
-            folderItems.sort(function (a, b) {
+            folderItems.sort(function(a, b) {
                 return jquery(a).text().toUpperCase().localeCompare(jquery(b).text().toUpperCase());
             });
-            jquery.each(folderItems, function (idx, item) {
+
+            jquery.each(folderItems, function(idx, item) {
                 folder.append(item);
             });
         }
 
-        portal.userContent(portal.username, "/").done(function (content) {
+        portal.userContent(portal.username, "/").done(function(content) {
             var folderData = {
                 title: "Root",
                 id: "",
                 count: content.items.length
             };
+
             // Append the root folder accordion.
             var html = mustache.to_html(jquery("#dropFolderTemplate").html(),
                 folderData
             );
             jquery("#dropArea").append(html);
+
             // Append the root items to the Root folder.
-            jquery.each(content.items, function (item) {
+            jquery.each(content.items, function() {
                 var templateData = {
-                    "id": this.id,
-                    "title": this.title,
-                    "type": this.type,
-                    "icon": portalInfo.items(this.type).icon,
-                    "portal": portal.portalUrl
+                    id: this.id,
+                    title: this.title,
+                    type: this.type,
+                    icon: portalInfo.items(this.type).icon,
+                    portal: portal.portalUrl
                 };
                 var html = mustache.to_html(jquery("#contentTemplate").html(), templateData);
                 jquery("#collapseDest_").append(html);
             });
+
             sortItemsAlpha(jquery("#collapseDest_"));
+
             // Enable the droppable area.
             makeDroppable("");
+
             // Append the other folders.
-            jquery.each(content.folders, function (folder) {
+            jquery.each(content.folders, function(folder) {
                 portal.userContent(portal.username, content.folders[folder].id)
-                    .done(function (content) {
+                    .done(function(content) {
                         var folderData = {
                             title: content.currentFolder.title,
                             id: content.currentFolder.id,
                             count: content.items.length
                         };
+
                         // Append an accordion for the folder.
                         var template = jquery("#dropFolderTemplate").html();
                         var html = mustache.to_html(template, folderData);
                         jquery("#dropArea").append(html);
+
                         // Append the items to the folder.
-                        jquery.each(content.items, function (item) {
+                        jquery.each(content.items, function() {
                             var templateData = {
-                                "id": this.id,
-                                "title": this.title,
-                                "type": this.type,
-                                "icon": portalInfo.items(this.type).icon,
-                                "portal": portal.portalUrl
+                                id: this.id,
+                                title: this.title,
+                                type: this.type,
+                                icon: portalInfo.items(this.type).icon,
+                                portal: portal.portalUrl
                             };
                             var html = mustache.to_html(jquery("#contentTemplate").html(), templateData);
                             jquery("#collapseDest_" + content.currentFolder.id).append(html);
                         });
+
                         // Collapse the accordion to avoid cluttering the display.
                         jquery("#collapseDest_" + content.currentFolder.id)
                             .collapse("hide");
                         sortItemsAlpha(jquery("#collapseDest_" + content.currentFolder.id));
+
                         // Enable the droppable area.
                         makeDroppable(content.currentFolder.id);
                     });
@@ -1230,10 +1271,10 @@ require([
     };
 
     // Do stuff when the DOM is ready.
-    jquery(document).ready(function () {
+    jquery(document).ready(function() {
 
         // Load the html templates.
-        jquery.get("templates.html", function (templates) {
+        jquery.get("templates.html", function(templates) {
             jquery("body").append(templates);
 
             // Enable the login button.
@@ -1246,7 +1287,7 @@ require([
             esriId.registerOAuthInfos([appInfo]);
             esriId.checkSignInStatus(appInfo.portalUrl)
                 .then(
-                    function (user) {
+                    function(user) {
                         jquery("#splashContainer").css("display", "none");
                         jquery("#itemsContainer").css("display", "block");
                         app.portals.sourcePortal = new portalSelf.Portal({
@@ -1257,7 +1298,7 @@ require([
                         startSession();
                     })
                 .otherwise(
-                    function () {
+                    function() {
                         jquery("#itemsContainer").css("display", "none");
                         jquery("#splashContainer").css("display", "block");
                     }
@@ -1265,50 +1306,52 @@ require([
         });
 
         // Resize the content areas to fill the window.
-        var resizeContentAreas = function () {
+        var resizeContentAreas = function() {
             "use strict";
             jquery(".itemArea").height(jquery(window).height() - 50);
         };
+
         resizeContentAreas();
 
         // Disable the enter key to prevent accidentally firing forms.
         // Disable it for everything except the code edit windows.
-        var disableEnterKey = function () {
+        var disableEnterKey = function() {
             "use strict";
-            jquery("html").bind("keypress", function (e) {
+            jquery("html").bind("keypress", function(e) {
                 if (e.keyCode === 13 &&
                     jquery(e.target).attr("contenteditable") !== "true") {
                     return false;
                 }
             });
         };
+
         disableEnterKey();
 
         // Preformat the copy login screen.
         jquery("#destinationAgolBtn").button("toggle");
         jquery("#destinationAgolBtn").addClass("btn-primary");
         jquery("#destinationUrl").css({
-            "display": "none"
+            display: "none"
         });
         jquery("#destinationWebTierAuth").css({
-            "display": "none"
+            display: "none"
         });
 
         // *** Global Listeners ***
-        jquery("#destinationAgolBtn").click(function () {
+        jquery("#destinationAgolBtn").click(function() {
             jquery(".alert-danger.alert-dismissable").remove();
             jquery("#destinationUrl").next().removeClass("glyphicon-ok");
             jquery("#destinationUrl").parent().removeClass("has-error");
             jquery("#destinationUrl").attr({
-                "placeholder": "",
-                "value": "https://www.arcgis.com/"
+                placeholder: "",
+                value: "https://www.arcgis.com/"
             });
             jquery("#destinationUrl").val("https://www.arcgis.com/");
             jquery("#destinationUrl").css({
-                "display": "none"
+                display: "none"
             });
             jquery("#destinationWebTierAuth").css({
-                "display": "none"
+                display: "none"
             });
             jquery("#destinationAgolBtn").addClass("btn-primary active");
             jquery("#destinationPortalBtn").removeClass("btn-primary active");
@@ -1316,49 +1359,50 @@ require([
                 app.portals.destinationPortal.portalUrl = "https://www.arcgis.com/";
             }
         });
-        jquery("#destinationPortalBtn").click(function () {
+
+        jquery("#destinationPortalBtn").click(function() {
             jquery("#destinationUrl").attr({
-                "placeholder": "https://myportal.com/",
-                "value": ""
+                placeholder: "https://myportal.com/",
+                value: ""
             });
             jquery("#destinationUrl").val("");
             jquery("#destinationUrl").css({
-                "display": "block"
+                display: "block"
             });
             jquery("#destinationWebTierAuth").css({
-                "display": "block"
+                display: "block"
             });
             jquery("#destinationPortalBtn").addClass("btn-primary active");
             jquery("#destinationAgolBtn").removeClass("btn-primary active");
         });
 
         // Make DOM adjustments when the browser is resized.
-        jquery(window).resize(function () {
+        jquery(window).resize(function() {
             resizeContentAreas();
         });
 
         // Validate the entered url when the input loses focus.
-        jquery("#portalUrl").blur(function () {
+        jquery("#portalUrl").blur(function() {
 
             if (!app.portals.sourcePortal) {
                 app.portals.sourcePortal = new portalSelf.Portal();
             }
 
             // Give the DOM time to update before firing the validation.
-            setTimeout(function () {
+            setTimeout(function() {
                 validateUrl("#portalUrl", app.portals.sourcePortal);
             }, 500);
         });
 
         // Validate the url when the input loses focus.
-        jquery("#destinationUrl").blur(function () {
+        jquery("#destinationUrl").blur(function() {
 
             if (!app.portals.destinationPortal) {
                 app.portals.destinationPortal = new portalSelf.Portal();
             }
 
             // Give the DOM time to update before firing the validation.
-            setTimeout(function () {
+            setTimeout(function() {
                 if (jquery("#destinationPortalBtn").hasClass("active")) {
                     validateUrl("#destinationUrl", app.portals.destinationPortal);
                 }
@@ -1366,7 +1410,7 @@ require([
         });
 
         // Disable username and password if web tier auth is selected.
-        jquery("#sourceWebTierAuth").click(function (e) {
+        jquery("#sourceWebTierAuth").click(function(e) {
             var checkboxState = jquery(e.currentTarget).prop("checked");
             if (checkboxState === true) {
                 jquery("#portalUsername").attr("disabled", true);
@@ -1382,7 +1426,7 @@ require([
         });
 
         // Disable username and password if web tier auth is selected.
-        jquery("#destWebTierAuthChk").click(function (e) {
+        jquery("#destWebTierAuthChk").click(function(e) {
             var checkboxState = jquery(e.currentTarget).prop("checked");
             if (checkboxState === true) {
                 jquery("#destinationUsername").attr("disabled", true);
@@ -1398,11 +1442,11 @@ require([
         });
 
         // Login.
-        jquery("[data-action='login']").click(function () {
+        jquery("[data-action='login']").click(function() {
             esriId.getCredential(appInfo.portalUrl, {
                     oAuthPopupConfirmation: false
                 })
-                .then(function (user) {
+                .then(function(user) {
                     jquery("#splashContainer").css("display", "none");
                     jquery("#itemsContainer").css("display", "block");
                     app.portals.sourcePortal = new portalSelf.Portal({
@@ -1415,7 +1459,7 @@ require([
         });
 
         // Log into a Portal.
-        jquery("#portalLoginBtn").click(function () {
+        jquery("#portalLoginBtn").click(function() {
             loginPortal();
         });
 
@@ -1423,7 +1467,7 @@ require([
          * Use the existing credentials when "My Account"
          * is selected as the copy target.
          */
-        jquery("[data-action='copyMyAccount']").click(function () {
+        jquery("[data-action='copyMyAccount']").click(function() {
             app.portals.destinationPortal = app.portals.sourcePortal;
             jquery("#copyModal").modal("hide");
             highlightCopyableContent();
@@ -1436,35 +1480,35 @@ require([
          * Show other destination form when "Another Account"
          * is selected as the copy target.
          */
-        jquery("[data-action='copyOtherAccount']").click(function () {
+        jquery("[data-action='copyOtherAccount']").click(function() {
             jquery("#destinationChoice").css("display", "none");
             jquery("#destinationForm").css("display", "block");
         });
 
         // Log in to the destination account.
-        jquery("#destinationLoginBtn").click(function () {
+        jquery("#destinationLoginBtn").click(function() {
             loginDestination();
         });
 
         // Reset the destination login form when the modal is canceled.
-        jquery("#destinationLoginBtn").click(function () {
+        jquery("#destinationLoginBtn").click(function() {
             jquery("#destinationLoginBtn").button("reset");
         });
 
         // Clear the copy action when the cancel button is clicked.
-        jquery("#destinationCancelBtn").click(function () {
+        jquery("#destinationCancelBtn").click(function() {
             jquery("#actionDropdown li").removeClass("active");
         });
 
         // Add a listener for the enter key on the destination login form.
-        jquery("#destinationLoginForm").keypress(function (e) {
+        jquery("#destinationLoginForm").keypress(function(e) {
             if (e.which == 13) {
                 jquery("#destinationLoginBtn").focus().click();
             }
         });
 
         // Add a listener for the future search bar picker.
-        jquery(document).on("click", "#searchMenu li", function (e) {
+        jquery(document).on("click", "#searchMenu li", function(e) {
             var selectedAction = jquery(e.target).parent().attr("data-action");
             if (selectedAction !== "viewMyContent") {
                 jquery("#searchMenu li").removeClass("active");
@@ -1484,16 +1528,18 @@ require([
             }
         });
 
-        jquery(document).on("click", "li [data-action]", function (e) {
+        jquery(document).on("click", "li [data-action]", function(e) {
             // Highlight the selected action except for "View My Stats."
             var selectedAction = jquery(e.target).parent().attr("data-action");
             if (selectedAction !== "stats") {
                 jquery("#actionDropdown li").removeClass("active");
                 jquery(e.target).parent().addClass("active");
             }
+
             // Choose what to do based on the selection.
             switch (selectedAction) {
             case "inspectContent":
+
                 // Enable inspecting of content.
                 cleanUp();
                 inspectContent();
@@ -1516,7 +1562,7 @@ require([
         });
 
         // Clean up the lists when copy content is selected.
-        jquery("#copyModal").on("show.bs.modal", function () {
+        jquery("#copyModal").on("show.bs.modal", function() {
             cleanUp();
             jquery("#destinationChoice").css("display", "block");
             jquery("#destinationForm").css("display", "none");
@@ -1524,4 +1570,4 @@ require([
 
     });
 
-});
\ No newline at end of file
+});
diff --git a/src/js/portal/info.js b/src/js/portal/info.js
index 83d6728..e89ff8f 100644
--- a/src/js/portal/info.js
+++ b/src/js/portal/info.js
@@ -1,4 +1,4 @@
-define([], function () {
+define([], function() {
     var types = [
         {
             type: "CityEngine Web Scene",
@@ -102,17 +102,19 @@ define([], function () {
         },
     ];
     return {
-        items: function (type) {
-            var info = types.filter(function (item) {
+        items: function(type) {
+            var info = types.filter(function(item) {
                 return item.type === type;
             })[0];
+
             if (!info) {
                 // Handle types not found in the above list.
                 return {
                     icon: "datafilesGray"
                 };
             }
+
             return info;
         }
     };
-});
\ No newline at end of file
+});
diff --git a/src/js/portal/portal.js b/src/js/portal/portal.js
index d9ba378..41a4163 100644
--- a/src/js/portal/portal.js
+++ b/src/js/portal/portal.js
@@ -1,6 +1,6 @@
-define(["jquery", "portal/util"], function (jquery, util) {
+define(["jquery", "portal/util"], function(jquery, util) {
     return {
-        Portal: function (config) {
+        Portal: function(config) {
             config = typeof config !== "undefined" ? config : {};
             this.portalUrl = config.portalUrl;
             this.username = config.username;
@@ -9,7 +9,7 @@ define(["jquery", "portal/util"], function (jquery, util) {
             /**
              * Return the version of the portal.
              */
-            this.version = function () {
+            this.version = function() {
                 return jquery.ajax({
                     type: "GET",
                     url: this.portalUrl + "sharing/rest?f=json",
@@ -23,7 +23,7 @@ define(["jquery", "portal/util"], function (jquery, util) {
              * Return the view of the portal as seen by the current user,
              * anonymous or logged in.
              */
-            this.self = function () {
+            this.self = function() {
                 return jquery.ajax({
                     type: "GET",
                     url: this.portalUrl + "sharing/rest/portals/self?" + jquery.param({
@@ -40,7 +40,7 @@ define(["jquery", "portal/util"], function (jquery, util) {
              * Generates an access token in exchange for user credentials that
              * can be used by clients when working with the ArcGIS Portal API.
              */
-            this.generateToken = function (username, password) {
+            this.generateToken = function(username, password) {
                 return jquery.ajax({
                     type: "POST",
                     url: this.portalUrl + "sharing/rest/generateToken?",
@@ -63,7 +63,7 @@ define(["jquery", "portal/util"], function (jquery, util) {
              * (token) has permission to access.
              * Excluding a token will yield only public items.
              */
-            this.search = function (query, numResults, sortField, sortOrder) {
+            this.search = function(query, numResults, sortField, sortOrder) {
                 return jquery.ajax({
                     type: "GET",
                     url: this.portalUrl + "sharing/rest/search?",
@@ -81,8 +81,8 @@ define(["jquery", "portal/util"], function (jquery, util) {
                     }
                 });
             };
-            this.userProfile = function (username) {
-                // 
+
+            this.userProfile = function(username) {
                 return jquery.ajax({
                     type: "GET",
                     url: this.portalUrl + "sharing/rest/community/users/" + username + "?",
@@ -96,8 +96,8 @@ define(["jquery", "portal/util"], function (jquery, util) {
                     }
                 });
             };
-            this.userContent = function (username, folder) {
-                // 
+
+            this.userContent = function(username, folder) {
                 return jquery.ajax({
                     type: "GET",
                     url: this.portalUrl + "sharing/rest/content/users/" + username + "/" + folder + "?",
@@ -111,8 +111,8 @@ define(["jquery", "portal/util"], function (jquery, util) {
                     }
                 });
             };
-            this.itemDescription = function (id) {
-                // 
+
+            this.itemDescription = function(id) {
                 return jquery.ajax({
                     type: "GET",
                     url: this.portalUrl + "sharing/rest/content/items/" + id + "?",
@@ -126,8 +126,8 @@ define(["jquery", "portal/util"], function (jquery, util) {
                     }
                 });
             };
-            this.itemData = function (id) {
-                // 
+
+            this.itemData = function(id) {
                 return jquery.ajax({
                     type: "GET",
                     url: this.portalUrl + "sharing/rest/content/items/" + id + "/data?",
@@ -141,15 +141,15 @@ define(["jquery", "portal/util"], function (jquery, util) {
                     }
                 });
             };
+
             /**
              * Create a new item on the specified portal.
              */
-            this.addItem = function (username, folder, description, data, thumbnailUrl) {
-
+            this.addItem = function(username, folder, description, data, thumbnailUrl) {
                 // Clean up description items for posting.
                 // This is necessary because some of the item descriptions (e.g. tags and extent)
                 // are returned as arrays, but the post operation expects comma separated strings.
-                jquery.each(description, function (item, value) {
+                jquery.each(description, function(item, value) {
                     if (value === null) {
                         description[item] = "";
                     } else if (value instanceof Array) {
@@ -179,7 +179,7 @@ define(["jquery", "portal/util"], function (jquery, util) {
             /**
              * Update the content in a web map.
              */
-            this.updateWebmapData = function (username, folder, id, data) {
+            this.updateWebmapData = function(username, folder, id, data) {
                 return jquery.ajax({
                     type: "POST",
                     url: this.portalUrl + "sharing/rest/content/users/" + username + "/" + folder + "/items/" + id + "/update?",
@@ -197,7 +197,7 @@ define(["jquery", "portal/util"], function (jquery, util) {
             /**
              * Update the description for an item.
              */
-            this.updateDescription = function (username, id, folder, description) {
+            this.updateDescription = function(username, id, folder, description) {
                 var postData = JSON.parse(description);
                 /**
                  * Clean up description items for posting.
@@ -205,13 +205,14 @@ define(["jquery", "portal/util"], function (jquery, util) {
                  * (e.g. tags and extent) are returned as arrays, but the post
                  * operation expects comma separated strings.
                  */
-                jquery.each(postData, function (item, value) {
+                jquery.each(postData, function(item, value) {
                     if (value === null) {
                         postData[item] = "";
                     } else if (value instanceof Array) {
                         postData[item] = value.join(",");
                     }
                 });
+
                 postData.token = this.token;
                 postData.f = "json";
                 return jquery.ajax({
@@ -224,7 +225,8 @@ define(["jquery", "portal/util"], function (jquery, util) {
                     }
                 });
             };
-            this.updateData = function (username, id, folder, data) {
+
+            this.updateData = function(username, id, folder, data) {
                 // Update the content in a web map.
                 return jquery.ajax({
                     type: "POST",
@@ -243,8 +245,8 @@ define(["jquery", "portal/util"], function (jquery, util) {
             /**
              * Update the URL of a registered service or web application.
              */
-            this.updateUrl = function (username, folder, id, url) {
-                return $.ajax({
+            this.updateUrl = function(username, folder, id, url) {
+                return jquery.ajax({
                     type: "POST",
                     url: this.portalUrl + "sharing/rest/content/users/" + username + "/" + folder + "/items/" + id + "/update?",
                     data: {
@@ -260,4 +262,4 @@ define(["jquery", "portal/util"], function (jquery, util) {
             };
         }
     };
-});
\ No newline at end of file
+});
diff --git a/src/js/portal/util.js b/src/js/portal/util.js
index def2b7e..1b9d6f5 100644
--- a/src/js/portal/util.js
+++ b/src/js/portal/util.js
@@ -1,19 +1,21 @@
-define(["jquery"], function (jquery) {
+define(["jquery"], function(jquery) {
     return {
         // Convert an array to a comma separated string.
-        arrayToString: function (array) {
+        arrayToString: function(array) {
             var arrayString;
-            jquery.each(array, function (index, arrayValue) {
+            jquery.each(array, function(index, arrayValue) {
                 if (index === 0) {
                     arrayString = arrayValue;
                 } else if (index > 0) {
                     arrayString = arrayString + "," + arrayValue;
                 }
             });
+
             return arrayString;
         },
+
         // Clean up common issues with user entered portal URLs.
-        fixUrl: function (portalUrl) {
+        fixUrl: function(portalUrl) {
             var deferred = jquery.Deferred();
             if (portalUrl === "") {
                 // Default to ArcGIS Online.
@@ -30,8 +32,9 @@ define(["jquery"], function (jquery) {
                 // Add the trailing slash.
                 portalUrl = portalUrl + "/";
             }
+
             deferred.resolve(portalUrl);
             return deferred.promise();
         }
     };
-});
\ No newline at end of file
+});

From c661ad37ded90be921c23eddc4f2c52bd38dca16 Mon Sep 17 00:00:00 2001
From: Evan Caldwell <evan.caldwell@gmail.com>
Date: Wed, 21 Oct 2015 17:47:22 -0400
Subject: [PATCH 2/4] remove unnecessary lazy loading

All it did was add extra indents.
---
 src/js/main.js | 463 ++++++++++++++++++++++++-------------------------
 1 file changed, 230 insertions(+), 233 deletions(-)

diff --git a/src/js/main.js b/src/js/main.js
index ec31376..ecec725 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -255,261 +255,258 @@ require([
     };
 
     var inspectContent = function() {
-        require(["nprogress", "highlight"],
-            function(NProgress, hljs) {
-
-                var portal;
-                var jsonBackup;
-                var jsonValid;
-
-                var validateJson = function(jsonString) {
-                    try {
-                        var o = JSON.parse(jsonString);
-                        if (o && typeof o === "object" && o !== null) {
-                            return o;
-                        }
-                    } catch (e) {}
 
-                    return false;
-                };
+        var portal;
+        var jsonBackup;
+        var jsonValid;
+
+        var validateJson = function(jsonString) {
+            try {
+                var o = JSON.parse(jsonString);
+                if (o && typeof o === "object" && o !== null) {
+                    return o;
+                }
+            } catch (e) {}
+
+            return false;
+        };
+
+        var startEditing = function(e) {
+
+            // Allow removing the button active state.
+            e.stopImmediatePropagation();
+
+            var codeBlock = jquery(e.currentTarget)
+                .parent()
+                .next();
+            var editButton = jquery(e.currentTarget);
+            var saveButton = jquery(e.currentTarget)
+                .parent()
+                .children("[data-action='saveEdits']");
+
+            // Reset the save button.
+            saveButton
+                .children("span")
+                .attr("class", "fa fa-lg fa-save");
+
+            if (codeBlock.attr("contentEditable") !== "true") {
+                // Start editing.
+                editButton
+                    .children("span")
+                    .attr("class", "fa fa-lg fa-undo");
+                editButton.attr("data-toggle", "tooltip");
+                editButton.attr("data-placement", "bottom");
+                editButton.attr("title", "Discard your edits");
+                editButton.tooltip();
+                jsonBackup = codeBlock.text();
+                codeBlock.attr("contentEditable", "true");
+                codeBlock.bind("input", function() {
+                    // Validate the JSON as it is edited.
+                    jsonValid = validateJson(codeBlock.text());
+                    saveButton.tooltip("destroy");
+                    if (jsonValid) {
+                        // Valid. Allow saving.
+                        saveButton.removeClass("disabled");
+                        saveButton.css("color", "green");
+                        saveButton.attr("data-toggle", "tooltip");
+                        saveButton.attr("data-placement", "bottom");
+                        saveButton.attr("title",
+                            "JSON is valid. Click to save."
+                        );
+                    } else {
+                        // Invalid. Prevent saving.
+                        saveButton.css("color", "red");
+                        saveButton.attr("data-toggle", "tooltip");
+                        saveButton.attr("data-placement", "bottom");
+                        saveButton.attr("title",
+                            "JSON is invalid. Saving not allowed."
+                        );
+                    }
+
+                    saveButton.tooltip({
+                        container: "body"
+                    });
+                });
+
+                editButton.attr("class", "btn btn-default");
+                saveButton.attr("class", "btn btn-default");
+            } else {
+                // Let the user back out of editing without saving.
+                // End editing and restore the original json.
+                codeBlock.attr("contentEditable", "false");
+                codeBlock.text(jsonBackup);
+                codeBlock.each(function(i, e) {
+                    hljs.highlightBlock(e);
+                });
 
-                var startEditing = function(e) {
-
-                    // Allow removing the button active state.
-                    e.stopImmediatePropagation();
-
-                    var codeBlock = jquery(e.currentTarget)
-                        .parent()
-                        .next();
-                    var editButton = jquery(e.currentTarget);
-                    var saveButton = jquery(e.currentTarget)
-                        .parent()
-                        .children("[data-action='saveEdits']");
-
-                    // Reset the save button.
-                    saveButton
-                        .children("span")
-                        .attr("class", "fa fa-lg fa-save");
-
-                    if (codeBlock.attr("contentEditable") !== "true") {
-                        // Start editing.
-                        editButton
-                            .children("span")
-                            .attr("class", "fa fa-lg fa-undo");
-                        editButton.attr("data-toggle", "tooltip");
-                        editButton.attr("data-placement", "bottom");
-                        editButton.attr("title", "Discard your edits");
-                        editButton.tooltip();
-                        jsonBackup = codeBlock.text();
-                        codeBlock.attr("contentEditable", "true");
-                        codeBlock.bind("input", function() {
-                            // Validate the JSON as it is edited.
-                            jsonValid = validateJson(codeBlock.text());
-                            saveButton.tooltip("destroy");
-                            if (jsonValid) {
-                                // Valid. Allow saving.
-                                saveButton.removeClass("disabled");
+                editButton.attr("class", "btn btn-default");
+                editButton.children("span")
+                    .attr("class", "fa fa-lg fa-pencil");
+                editButton.tooltip("destroy");
+                saveButton.attr("class", "btn btn-default disabled");
+                saveButton.css("color", "black");
+            }
+
+            // Post the edited JSON.
+            saveButton.click(function() {
+                if (jsonValid) {
+                    // JSON is valid. Allow saving.
+                    var newJson = codeBlock.text();
+                    var itemInfo = JSON.parse(
+                        jquery("#descriptionJson").text()
+                    );
+                    editButton.attr("class", "btn btn-default");
+                    editButton.children("span")
+                        .attr("class", "fa fa-lg fa-pencil");
+                    saveButton.attr("class",
+                        "btn btn-default disabled"
+                    );
+                    saveButton.css("color", "black");
+                    codeBlock.attr("contentEditable", "false");
+
+                    // Post the changes.
+                    saveButton.children("span")
+                        .attr("class", "fa fa-lg fa-spinner fa-spin");
+                    var ownerFolder;
+                    if (itemInfo.ownerFolder) {
+                        ownerFolder = itemInfo.ownerFolder;
+                    } else {
+                        ownerFolder = "/";
+                    }
+
+                    if (editButton.attr("data-container") === "Description") {
+                        portal.updateDescription(itemInfo.owner, itemInfo.id, ownerFolder, newJson).done(function(response) {
+                            if (response.success) {
+                                saveButton.children("span").attr("class", "fa fa-lg fa-check");
                                 saveButton.css("color", "green");
-                                saveButton.attr("data-toggle", "tooltip");
-                                saveButton.attr("data-placement", "bottom");
-                                saveButton.attr("title",
-                                    "JSON is valid. Click to save."
-                                );
                             } else {
-                                // Invalid. Prevent saving.
+                                saveButton.children("span").attr("class", "fa fa-lg fa-times");
                                 saveButton.css("color", "red");
-                                saveButton.attr("data-toggle", "tooltip");
-                                saveButton.attr("data-placement", "bottom");
-                                saveButton.attr("title",
-                                    "JSON is invalid. Saving not allowed."
-                                );
                             }
-
-                            saveButton.tooltip({
-                                container: "body"
-                            });
                         });
-
-                        editButton.attr("class", "btn btn-default");
-                        saveButton.attr("class", "btn btn-default");
-                    } else {
-                        // Let the user back out of editing without saving.
-                        // End editing and restore the original json.
-                        codeBlock.attr("contentEditable", "false");
-                        codeBlock.text(jsonBackup);
-                        codeBlock.each(function(i, e) {
-                            hljs.highlightBlock(e);
+                    } else if (editButton.attr("data-container") === "Data") {
+                        saveButton.children("span").attr("class", "fa fa-lg fa-spinner fa-spin");
+                        portal.updateData(itemInfo.owner, itemInfo.id, ownerFolder, newJson).done(function(response) {
+                            if (response.success) {
+                                saveButton.children("span").attr("class", "fa fa-lg fa-check");
+                                saveButton.css("color", "green");
+                            } else {
+                                saveButton.children("span").attr("class", "fa fa-lg fa-times");
+                                saveButton.css("color", "red");
+                            }
                         });
-
-                        editButton.attr("class", "btn btn-default");
-                        editButton.children("span")
-                            .attr("class", "fa fa-lg fa-pencil");
-                        editButton.tooltip("destroy");
-                        saveButton.attr("class", "btn btn-default disabled");
-                        saveButton.css("color", "black");
                     }
+                } else {
+                    saveButton.removeClass("active");
+                }
+            });
+        };
 
-                    // Post the edited JSON.
-                    saveButton.click(function() {
-                        if (jsonValid) {
-                            // JSON is valid. Allow saving.
-                            var newJson = codeBlock.text();
-                            var itemInfo = JSON.parse(
-                                jquery("#descriptionJson").text()
-                            );
-                            editButton.attr("class", "btn btn-default");
-                            editButton.children("span")
-                                .attr("class", "fa fa-lg fa-pencil");
-                            saveButton.attr("class",
-                                "btn btn-default disabled"
-                            );
-                            saveButton.css("color", "black");
-                            codeBlock.attr("contentEditable", "false");
-
-                            // Post the changes.
-                            saveButton.children("span")
-                                .attr("class", "fa fa-lg fa-spinner fa-spin");
-                            var ownerFolder;
-                            if (itemInfo.ownerFolder) {
-                                ownerFolder = itemInfo.ownerFolder;
-                            } else {
-                                ownerFolder = "/";
-                            }
+        jquery(".content").addClass("data-toggle");
+        jquery(".content").removeAttr("disabled");
+        jquery(".content").attr("data-toggle", "button");
+        jquery(".content").addClass("btn-info");
 
-                            if (editButton.attr("data-container") === "Description") {
-                                portal.updateDescription(itemInfo.owner, itemInfo.id, ownerFolder, newJson).done(function(response) {
-                                    if (response.success) {
-                                        saveButton.children("span").attr("class", "fa fa-lg fa-check");
-                                        saveButton.css("color", "green");
-                                    } else {
-                                        saveButton.children("span").attr("class", "fa fa-lg fa-times");
-                                        saveButton.css("color", "red");
-                                    }
-                                });
-                            } else if (editButton.attr("data-container") === "Data") {
-                                saveButton.children("span").attr("class", "fa fa-lg fa-spinner fa-spin");
-                                portal.updateData(itemInfo.owner, itemInfo.id, ownerFolder, newJson).done(function(response) {
-                                    if (response.success) {
-                                        saveButton.children("span").attr("class", "fa fa-lg fa-check");
-                                        saveButton.css("color", "green");
-                                    } else {
-                                        saveButton.children("span").attr("class", "fa fa-lg fa-times");
-                                        saveButton.css("color", "red");
-                                    }
-                                });
+        jquery("#inspectModal").modal("hide");
+        jquery("#inspectBtn").button("reset");
+
+        // Add a listener for clicking on content buttons.
+        jquery(".content").click(function() {
+            var server = jquery(this).attr("data-portal");
+            var id = jquery(this).attr("data-id");
+            var title = jquery(this).text();
+            var itemData;
+
+            /**
+             * Prevent trying to pass a portal token when
+             * inspecting content from an ArcGIS Online search.
+             */
+            if (server === "https://www.arcgis.com/" &&
+                server !== app.portals.sourcePortal.portalUrl) {
+                portal = app.portals.arcgisOnline;
+            } else {
+                portal = app.portals.sourcePortal;
+            }
+
+            NProgress.start();
+            jquery(".content").addClass("btn-info");
+            jquery(".content").removeClass("active");
+            jquery(".content").removeClass("btn-primary");
+            jquery(this).addClass("btn-primary");
+            jquery(this).removeClass("btn-info");
+            portal.itemDescription(id)
+                .done(function(description) {
+                    portal.itemData(id)
+                        .done(function(data) {
+                            itemData = data;
+                        })
+                        .always(function() {
+                            var templateData = {
+                                title: title,
+                                url: portal.portalUrl,
+                                id: id,
+                                description: JSON.stringify(
+                                    description, undefined, 2
+                                ),
+                                data: JSON.stringify(
+                                    itemData, undefined, 2
+                                )
+                            };
+
+                            // Add a download link for files.
+                            if (templateData.data === undefined &&
+                                description.typeKeywords
+                                .indexOf("Service") === -1) {
+                                templateData
+                                    .downloadLink = portal.portalUrl +
+                                    "sharing/rest/content/items/" +
+                                    id +
+                                    "/data?token=" + portal.token;
                             }
-                        } else {
-                            saveButton.removeClass("active");
-                        }
-                    });
-                };
 
-                jquery(".content").addClass("data-toggle");
-                jquery(".content").removeAttr("disabled");
-                jquery(".content").attr("data-toggle", "button");
-                jquery(".content").addClass("btn-info");
-
-                jquery("#inspectModal").modal("hide");
-                jquery("#inspectBtn").button("reset");
-
-                // Add a listener for clicking on content buttons.
-                jquery(".content").click(function() {
-                    var server = jquery(this).attr("data-portal");
-                    var id = jquery(this).attr("data-id");
-                    var title = jquery(this).text();
-                    var itemData;
-
-                    /**
-                     * Prevent trying to pass a portal token when
-                     * inspecting content from an ArcGIS Online search.
-                     */
-                    if (server === "https://www.arcgis.com/" &&
-                        server !== app.portals.sourcePortal.portalUrl) {
-                        portal = app.portals.arcgisOnline;
-                    } else {
-                        portal = app.portals.sourcePortal;
-                    }
+                            var html = mustache.to_html(
+                                jquery("#inspectTemplate").html(),
+                                templateData
+                            );
 
-                    NProgress.start();
-                    jquery(".content").addClass("btn-info");
-                    jquery(".content").removeClass("active");
-                    jquery(".content").removeClass("btn-primary");
-                    jquery(this).addClass("btn-primary");
-                    jquery(this).removeClass("btn-info");
-                    portal.itemDescription(id)
-                        .done(function(description) {
-                            portal.itemData(id)
-                                .done(function(data) {
-                                    itemData = data;
-                                })
-                                .always(function() {
-                                    var templateData = {
-                                        title: title,
-                                        url: portal.portalUrl,
-                                        id: id,
-                                        description: JSON.stringify(
-                                            description, undefined, 2
-                                        ),
-                                        data: JSON.stringify(
-                                            itemData, undefined, 2
-                                        )
-                                    };
-
-                                    // Add a download link for files.
-                                    if (templateData.data === undefined &&
-                                        description.typeKeywords
-                                        .indexOf("Service") === -1) {
-                                        templateData
-                                            .downloadLink = portal.portalUrl +
-                                            "sharing/rest/content/items/" +
-                                            id +
-                                            "/data?token=" + portal.token;
-                                    }
-
-                                    var html = mustache.to_html(
-                                        jquery("#inspectTemplate").html(),
-                                        templateData
-                                    );
-
-                                    // Add the HTML container with the JSON.
-                                    jquery("#dropArea").html(html);
-                                    /**
-                                     * Color code the JSON to make it easier
-                                     * to read (uses highlight.js).
-                                     */
-                                    jquery("pre").each(function(i, e) {
-                                        hljs.highlightBlock(e);
-                                    });
+                            // Add the HTML container with the JSON.
+                            jquery("#dropArea").html(html);
+                            /**
+                             * Color code the JSON to make it easier
+                             * to read (uses highlight.js).
+                             */
+                            jquery("pre").each(function(i, e) {
+                                hljs.highlightBlock(e);
+                            });
 
-                                    jquery(".btn-default[data-action='startEdits']").click(function(e) {
-                                        if (!localStorage.hasOwnProperty("editsAllowed")) {
-                                            // Show the caution modal.
-                                            var editJsonBtn = jquery("#editJsonBtn");
-                                            jquery("#editJsonModal").modal("show");
-                                            jquery(".acknowledgeRisk").click(function(e) {
-                                                if (jquery(e.currentTarget).prop("checked")) {
-                                                    editJsonBtn.removeClass("disabled");
-                                                } else {
-                                                    editJsonBtn.addClass("disabled");
-                                                }
-                                            });
+                            jquery(".btn-default[data-action='startEdits']").click(function(e) {
+                                if (!localStorage.hasOwnProperty("editsAllowed")) {
+                                    // Show the caution modal.
+                                    var editJsonBtn = jquery("#editJsonBtn");
+                                    jquery("#editJsonModal").modal("show");
+                                    jquery(".acknowledgeRisk").click(function(e) {
+                                        if (jquery(e.currentTarget).prop("checked")) {
+                                            editJsonBtn.removeClass("disabled");
                                         } else {
-                                            startEditing(e);
+                                            editJsonBtn.addClass("disabled");
                                         }
-
-                                        jquery("#editJsonBtn").click(function() {
-                                            jquery("#editJsonModal").modal("hide");
-                                            localStorage.setItem("editsAllowed", true);
-                                            startEditing(e);
-                                        });
-
                                     });
+                                } else {
+                                    startEditing(e);
+                                }
 
-                                    NProgress.done();
+                                jquery("#editJsonBtn").click(function() {
+                                    jquery("#editJsonModal").modal("hide");
+                                    localStorage.setItem("editsAllowed", true);
+                                    startEditing(e);
                                 });
+
+                            });
+
+                            NProgress.done();
                         });
                 });
-            });
+        });
     };
 
     var updateWebmapServices = function() {

From 570c6f0796cabfd7a64101c48ed3f9cb7298f0aa Mon Sep 17 00:00:00 2001
From: Evan Caldwell <evan.caldwell@gmail.com>
Date: Wed, 21 Oct 2015 17:48:01 -0400
Subject: [PATCH 3/4] updated .gitignore

Removing junk.
---
 .gitignore | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 751c365..1256561 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,9 @@
-*.DS_Store
+# Dev files
 /node_modules
-/testing
-# Ignore production backup
-/backup
 
-# Ignore build files
+# Build files
 /build
+*.zip
+*.map
 src/js/*.min.js
-src/js/portal/*.min.js
-build.zip
\ No newline at end of file
+src/js/portal/*.min.js
\ No newline at end of file

From 6d3839eaead6bf84e1d8dffbad16062ab34eb82c Mon Sep 17 00:00:00 2001
From: Evan Caldwell <evan.caldwell@gmail.com>
Date: Fri, 30 Oct 2015 23:38:34 -0400
Subject: [PATCH 4/4] bumped version number

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 54d8fa6..611a0cb 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ago-assistant",
   "title": "ArcGIS Online Assistant",
   "description": "A swiss army knife for your ArcGIS Online and Portal for ArcGIS accounts.",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "author": "Evan Caldwell",
   "homepage": "https://github.com/Esri/ago-assistant",
   "repository": {