Ubuntu Documentation

Merge lp:~giuseppeterrasi-deactivatedaccount/ubuntu-docs/fixjs into lp:ubuntu-docs/precise

  1. fixjs
  2. Merge into precise
Proposed by Giuseppe Terrasi
Status: Merged
Merged at revision: 123
Proposed branch: lp:~giuseppeterrasi-deactivatedaccount/ubuntu-docs/fixjs
Merge into: lp:ubuntu-docs/precise
Diff against target: 13 lines (+0/-3)
1 file modified
html/ubuntu.xsl (+0/-3)
To merge this branch: bzr merge lp:~giuseppeterrasi-deactivatedaccount/ubuntu-docs/fixjs
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers Pending
Review via email: mp+99068@code.launchpad.net

Description of the change

Hi.
This merge proposal resolve a little bug related javascript.
You can try the result of this patch watching this page [1] first and after.

Cheers

[¹] shell-keyboard-shortcuts.html

To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

An example of a bug this merge proposal fixes is allowing the collapsible boxes to expand and collapse as intended on pages such as:

http://91.189.93.101/shell-keyboard-shortcuts.html

Revision history for this message
Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount) wrote :

Yes David,
And also (but I can't confirm at this moment ) this resolve the image javascript problem on the on page.

Cheers

Revision history for this message
Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount) wrote :

Sorry, s/on page/home page.

And here an working expample; http://37.9.231.137/www/12.04/desktop/

Ciao!

lp:~giuseppeterrasi-deactivatedaccount/ubuntu-docs/fixjs updated
99. By Giuseppe Terrasi

html.js template instead yelp.js, remove jquery.min.js for home page slideshow

Revision history for this message
Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount) wrote :

I have revert a change.
html.js' template provide to create yelp.js.
So simply jquery and main.js remove is needed.

Revision history for this message
Matthew East (mdke) wrote :

Fabulous, we needed someone who understands javascript!

I've merged this, thanks for the work.

--
Matthew East
http://www.mdke.org
gnupg pub 1024D/0E6B06FF

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'html/ubuntu.xsl'
2--- html/ubuntu.xsl 2012-01-02 12:57:46 +0000
3+++ html/ubuntu.xsl 2012-04-03 06:58:18 +0000
4@@ -708,9 +708,6 @@
5 </div>
6 </div>
7
8- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
9- <script type="text/javascript" src="js/main.js"></script>
10-
11 <!-- IE6 hacks -->
12 <!--[if IE 6 ]>
13 <script src="js/pngFix.js"></script>

Subscribers

People subscribed via source and target branches