Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdf6b688

Browse files
authored
Merge pull request#100 from Esri/remove-jquery-callback-query-param
Removed `callback` query parameter#99
2 parents36cc9bb +16a95af commitdf6b688

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

‎js/app/dataAccess.js‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ define(['diag'], function (diag) {
123123
deferred=$.Deferred();
124124

125125
url=dataAccess.featureServiceUrl+"query?where="+(condition||dataAccess.validCandidateCondition)
126-
+"&objectIds=&returnIdsOnly=false&returnCountOnly=true&outFields="+dataAccess.fixedQueryParams
127-
+"&callback=?";
126+
+"&objectIds=&returnIdsOnly=false&returnCountOnly=true&outFields="+dataAccess.fixedQueryParams;
128127
$.getJSON(url,functionhandleObjectCountClosure(results){
129128
dataAccess.handleObjectCount(results,deferred,condition);
130129
});
@@ -166,8 +165,7 @@ define(['diag'], function (diag) {
166165

167166
// Get the ids of available unsurveyed candidates
168167
url=dataAccess.featureServiceUrl+"query?where="+dataAccess.validCandidateCondition
169-
+"&objectIds=&returnIdsOnly=true&returnCountOnly=false&outFields="+dataAccess.fixedQueryParams
170-
+"&callback=?";
168+
+"&objectIds=&returnIdsOnly=true&returnCountOnly=false&outFields="+dataAccess.fixedQueryParams;
171169
$.post(url,functionhandleCandidatesClosure(results){
172170
dataAccess.handleCandidates(results,randomizeSelection,deferred);
173171
},'json');
@@ -210,15 +208,14 @@ define(['diag'], function (diag) {
210208
// Get the candidate's attributes
211209
attributesDeferred=$.Deferred();
212210
objectAttrsUrl=dataAccess.featureServiceUrl+"query?objectIds="+objectId
213-
+"&returnIdsOnly=false&returnCountOnly=false&outFields=*"+dataAccess.fixedQueryParams
214-
+"&callback=?";
211+
+"&returnIdsOnly=false&returnCountOnly=false&outFields=*"+dataAccess.fixedQueryParams;
215212
$.getJSON(objectAttrsUrl,functionhandleCandidateAttrsClosure(results){
216213
dataAccess.handleCandidateAttrs(results,attributesDeferred);
217214
});
218215

219216
// Get the candidate's attachments
220217
attachmentsDeferred=$.Deferred();
221-
objectAttachmentsUrl=dataAccess.featureServiceUrl+objectId+"/attachments?f=json&callback=?";
218+
objectAttachmentsUrl=dataAccess.featureServiceUrl+objectId+"/attachments?f=json";
222219
$.getJSON(objectAttachmentsUrl,functionhandleCandidateAttachmentsClosure(results){
223220
dataAccess.handleCandidateAttachments(objectId,results,attributesDeferred,attachmentsDeferred);
224221
});

‎js/app/fetchConfigInfo.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ define(['parseConfigInfo'], function (parseConfigInfo) {
7272
}
7373

7474
if(parseConfigInfo.isUsableString(appId)){
75-
$.getJSON(arcgisUrl+appId+"/data?f=json&callback=?",function(data){
75+
$.getJSON(arcgisUrl+appId+"/data?f=json",function(data){
7676
deferred.resolve((data&&data.values)||{});
7777
});
7878
}else{
@@ -103,7 +103,7 @@ define(['parseConfigInfo'], function (parseConfigInfo) {
103103
deferreds.origImageUrl=origImageUrlDeferred||$.Deferred();
104104

105105
if(parseConfigInfo.isUsableString(webmapId)){
106-
$.getJSON(arcgisUrl+webmapId+"?f=json&callback=?",function(data){
106+
$.getJSON(arcgisUrl+webmapId+"?f=json",function(data){
107107
varnormalizedData={},imageUrl,iExt;
108108
if(!data||data.error){
109109
deferreds.params.reject();
@@ -161,7 +161,7 @@ define(['parseConfigInfo'], function (parseConfigInfo) {
161161
}
162162

163163
if(parseConfigInfo.isUsableString(webmapId)){
164-
$.getJSON(arcgisUrl+webmapId+"/data?f=json&callback=?",function(data){
164+
$.getJSON(arcgisUrl+webmapId+"/data?f=json",function(data){
165165
varfeatureSvcData={};
166166

167167
if(data&&data.operationalLayers&&data.operationalLayers.length>0&&data.tables&&data.tables.length>0){
@@ -207,7 +207,7 @@ define(['parseConfigInfo'], function (parseConfigInfo) {
207207
deferred=$.Deferred();
208208
}
209209
if(parseConfigInfo.isUsableString(featureSvcUrl)){
210-
$.getJSON(featureSvcUrl+"?f=json&callback=?",function(data){
210+
$.getJSON(featureSvcUrl+"?f=json",function(data){
211211
data.canBeUpdated=data.capabilities&&data.capabilities.indexOf("Update")>=0;
212212
deferred.resolve(data);
213213
});

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp