Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gmap
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
drupal.org
gmap
Commits
32dacaa2
Commit
32dacaa2
authored
13 years ago
by
haiiro.shimeji
Browse files
Options
Downloads
Patches
Plain Diff
Some ver2 functions still remained.
parent
01eb32d6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
js/marker.js
+13
-12
13 additions, 12 deletions
js/marker.js
with
13 additions
and
12 deletions
js/marker.js
+
13
−
12
View file @
32dacaa2
...
@@ -67,14 +67,13 @@ Drupal.gmap.addHandler('gmap', function (elem) {
...
@@ -67,14 +67,13 @@ Drupal.gmap.addHandler('gmap', function (elem) {
if
(
infowindow
!=
null
){
if
(
infowindow
!=
null
){
infowindow
.
close
();
infowindow
.
close
();
}
}
infowindow
=
new
google
.
maps
.
InfoWindow
({
infowindow
=
new
google
.
maps
.
InfoWindow
();
content
:
marker
.
text
});
if
(
marker
.
text
)
{
if
(
marker
.
text
)
{
infowindow
.
setContent
(
marker
.
text
);
infowindow
.
open
(
obj
.
map
,
marker
.
marker
);
infowindow
.
open
(
obj
.
map
,
marker
.
marker
);
}
}
// Info Window Query / Info Window Offset
// Info Window Query / Info Window Offset
if
(
marker
.
iwq
||
(
obj
.
vars
.
iwq
&&
typeof
marker
.
iwo
!=
'
undefined
'
))
{
else
if
(
marker
.
iwq
||
(
obj
.
vars
.
iwq
&&
typeof
marker
.
iwo
!=
'
undefined
'
))
{
var
iwq
,
iwo
;
var
iwq
,
iwo
;
if
(
obj
.
vars
.
iwq
)
{
if
(
obj
.
vars
.
iwq
)
{
iwq
=
obj
.
vars
.
iwq
;
iwq
=
obj
.
vars
.
iwq
;
...
@@ -90,10 +89,11 @@ Drupal.gmap.addHandler('gmap', function (elem) {
...
@@ -90,10 +89,11 @@ Drupal.gmap.addHandler('gmap', function (elem) {
var
el
=
document
.
createElement
(
'
div
'
);
var
el
=
document
.
createElement
(
'
div
'
);
// Clone the matched object, run through the clone, stripping off ids, and move the clone into the container.
// Clone the matched object, run through the clone, stripping off ids, and move the clone into the container.
jQuery
(
iwq
).
eq
(
iwo
).
clone
(
false
).
find
(
'
*
'
).
removeAttr
(
'
id
'
).
appendTo
(
jQuery
(
el
));
jQuery
(
iwq
).
eq
(
iwo
).
clone
(
false
).
find
(
'
*
'
).
removeAttr
(
'
id
'
).
appendTo
(
jQuery
(
el
));
marker
.
marker
.
openInfoWindow
(
el
);
marker
.
setContent
(
el
);
infowindow
.
open
(
obj
.
map
,
marker
.
marker
);
}
}
// AJAX content
// AJAX content
if
(
marker
.
rmt
)
{
else
if
(
marker
.
rmt
)
{
var
uri
=
marker
.
rmt
;
var
uri
=
marker
.
rmt
;
// If there was a callback, prefix that.
// If there was a callback, prefix that.
// (If there wasn't, marker.rmt was the FULL path.)
// (If there wasn't, marker.rmt was the FULL path.)
...
@@ -108,18 +108,19 @@ Drupal.gmap.addHandler('gmap', function (elem) {
...
@@ -108,18 +108,19 @@ Drupal.gmap.addHandler('gmap', function (elem) {
// marker.marker.openInfoWindowHtml(Drupal.settings.loadingImage);
// marker.marker.openInfoWindowHtml(Drupal.settings.loadingImage);
//}
//}
jQuery
.
get
(
uri
,
{},
function
(
data
)
{
jQuery
.
get
(
uri
,
{},
function
(
data
)
{
marker
.
marker
.
openInfoWindowHtml
(
data
);
infowindow
.
setContent
(
data
);
infowindow
.
open
(
obj
.
map
,
marker
.
marker
);
});
});
}
}
// Tabbed content
// Tabbed content
else
if
(
marker
.
tabs
)
{
else
if
(
marker
.
tabs
)
{
var
infoWinTabs
=
[];
var
data
=
""
;
//tabs in an infowindow is no longer supported in API ver3.
for
(
var
m
in
marker
.
tabs
)
{
for
(
var
m
in
marker
.
tabs
)
{
if
(
marker
.
tabs
.
hasOwnProperty
(
m
))
{
data
+=
marker
.
tabs
[
m
];
infoWinTabs
.
push
(
new
GInfoWindowTab
(
m
,
marker
.
tabs
[
m
]));
}
}
}
marker
.
marker
.
openInfoWindowTabsHtml
(
infoWinTabs
);
infowindow
.
setContent
(
data
);
infowindow
.
open
(
obj
.
map
,
marker
.
marker
);
}
}
// No content -- marker is a link
// No content -- marker is a link
else
if
(
marker
.
link
)
{
else
if
(
marker
.
link
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment