"+text+"
");
+ $(_placard).find('a:not([target])').attr('target', '_blank');
+
// Remove user generated content links from the tab navigation
if ( ! app.isInBuilderMode ) {
$(_placard).find("a").attr("tabindex", "-1");
diff --git a/MapTour/src/app/storymaps/ui/header/Header.css b/MapTour/src/app/storymaps/ui/header/Header.css
index 224aa1c..e4bfc70 100644
--- a/MapTour/src/app/storymaps/ui/header/Header.css
+++ b/MapTour/src/app/storymaps/ui/header/Header.css
@@ -212,6 +212,7 @@
margin-left: 4px;
color: #C5D5D5;
vertical-align: 0px;
+ background-image: none;
}
.shareIcon:hover {
diff --git a/MapTour/src/app/storymaps/ui/header/Header.js b/MapTour/src/app/storymaps/ui/header/Header.js
index 87df383..adaf633 100644
--- a/MapTour/src/app/storymaps/ui/header/Header.js
+++ b/MapTour/src/app/storymaps/ui/header/Header.js
@@ -33,8 +33,12 @@ define(["storymaps/ui/inlineFieldEdit/InlineFieldEdit",
$(selector).addClass('hideDesktop');
// Mobile
- $(selector + ' #headerMobile .title').html(title);
- $(selector + ' #headerMobile .subtitle').html(subtitle);
+ $(selector + ' #headerMobile .title')
+ .html(title)
+ .find('a:not([target])').attr('target', '_blank');
+ $(selector + ' #headerMobile .subtitle')
+ .html(subtitle)
+ .find('a:not([target])').attr('target', '_blank');
// Desktop builder
if( isInBuilderMode ) {
@@ -48,8 +52,12 @@ define(["storymaps/ui/inlineFieldEdit/InlineFieldEdit",
subtitle += "
";
}
- $(selector + ' #headerDesktop .title').html(title);
- $(selector + ' #headerDesktop .subtitle').html(subtitle);
+ $(selector + ' #headerDesktop .title')
+ .html(title)
+ .find('a:not([target])').attr('target', '_blank');
+ $(selector + ' #headerDesktop .subtitle')
+ .html(subtitle)
+ .find('a:not([target])').attr('target', '_blank');
// Desktop builder
if( isInBuilderMode )
diff --git a/MapTour/src/app/storymaps/ui/inlineFieldEdit/InlineFieldEdit.js b/MapTour/src/app/storymaps/ui/inlineFieldEdit/InlineFieldEdit.js
index d2ded82..879e0f8 100644
--- a/MapTour/src/app/storymaps/ui/inlineFieldEdit/InlineFieldEdit.js
+++ b/MapTour/src/app/storymaps/ui/inlineFieldEdit/InlineFieldEdit.js
@@ -90,6 +90,7 @@ define(["dojo/has"],
label.parent().parent().removeClass("isEditing");
label.html(value);
label.show();
+ label.find('a:not([target])').attr('target', '_blank');
input.hide();
icon.css("display", "inline-block");
diff --git a/MapTour/src/app/storymaps/utils/FacebookConnector.js b/MapTour/src/app/storymaps/utils/FacebookConnector.js
deleted file mode 100644
index 7624e10..0000000
--- a/MapTour/src/app/storymaps/utils/FacebookConnector.js
+++ /dev/null
@@ -1,195 +0,0 @@
-define(["dojo/Deferred"],
- function(Deferred)
- {
- return function FacebookConnector(appId)
- {
- var _connectDeferred = null;
- var _logOutDeferred = null;
-
- // TODO assess validity of appid
- if( ! appId ){
- console.error("Facebook initialization error - missing appId parameter");
- return;
- }
-
- //
- // Page albums - do not require to load Facebook API or to authenticate
- //
-
- this.getPageAlbums = function(page, noRefine)
- {
- var resultDeferred = new Deferred();
- var rqStr = '/' + page + '/albums/?limit=50';
-
- if( ! page ) {
- resultDeferred.reject();
- return resultDeferred;
- }
-
- rqStr += noRefine ? '' : '&fields=name,count,privacy,type';
-
- FB.api(rqStr, function(r) {
- resultDeferred.resolve(r.data);
- });
-
- return resultDeferred;
- };
-
- this.getPageAlbum = function(albumId, nbPicturesMax, refineResult)
- {
- var resultDeferred = new Deferred();
- var rqStr = '/' + albumId + '/?fields=photos';
-
- if( ! albumId ) {
- resultDeferred.reject();
- return resultDeferred;
- }
-
- rqStr += refineResult ? '.fields(name,images,picture,source,place)' : '';
- rqStr += nbPicturesMax ? '&limit=' + nbPicturesMax : '';
-
- FB.api(rqStr, function(r) {
- var photos = r && r.photos && r.photos.data ? r.photos.data : [];
- if( refineResult )
- resultDeferred.resolve(refineAlbumData(photos));
- else
- resultDeferred.resolve(photos);
- });
-
- return resultDeferred;
- };
-
- //
- // User albums - require to load Facebook API and to authenticate
- //
-
- this.loadApi = function()
- {
- _connectDeferred = new Deferred();
- _logOutDeferred = new Deferred();
-
- if( ! window.fbAsyncInit )
- load();
- else
- getUserInfo(_connectDeferred);
-
- return _connectDeferred;
- };
-
- this.onLogout = function()
- {
- return _logOutDeferred;
- };
-
- this.getAlbums = function(filters, noRefine)
- {
- var resultDeferred = new Deferred();
-
- var rqStr = '/me?fields=albums';
- rqStr += noRefine ? '' : '.fields(name,count,privacy,type)';
-
- FB.api(rqStr, function(r) {
- var albums = r && r.albums && r.albums.data ? r.albums.data : [];
- if( filters ) {
- albums = $.grep(albums, function(album){
- var match = true;
- $.each(Object.keys(filters), function(i, filter){
- if( album[filter] != filters[filter])
- match = false;
- });
- return match;
- });
- }
- resultDeferred.resolve(albums);
- });
-
- return resultDeferred;
- };
-
- this.getAlbum = function(albumId, refineResult, nbPicturesMax)
- {
- var resultDeferred = new Deferred();
- var rqStr = '/' + albumId + '/?fields=photos';
-
- if (!albumId) {
- resultDeferred.reject();
- return resultDeferred;
- }
-
- rqStr += refineResult ? '.fields(name,images,picture,source,place)' : '';
- rqStr += nbPicturesMax ? '.limit(' + nbPicturesMax + ')' : '';
-
- FB.api(rqStr, function(r) {
- var photos = r && r.photos && r.photos.data ? r.photos.data : [];
- if( refineResult )
- resultDeferred.resolve(refineAlbumData(photos));
- else
- resultDeferred.resolve(photos);
- });
-
- return resultDeferred;
- };
-
- function refineAlbumData(photos)
- {
- var result = [];
- $.each(photos, function(i, photo){
- result.push({
- name: photo.name || '',
- description: '',
- pic_url: photo.images && photo.images[0] ? photo.images[0].source : photo.source,
- thumb_url: photo.picture,
- lat: photo.place && photo.place.location ? photo.place.location.latitude : '',
- lng: photo.place && photo.place.location ? photo.place.location.longitude: '',
- is_video: false
- });
- });
- return result;
- }
-
- function getUserInfo(connectDeferred)
- {
- FB.api('/me', function(r) {
- if( r && ! r.error )
- connectDeferred.resolve(r);
- });
- }
-
- function load()
- {
- window.fbAsyncInit = function() {
- FB.init({
- appId : appId, // App ID
- status : true, // check login status
- cookie : true, // enable cookies to allow the server to access the session
- xfbml : true, // parse XFBML,
- version : 'v2.1'
- });
-
- FB.Event.subscribe('auth.authResponseChange', function(response) {
- // Here we specify what we do with the response anytime this event occurs.
- if (response.status === 'connected') {
- // The response object is returned with a status field that lets the app know the current
- // login status of the person. In this case, we're handling the situation where they
- // have logged in to the app.
- getUserInfo(_connectDeferred);
- }
- });
-
- FB.Event.subscribe('auth.logout', function() {
- _connectDeferred = new Deferred();
- _logOutDeferred.resolve(_connectDeferred);
- });
- };
-
- (function(d, s, id){
- var js, fjs = d.getElementsByTagName(s)[0];
- if (d.getElementById(id)) {return;}
- js = d.createElement(s); js.id = id;
- js.src = "//connect.facebook.net/en_US/sdk.js";
- fjs.parentNode.insertBefore(js, fjs);
- }(document, 'script', 'facebook-jssdk'));
- }
- };
- }
-);
\ No newline at end of file
diff --git a/MapTour/src/app/storymaps/utils/FlickrConnector.js b/MapTour/src/app/storymaps/utils/FlickrConnector.js
index e47d127..b7c14eb 100644
--- a/MapTour/src/app/storymaps/utils/FlickrConnector.js
+++ b/MapTour/src/app/storymaps/utils/FlickrConnector.js
@@ -94,7 +94,7 @@ define(["dojo/Deferred", "dojo/_base/lang"],
function getPhotoURL(photo, size)
{
- return 'http://farm' + photo.farm + '.static.flickr.com/'
+ return 'https://farm' + photo.farm + '.static.flickr.com/'
+ photo.server + '/' + photo.id + '_' + photo.secret
+ '_' + size + '.jpg';
}
diff --git a/MapTour/src/index.html b/MapTour/src/index.html
index c6eda4b..cfec56c 100644
--- a/MapTour/src/index.html
+++ b/MapTour/src/index.html
@@ -70,7 +70,7 @@
');
- disableNextBtn();
- updateFooter();
-
- _facebook.getPageAlbums(pageName).then(
- function(data){
- var outHtml = "";
- $.each(data, function(i, album){
- outHtml += '';
- });
-
- _container.find(".lookingUpMsg").html("");
- _container.find("#facebookListAlbum2").removeAttr("disabled").html(outHtml);
- _container.find("#facebookListAlbum2").change();
- },
- function(){
- _container.find(".lookingUpMsg").addClass('error').html(i18n.viewer.viewFacebook.lookupMsgError);
- _container.find("#facebookListAlbum2").html("").attr("disabled", "disabled");
- }
- );
- }
-
- function initEvents()
- {
- _container.find('.btn-pageLookup').click(lookupPage);
- _container.find(".selectPageName").keyup(function(){
- if( $(this).val() )
- _container.find('.btn-pageLookup').removeAttr("disabled");
- else
- _container.find('.btn-pageLookup').attr("disabled", "disabled");
- });
-
- _container.find("#facebookListAlbum1").change(function(){
- selectChange(
- _container.find("#facebookListAlbum1"),
- _container.find("#facebookListAlbum2"),
- i18n.viewer.onlinePhotoSharingCommon.footerImport
- );
- });
-
- _container.find("#facebookListAlbum2").change(function(){
- selectChange(
- _container.find("#facebookListAlbum2"),
- _container.find("#facebookListAlbum1"),
- i18n.viewer.onlinePhotoSharingCommon.footerImport
- );
- });
-
- // iPad keyboard workaround
- _container.find('.selectPageName').blur(function(){ $(window).scrollTop(0); });
- }
-
- function selectChange(select, otherSelect, nextBtn)
- {
- otherSelect.find("option:nth-child(1)").attr("selected", "selected");
- otherSelect.focus();
- select.focus();
-
- if( select.find(":selected").index() ) {
- var btnNext = _footer.find('.btnNext');
- btnNext.html(nextBtn);
- btnNext.removeAttr("disabled");
- }
-
- updateFooter();
- }
-
- function disableLists()
- {
- _container.find("#facebookListAlbum1, #facebookListAlbum2").attr("disabled", "disabled");
- _container.find("#facebookListAlbum1").html("");
- _container.find("#facebookListAlbum2").html("");
- }
-
- function disableNextBtn()
- {
- var btnNext = _footer.find('.btnNext');
- btnNext.html(i18n.viewer.onlinePhotoSharingCommon.footerImport);
- btnNext.attr("disabled", "disabled");
- }
-
- function updateFooter(msg)
- {
- var footerText = _footer.find('.dataFooterText');
- if( msg == "error" )
- footerText.addClass("error").html(i18n.viewer.onlinePhotoSharingCommon.emptyDataset).show();
- else
- footerText.removeClass("error").html("").hide();
- }
-
- this.initLocalization = function()
- {
- _container.find('.header').append(i18n.viewer.viewFacebook.header);
- _container.find('.sideHeader').eq(0).html(i18n.viewer.viewFacebook.leftHeader);
- _container.find('.sideHeader').eq(1).html(i18n.viewer.viewFacebook.rightHeader + ' 
'
-
- });
-
- initEvents();
- };
- };
- }
-);
\ No newline at end of file
diff --git a/MapTour/src/app/storymaps/maptour/core/Config.js b/MapTour/src/app/storymaps/maptour/core/Config.js
index 179a748..af3da71 100644
--- a/MapTour/src/app/storymaps/maptour/core/Config.js
+++ b/MapTour/src/app/storymaps/maptour/core/Config.js
@@ -35,7 +35,6 @@ define([],
&& APPCFG.CORS_SERVER
&& APPCFG.AUTHORIZED_IMPORT_SOURCE
&& APPCFG.FLICKR_API_KEY
- && APPCFG.FACEBOOK_APP_ID
&& APPCFG.YOUTUBE_DISABLE_ON_PORTAL !== undefined
&& APPCFG.YOUTUBE_API_KEY
&& APPCFG.BING_MAPS_KEY !== undefined
diff --git a/MapTour/src/app/storymaps/maptour/core/MainView.js b/MapTour/src/app/storymaps/maptour/core/MainView.js
index 488d66e..d59e4af 100644
--- a/MapTour/src/app/storymaps/maptour/core/MainView.js
+++ b/MapTour/src/app/storymaps/maptour/core/MainView.js
@@ -390,21 +390,9 @@ define(["storymaps/maptour/core/WebApplicationData",
if( has("ie") > 0 && has("ie") < 9 )
setTimeout(layerLoaded, 1000);
else {
- // Seems to be needed for FS created from My Content in AGOL
- if ( app.data.getSourceLayer().objectIdField == "FID" && app.map.loaded ) {
- on(app.data.getSourceLayer(), 'update-end', layerLoaded);
-
- // If the map extent is not set right now, the layer won't query for data
- // If remove the extent defined when creating the map the query is performed,
- // it looks like hosted FS doesn't like the world extent used there
- // The proper extent is set after
- _this.setMapExtent(app.data.getSourceLayer().fullExtent);
- }
- else {
- on.once(app.map, 'update-end', function(){
- layerLoaded();
- });
- }
+ on.once(app.map, 'update-end', function(){
+ layerLoaded();
+ });
}
}
// Webmap layer (shp, csv)
diff --git a/MapTour/src/app/storymaps/maptour/core/TourData.js b/MapTour/src/app/storymaps/maptour/core/TourData.js
index 7f979cd..7529b78 100644
--- a/MapTour/src/app/storymaps/maptour/core/TourData.js
+++ b/MapTour/src/app/storymaps/maptour/core/TourData.js
@@ -409,6 +409,7 @@ define(["storymaps/maptour/core/WebApplicationData",
|| (Helper.getPortalUser() != null && Helper.getPortalUser() == this.getAppItem().owner)
// Admin privilege
|| (portalUser && portalUser.privileges && $.inArray("portal:admin:updateItems", portalUser.privileges) > -1 )
+ || this.getAppItem().itemControl == "admin"
// Group with shared ownership
|| this.getAppItem().itemControl == "update";
};
diff --git a/MapTour/src/app/storymaps/ui/crossfader/CrossFader.js b/MapTour/src/app/storymaps/ui/crossfader/CrossFader.js
index 9673234..55efa82 100644
--- a/MapTour/src/app/storymaps/ui/crossfader/CrossFader.js
+++ b/MapTour/src/app/storymaps/ui/crossfader/CrossFader.js
@@ -385,6 +385,8 @@ define(["storymaps/ui/inlineFieldEdit/InlineFieldEdit",
$(_placard).append("