Skip to content

Commit

Permalink
V1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Gregory L'Azou committed Jul 22, 2014
1 parent 8032908 commit b23c080
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Storymaps-MapJournal",
"version": "1.0.0",
"version": "1.0.1",
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-clean": "~0.4.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/storymaps/common/Core.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min",

if ( ! _mainView.init(this) )
return;

// Automatic login in development mode
if ( !isProd() && app.indexCfg.username && app.indexCfg.password) {
on(IdentityManager, 'dialog-create', function(){
Expand Down
4 changes: 2 additions & 2 deletions src/app/storymaps/tpl/core/MainView.css
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@
}

.esriPopup .titleButton.prev {
right: 55px;
right: 55px !important;
}

.esriPopup .titleButton.next {
right: 31px;
right: 31px !important;
}

.esriPopup .title {
Expand Down
4 changes: 2 additions & 2 deletions src/app/storymaps/tpl/core/MainView.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ define(["lib-build/css!./MainView",
autoResize: false,
showAttribution: true,
infoWindow: popup,
extent: extent,
usePopupManager: true
extent: extent
},
usePopupManager: true,
ignorePopups: false,
bingMapsKey: commonConfig.bingMapsKey
});
Expand Down
4 changes: 3 additions & 1 deletion src/app/storymaps/tpl/ui/desktop/FloatingPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ define(["lib-build/tpl!./FloatingPanelSection",

// if configuring the MAP
if ( container.find(".builder-mask").is(":visible") )
return;
return false;

if (_swipeOnWheelReady) {
var slide = container.find(".swiper-slide.swiper-slide-active"),
Expand Down Expand Up @@ -312,6 +312,8 @@ define(["lib-build/tpl!./FloatingPanelSection",
slide.scrollTop(scrollTop - (30 * delta));
}
}

return false;
}

function delayScroll()
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

<script type="text/javascript">
var app = {
version: '1.0.0',
version: '1.0.1',
isProduction: false,
isInBuilder: false,
indexCfg: configOptions
Expand Down

0 comments on commit b23c080

Please sign in to comment.