cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4931 commits 4 branches 1 tag 499 MiB
Commit graph

109 commits

Author SHA1 Message Date
Tom Hughes
0037502426 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
 2012-10-13 15:55:34 +01:00
John Firebaugh
14bc538681 Use ejs templates in browse JS 2012-10-13 13:01:00 +01:00
John Firebaugh
24c0bb1c88 Use proj/unproj consistently 2012-10-13 12:58:18 +01:00
John Firebaugh
b95f9115d7 Move browse-related JS to browse.js 2012-10-13 12:57:59 +01:00
John Firebaugh
52daf1dbc4 Move export-related JS to export.js 2012-10-13 12:57:09 +01:00
John Firebaugh
8d13c39400 Clean up diary_entry.js 2012-10-06 00:07:50 +01:00
John Firebaugh
7f6320ed10 Move diary entry JS to page-specific script file 2012-10-06 00:03:24 +01:00
John Firebaugh
237d2ad60d Simplify further by using OSM.home 2012-10-05 22:37:21 +01:00
John Firebaugh
97eee60c99 Remove unnecessary call to closeMapPopup() 
In the 'set_location' case no popups are ever opened.
 2012-10-05 22:32:05 +01:00
John Firebaugh
330ddc1666 Use jQuery 2012-10-05 22:31:17 +01:00
John Firebaugh
dd1ec4eb9b Move user JS to page-specific script file 
In this case it was difficult to eliminate interpolation
in a separate step, so I didn't bother.
 2012-10-05 22:24:41 +01:00
John Firebaugh
4f552430b4 Remove unnecessary delete statement 2012-10-05 19:37:21 +01:00
Tom Hughes
762d615859 Don't try and dereference an object that may not exist 2012-10-05 18:01:02 +01:00
Tom Hughes
824a474d93 Refactor updatelinks to avoid exceptions in updateLocation 2012-10-05 16:02:26 +01:00
John Firebaugh
3cf3d888b2 Refactor mapParams to compose better with apiUrl 2012-10-05 15:36:07 +01:00
John Firebaugh
e4ef507c5c Extract OSM.apiUrl 2012-10-05 15:26:54 +01:00
John Firebaugh
c3d1123965 Merge globals.js.erb and params.js 2012-10-05 15:21:47 +01:00
John Firebaugh
cabdb65191 Move remaining inline changeset JS to changeset.js 2012-10-05 15:20:57 +01:00
John Firebaugh
898bc32f48 Move changeset JS to page-specific script file 2012-10-05 15:20:26 +01:00
John Firebaugh
b5ca3b12d1 Remove unused function 2012-10-05 15:00:32 +01:00
John Firebaugh
6ef19d7e18 Remove unnecessary $(window).load() callbacks 
All this is already inside a $(document).ready() callback.
 2012-10-02 18:22:36 +01:00
John Firebaugh
f3afd43076 Avoid a JS error on (e.g.) ?way=nnnnn 
When showing an object, the map location is not set
until the vector layer has finished loading. Thus
map.getCenter() returns null.

Registering the events earlier avoids the need to call
updateLocation manually at all.
 2012-10-02 18:22:17 +01:00
John Firebaugh
569f3cbe9b Remove unused event argument 2012-09-30 12:16:31 +01:00
John Firebaugh
7e3ca66fff Use $(document).ready() to initialise browse JS 2012-09-30 12:15:49 +01:00
John Firebaugh
7c5d0fff3d Move browse JS to page-specific script file 2012-09-30 12:14:25 +01:00
John Firebaugh
605c700895 Clean up search JS 
Move it to index.js/edit.js and eliminate the global doSearch
function. Not enough code is shared to justify it.
 2012-09-30 12:05:24 +01:00
John Firebaugh
e83d43ca82 Move edit JS to page-specific script file 2012-09-30 11:59:49 +01:00
John Firebaugh
87e8cf3b58 Require index-only JS in index.js 2012-09-30 11:58:14 +01:00
John Firebaugh
c4d9f902d0 Wrap index JS in a single $(document).ready() 2012-09-29 18:00:04 +01:00
John Firebaugh
352f2a1671 Move index JS to page-specific script file 2012-09-29 18:00:04 +01:00
Tom Hughes
0b981e4b7f Generate proper descriptions for notes 2012-09-23 15:30:19 +01:00
Tom Hughes
90fe21a04a Remove redundant code 2012-09-23 15:07:35 +01:00
Tom Hughes
1f06652075 Add support for creating new notes 2012-09-23 15:05:03 +01:00
Tom Hughes
74543b630e Use standard indentation 2012-09-20 16:04:25 +01:00
Tom Hughes
4d91fe3dd9 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb
 2012-09-20 16:01:24 +01:00
John Firebaugh
0509fc8d12 Move param-based map configuration to client 
This prepares us for hash-based permalinks (#81) and removes
the duplication between index.html.erb and SiteController#edit.
 2012-09-18 08:56:45 +01:00
John Firebaugh
14a7d1abfc Use jquery.cookie 2012-09-18 08:55:27 +01:00
John Firebaugh
3b1f455dd9 Extract layer configuration to map.js 2012-09-16 16:25:33 +01:00
John Firebaugh
e338d11408 Move resize JS to application bundle 2012-09-07 13:05:25 -07:00
John Firebaugh
7ff77d9d3d Trigger map.updateSize() via a custom event 2012-09-07 13:04:48 -07:00
Tom Hughes
b507f6c887 Make active highlighting work properly again 2012-09-07 09:40:05 +01:00
Tom Hughes
d76aa13ddd Use the jQuery data() function to access HTML 5 data attributes 2012-09-06 21:29:16 +01:00
Tom Hughes
7af04f8691 Move rich text support code into a separate file 2012-09-06 20:44:24 +01:00
Tom MacWright
02de53eb45 Refactor view and css code around homepage links 
This adds a new class to the body which we can use to do more styling
in CSS rather than erb-embedded Ruby. The only visual change is that
there's now a subtle transition for homepage links becoming active.
 2012-09-06 20:28:23 +01:00
Tom Hughes
7c0055b5d7 Move piwik code to a static JS asset 2012-09-06 09:02:51 +01:00
Tom Hughes
815c98c977 Select which key entries to show on the client 
Rather than requesting a new key every time the zoom or layer
changes, serve up all the entries initially with appropriate
annotations to allow the client to decide which ones to show.
 2012-08-31 10:29:32 +01:00
John Firebaugh
519c7dc2dd Move key JS to application bundle 2012-08-30 15:34:26 -07:00
Tom Hughes
d7da1562c3 Get rid of the sidebar's onclose global state 2012-08-30 23:02:54 +01:00
Tom MacWright
93c392cf5f Basic javascript cleanup 
Unifies some logic, cleans up style.
 2012-08-30 21:27:57 +01:00
John Firebaugh
d6a8aaa369 Move sidebar JS to application bundle 
It's required on the main page so will nearly always be loaded anyway.

Enclosed in an anonymous function to avoid leaking the onclose global.
 2012-08-30 20:30:11 +01:00