Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
build
Commits
38f19c21
Commit
38f19c21
authored
13 years ago
by
Scott Main
Committed by
Android (Google) Code Review
13 years ago
Browse files
Options
Download
Plain Diff
Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
parents
c4c39f4d
1b3db11e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
17 deletions
+12
-17
tools/droiddoc/templates-sdk/assets/js/docs.js
tools/droiddoc/templates-sdk/assets/js/docs.js
+4
-7
tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
...s/droiddoc/templates-sdk/assets/js/search_autocomplete.js
+1
-1
tools/droiddoc/templates-sdk/components/masthead.cs
tools/droiddoc/templates-sdk/components/masthead.cs
+2
-2
tools/droiddoc/templates-sdk/head_tag.cs
tools/droiddoc/templates-sdk/head_tag.cs
+5
-7
No files found.
tools/droiddoc/templates-sdk/assets/js/docs.js
View file @
38f19c21
...
...
@@ -5,9 +5,11 @@ var cookie_namespace = 'android_developer';
var
NAV_PREF_TREE
=
"
tree
"
;
var
NAV_PREF_PANELS
=
"
panels
"
;
var
nav_pref
;
var
toRoot
;
var
isMobile
=
false
;
// true if mobile, so we can adjust some layout
var
basePath
=
getBaseUri
(
location
.
pathname
);
var
SITE_ROOT
=
toRoot
+
basePath
.
substring
(
1
,
basePath
.
indexOf
(
"
/
"
,
1
));
/****** ON LOAD SET UP STUFF *********/
...
...
@@ -30,7 +32,7 @@ $(document).ready(function() {
// set search's onkeyup handler here so we can show suggestions
// even while search results are visible
$
(
"
#search_autocomplete
"
).
keyup
(
function
()
{
return
search_changed
(
event
,
false
,
'
/
'
)});
$
(
"
#search_autocomplete
"
).
keyup
(
function
()
{
return
search_changed
(
event
,
false
,
toRoot
)});
// set up the search close button
$
(
'
.search .close
'
).
click
(
function
()
{
...
...
@@ -526,11 +528,6 @@ addLoadEvent( function() {
prettyPrint
();
}
);
function
setToRoot
(
root
)
{
toRoot
=
root
;
// note: toRoot also used by carousel.js
}
function
init
()
{
//resizeNav();
...
...
This diff is collapsed.
Click to expand it.
tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
View file @
38f19c21
...
...
@@ -473,7 +473,7 @@ function hideResults() {
// forcefully regain key-up event control (previously jacked by search api)
$
(
"
#search_autocomplete
"
).
keyup
(
function
(
event
)
{
return
search_changed
(
event
,
false
,
'
/
'
);
return
search_changed
(
event
,
false
,
toRoot
);
});
// add event listeners to each tab so we can track the browser history
...
...
This diff is collapsed.
Click to expand it.
tools/droiddoc/templates-sdk/components/masthead.cs
View file @
38f19c21
...
...
@@ -66,8 +66,8 @@
<
form
onsubmit
=
"return submit_search()"
>
<
input
id
=
"search_autocomplete"
type
=
"text"
value
=
""
autocomplete
=
"off"
name
=
"q"
onfocus
=
"search_focus_changed(this, true)"
onblur
=
"search_focus_changed(this, false)"
onkeydown
=
"return search_changed(event, true, '
/')"
onkeyup
=
"return search_changed(event, false,
'/
'
)
" />
onkeydown
=
"return search_changed(event, true, '
<?cs var:toroot ?>')"
onkeyup
=
"return search_changed(event, false, '<?cs var:toroot ?>
')"
/>
</
form
>
<
div
class
="
right
"></div>
<
a
class
="
close
hide
">close</a>
...
...
This diff is collapsed.
Click to expand it.
tools/droiddoc/templates-sdk/head_tag.cs
View file @
38f19c21
...
...
@@ -11,7 +11,7 @@
<!--
BASIC
STYLESHEETS
-->
<
link
rel
=
"stylesheet"
href
=
"//fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold"
title
=
"roboto"
>
href
=
"
<?cs if:android.whichdoc != 'online' ?>http:<?cs /if ?>
//fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold"
title
=
"roboto"
>
<
link
href
=
"<?cs var:toroot ?>assets/css/default.css"
rel
=
"stylesheet"
type
=
"text/css"
>
<?
cs
if
:
reference
?>
...
...
@@ -28,6 +28,9 @@ type="text/css">
<!--
BASIC
JAVASCRIPT
-->
<
script
src
=
"<?cs var:toroot ?>assets/js/global-libraries-combined.js"
type
=
"text/javascript"
></
script
>
<
script
type
=
"text/javascript"
>
var
toRoot
=
"<?cs var:toroot ?>"
;
</
script
>
<
script
src
=
"<?cs var:toroot ?>assets/js/docs.js"
type
=
"text/javascript"
></
script
>
<?
cs
if
:
carousel
?>
...
...
@@ -36,7 +39,7 @@ type="text/css">
<?
cs
/
if
?>
<!--
search
-->
<
script
src
=
"//www.google.com/jsapi"
type
=
"text/javascript"
></
script
>
<
script
src
=
"
<?cs if:android.whichdoc != 'online' ?>http:<?cs /if ?>
//www.google.com/jsapi"
type
=
"text/javascript"
></
script
>
<
script
src
=
"<?cs var:toroot ?>assets/js/search_autocomplete.js"
type
=
"text/javascript"
></
script
>
<?
cs
if
:
tabbedList
?>
...
...
@@ -48,10 +51,5 @@ type="text/css">
<
script
src
=
"<?cs var:toroot ?>assets/js/droiddoc.js"
type
=
"text/javascript"
></
script
>
<?
cs
/
if
?>
<
script
src
=
"<?cs var:toroot ?>navtree_data.js"
type
=
"text/javascript"
></
script
>
<
script
type
=
"text/javascript"
>
setToRoot
(
"<?cs var:toroot ?>"
);
var
basePath
=
getBaseUri
(
location
.
pathname
);
var
SITE_ROOT
=
toRoot
+
basePath
.
substring
(
1
,
basePath
.
indexOf
(
"/"
,
1
));
</
script
>
</
head
>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment