Skip to content

Commit

Permalink
update to 3.21
Browse files Browse the repository at this point in the history
  • Loading branch information
kellyhutchins committed Jun 27, 2017
1 parent 3019d72 commit 79f1d33
Show file tree
Hide file tree
Showing 8 changed files with 1,247 additions and 1,220 deletions.
2 changes: 1 addition & 1 deletion config/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,4 @@ define({
//Replace these with your own bitly key
"bitlyLogin": "arcgis",
"bitlyKey": "R_b8a169f3a8b978b9697f64613bf1db6d"
});
});
4 changes: 2 additions & 2 deletions config/templateConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ define({
"sharedTheme", "sharedThemeItem", "sharinghost", "customLayout"
],
// For esri hosted envoronments only. Will automatically create a sharingurl and proxyurl for the application.
esriEnvironment: true
});
esriEnvironment: false
});
Binary file removed images/config-images/default.png
Binary file not shown.
Binary file removed images/config-images/fullmap.png
Binary file not shown.
39 changes: 18 additions & 21 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@
<title></title>
<meta charset="utf-8">
<meta name="fragment" content="!">
<!-- Define the versions of IE that will be used to render the page. See Microsoft documentation for details. Optional. -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Responsive -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="default">
<!-- End Responsive -->
<!-- Use protocol relative urls that way if the browser is viewing the page via HTTPS the js/css file will be requested using the HTTPS protocol -->
<link rel="stylesheet" href="//js.arcgis.com/3.20/esri/themes/calcite/dijit/calcite.css">
<link rel="stylesheet" href="//js.arcgis.com/3.20/esri/css/esri.css">
<link rel="stylesheet" href="https://js.arcgis.com/3.21/esri/themes/calcite/dijit/calcite.css">
<link rel="stylesheet" href="https://js.arcgis.com/3.21/esri/css/esri.css">

<!-- Load any application specific styles -->
<link rel="stylesheet" href="css/main.css">
Expand Down Expand Up @@ -72,7 +70,7 @@ <h1 id="titleDiv"></h1>
dojoConfig.locale = RegExp.$1;
}
</script>
<script type="text/javascript" src="//js.arcgis.com/3.20/"></script>
<script type="text/javascript" src="https://js.arcgis.com/3.21/"></script>
<script type="text/javascript">
require([
"dojo/parser",
Expand All @@ -87,23 +85,22 @@ <h1 id="titleDiv"></h1>
Template,
Main
) {
parser.parse();
// create the template. This will take care of all the logic required for template applications
var myTemplate = new Template(templateConfig);
// create my main application. Start placing your logic in the main.js file.
var myApp = new Main();
// start template
myTemplate.startup().then(function (config) {
// The config object contains the following properties: helper services, (optionally)
// i18n, appid, webmap and any custom values defined by the application.
// In this example we have one called theme.
myApp.startup(config);
}, function (error) {
// something went wrong. Let's report it.
myApp.reportError(error);
});
parser.parse();
// create the template. This will take care of all the logic required for template applications
var myTemplate = new Template(templateConfig);
// create my main application. Start placing your logic in the main.js file.
var myApp = new Main();
// start template
myTemplate.startup().then(function (config) {
// The config object contains the following properties: helper services, (optionally)
// i18n, appid, webmap and any custom values defined by the application.
// In this example we have one called theme.
myApp.startup(config);
}, function (error) {
// something went wrong. Let's report it.
myApp.reportError(error);
});

});
</script>
</body>

Expand Down
Loading

0 comments on commit 79f1d33

Please sign in to comment.