Kin Blas
3c792c58f0
Merge branch 'master' into navigation
...
Fixed Conflicts:
js/jquery.mobile.init.js
js/jquery.mobile.navigation.js
2011-05-20 09:39:19 -07:00
cwt137
2a5badd14d
Adds missing button in toolbar theming example. Fixes issue #1674
2011-05-20 06:27:52 -07:00
scottjehl
e4336f38ae
changed the docs to represent the new auto back button default
2011-05-18 18:05:05 -04:00
scottjehl
8ba4c27300
Ya'll can scale your pages now. Fixes #1645 . Note: we originally disabled user zooming to work around a bug in iOS that automatically zooms the page beyond the constraints of the viewport on orientation change. We are not working around this bug at all now, but you are free to include any meta tag you'd like, or better yet, consider this polyfill: http://www.blog.highub.com/mobile-2/a-fix-for-iphone-viewport-scale-bug/
2011-05-17 17:28:19 -04:00
Kin Blas
b96310eedf
- Externalize some of the nested functions in changePage().
...
- Modified changePage() so that it can take an options object. Updated all references throughout the framework.
- Split $.mobile.pageLoading() into 2 functions $.mobile.show/hidePageLoadingMsg(). Updated docs accordingly.
- Renamed $.mobile.defaultTransition to $.mobie.defaultPageTransition. Updated docs accordingly.
- Added $.mobile.defaultDialogTransition so that it isn't hard coded in the changePage/transitionPages and select code.
- Hand integrated jquery.mobile.navigation.js checkins from master: 4b4ee54ae775f5e8e597ccb3084bbbd8
2011-05-16 16:02:26 -07:00
toddparker
a5960dea26
Closed missing </head> tag. Must have been a greedy find and replace that deleted this.
2011-05-12 11:09:59 -04:00
scottjehl
28ef60afe2
added deprecated message for media helpers
2011-05-11 18:31:13 +02:00
toddparker
51908bdaeb
Updated the radiobutton page to fix the sample code that showed two data-role attributes on a single element.
2011-04-28 17:29:37 -04:00
Todd Parker
0cccfda568
Merged pull request #1427 from mariozaizar/master.
...
Small typo in "Current browser support" link. Thanks mariozaizar!
2011-04-28 13:43:07 -07:00
cwt137
357b87fab9
Corrects comment that was wrong. Changes "header" to "footer". Fixes bug #1480
2011-04-19 22:00:25 -07:00
toddparker
fb8ef84434
Fixed a typo, thanks Steven.
2011-04-18 17:35:27 -07:00
toddparker
cdd8b745ca
Added documentation on the auto-updating title and data-attr in the anatomy of a page.
2011-04-18 14:51:48 -07:00
scottjehl
d97a964884
been meaning to do this for a while.
2011-04-14 16:04:47 -04:00
Mario Zaizar
42b66038e7
Fixing a really small typo in "Current browser support" link at Alpha 4 post.
2011-04-11 13:42:33 -05:00
scottjehl
5c1953f5cd
set version to 1.0a4.1
2011-04-07 16:55:05 -04:00
toddparker
77d7c08316
Removed placeholder A4 banner graphic.
2011-04-05 11:41:42 -04:00
scottjehl
bb7b09f2a1
documented theme css namespace caveat. Fixes #1341
2011-04-01 14:58:36 -04:00
scottjehl
cb34aa2169
typo
2011-04-01 12:28:28 -04:00
scottjehl
198cb1420d
updated some a3 links. DOH!
2011-03-31 19:08:45 -04:00
toddparker
0fd3a0b9bf
Updated banner to A4!
2011-03-31 18:39:36 -04:00
toddparker
db3a57975b
Updated to A4 and 1.5.2
2011-03-31 18:38:34 -04:00
toddparker
66ba363895
Fixed broken links
2011-03-31 18:36:39 -04:00
toddparker
37a54cb2b0
Removed outdated phone link styles
2011-03-31 18:35:48 -04:00
scottjehl
ec8a9cfed4
Merge remote branch 'origin/master'
2011-03-31 17:40:16 -04:00
scottjehl
125a80e518
edits to listview demos
2011-03-31 17:40:07 -04:00
John Bender
bb7ab45a19
small whitespace fix, removed the data-rel=back from two buttons in the docs as it takes precendence over the href
2011-03-31 14:39:34 -07:00
scottjehl
1a49fb9445
edited demo pages for listviews
2011-03-31 17:34:31 -04:00
scottjehl
91109ebbd0
better page titles
2011-03-31 12:56:47 -04:00
scottjehl
506d5050b1
Merge remote branch 'origin/master'
2011-03-30 23:52:41 -04:00
scottjehl
77b25a46ea
docs typo. Fixes #1150
2011-03-30 23:52:36 -04:00
toddparker
bfb713ce04
Merge remote branch 'origin/master'
2011-03-30 23:41:42 -04:00
toddparker
7ae63cb6cd
Updated grid documentation to explain that we're using additional classes an styles, just for illustraiton purposes.
2011-03-30 23:41:29 -04:00
scottjehl
6bac3f81e5
Merge remote branch 'origin/master'
2011-03-30 23:28:58 -04:00
scottjehl
51c79481fc
documented hashListeningEnabled. Fixes #1091
2011-03-30 23:28:53 -04:00
toddparker
faf0d6a581
Merge remote branch 'origin/master'
2011-03-30 23:15:43 -04:00
toddparker
43ea8df112
Fixed missing hyphens in listview theming data- attribues and re-coded some mangled list code examples. Everything is working right again. Closes #992
2011-03-30 23:15:27 -04:00
scottjehl
b77e04e7c4
Merge remote branch 'origin/master'
2011-03-30 22:53:55 -04:00
scottjehl
5d93d53090
removed the cdn hotlinks - local is best for testing. Also added a link to test Bender's new fix - works fantastic.
2011-03-30 22:53:46 -04:00
toddparker
e9e7a78e99
Fixed a minor grammatical error in the pages docs.
2011-03-30 22:31:18 -04:00
scottjehl
15ef91c828
Merge remote branch 'origin/master'
2011-03-28 18:31:00 -04:00
scottjehl
8fa56b6e85
Got the sticky footers working again. Markup change noted in first page of demo. Fixes #850
2011-03-28 18:30:55 -04:00
toddparker
cf5676992d
Fixed toolbar demo page, added a sample form and updated list markup to new style
2011-03-28 16:43:40 -04:00
scottjehl
bb9921a9f4
Merge remote branch 'origin/master'
...
Conflicts:
docs/pages/docs-link-scenarios.html
2011-03-28 16:37:58 -04:00
toddparker
72f4b4a0ca
Fixed link markup on this page.
2011-03-28 16:33:29 -04:00
scottjehl
1a2a85773b
fixed a bad path
2011-03-28 16:07:19 -04:00
scottjehl
bc005fe18d
page isn't in use. covered by link-formats.html
2011-03-28 16:07:09 -04:00
toddparker
50717094ad
Removed section on non-ajax dialogs, not supported yet.
2011-03-28 15:42:53 -04:00
scottjehl
ee02a76279
self-submitting form demo.
2011-03-27 18:51:59 -04:00
scottjehl
4f4718731f
Incorporating mariozaizar's changes to add a backBtnTheme option (null by default) to the page plugin. A few edits were needed to support namespacing and a proper null default so theme inheritance is the default.
2011-03-27 18:29:45 -04:00
scottjehl
b0eb2bd053
Fixed up nested listviews so that any markup that comes before the child list will be used for complex formatting in the list item node. Text nodes that are direct children of the LI still work fine as well. Fixes #585
2011-03-27 16:18:24 -04:00
scottjehl
4011cf684e
added a bigger select example to the demo
2011-03-27 15:56:48 -04:00
scottjehl
ef1b0d94ae
added the $.mobile.listview.prototype.options.closeBtnText option for configuring the text of dialog back/close buttons. This also Fixes #1227 (or at least a note within that already-closed issue). Documentation included.
2011-03-27 14:10:16 -04:00
scottjehl
315c594572
Added "filterPlaceholder" option to allow configuring filter listview placeholder text. Documented here: jquerymobile.com/test/#docs/lists/docs-lists.html. Fixes #1227
2011-03-27 14:01:59 -04:00
scottjehl
241500a422
quick sample page for testing selects in dialogs
2011-03-27 12:38:33 -04:00
scottjehl
4a45d8d96b
Added pageLoadErrorMessage option. Defaults to "Error Loading Page". Documentation included. Fixes #1258 and Fixes #363
2011-03-27 11:45:03 -04:00
scottjehl
baa37e94b5
markup fixes
2011-03-27 01:47:58 -04:00
scottjehl
bbfb91b45a
markup fix
2011-03-27 01:21:53 -04:00
scottjehl
8397afba8c
markup fix
2011-03-27 01:16:17 -04:00
scottjehl
f8e406dd7f
more markup cleanup to support the new hierarchy
2011-03-26 21:29:24 -04:00
scottjehl
84b55548d3
more updates to the listview markup, styles and scripts to allow wrapped anchors
2011-03-26 21:29:24 -04:00
scottjehl
72fe3a2c21
initial markup changes
2011-03-26 21:29:24 -04:00
scottjehl
e8cee23744
major simplification of jqmData method, while adding new methods for jqmRemoveData, and also their $-namepaced utility methods, including $.jqmHasData. Commit includes 20 new unit tests included to test compatibility with jQuery core's data methods, and docs are updated as well.
2011-03-26 14:14:02 -04:00
scottjehl
8a3b846e95
documented the new jqmData method and :jqmData selector.
2011-03-26 09:11:42 -04:00
scottjehl
9fc1f9828b
fixed docs for the default namespace (blank string)
2011-03-26 08:39:12 -04:00
John Bender
bb721aa48c
Merge branch 'master' of github.com:jquery/jquery-mobile
2011-03-25 21:38:06 -07:00
toddparker
07be08c4b4
Inproved select docs and added optgroup and disabled option for native menus
2011-03-25 22:42:11 -04:00
John Bender
4fe0b29a0f
Merge branch 'data-namespacing'
2011-03-25 18:46:00 -07:00
toddparker
86db2a77a1
Cretaed Alpha 4 version banner for docs homepage so we're ready to go. Need to rename this to "version.png" when we flip the switch.
2011-03-25 15:14:20 -04:00
toddparker
509082efd1
Updated supported browser page to include WP7 and say alpha 4.
2011-03-25 13:07:27 -04:00
toddparker
649824a40e
Few language tweaks.
2011-03-25 13:01:35 -04:00
toddparker
ea074d1ef1
Set the global default for select menus to use the native instead of custom. Updated the docs and examples to match.
2011-03-25 12:44:46 -04:00
scottjehl
61005944d3
Added support for the target attribute on forms (such as target="_blank"). When set, the form handler simply allows the native handling to apply. Unlike anchors however, the rel attribute is not allowed on forms. If you're purely looking to submit a single form without ajax, you can use the data-ajax="false" attribute as well. Fixes #952 and docs updates are included
2011-03-24 00:59:42 -04:00
toddparker
f22b7c8395
Updates to rel="external" dialog docs
2011-03-23 12:44:24 -04:00
toddparker
aad79e8a9a
Added rel="external" example to the dialogs docs
2011-03-23 12:39:04 -04:00
John Bender
63e8f6bfcb
resolved merge conflicts and fixed 2 tests
2011-03-15 23:57:17 -07:00
toddparker
b3cfe8778f
Added documentation on how to disable Ajax form submission via data- attribute and gloabl config.
2011-03-15 19:21:27 -04:00
scottjehl
3275baf64c
added demo pages for inset filter lists
2011-03-15 00:08:01 -04:00
scottjehl
7f48419a29
This adds a fallback for navbars that have one item, so they simply fill 100%. Credit for this fix and idea goes to kennedyr (Richard Kennedy), but we changed the naming around a bit. Fixes #1107 . Thanks Richard!
2011-03-14 20:26:20 -04:00
scottjehl
0d9627d54e
Added viewport meta elements to the markup of every template and removed the metaViewportContent option from code and docs. IE does not support generated viewport tags.
2011-03-14 00:20:23 -04:00
toddparker
9e29410d0a
Added documentation to explain how to use the refresh method on many form elements when you manipulate them. This will hopefully help a lot of people who were confused by this!
2011-03-13 22:16:13 -04:00
toddparker
061fbc4a72
Fixed country names next to flags. Apologies to Norway, Finland and Sweden! Fixes #1156 .
2011-03-13 21:58:37 -04:00
scottjehl
19f5fd7cae
changed the default namespace to "" and updated the docs/demos as such
2011-03-09 22:36:14 -05:00
scottjehl
1e01856f5d
updated to use namespace
2011-03-09 21:34:03 -05:00
scottjehl
3cae8f8bf0
caught a few more
2011-03-09 21:03:40 -05:00
scottjehl
77ac0f009a
a few more non-namespaced attrs to bring over
2011-03-09 21:03:40 -05:00
scottjehl
aa0228d5b8
updated doc
2011-03-09 21:03:40 -05:00
scottjehl
9e91fa6752
updated docs with jq namespace, found some more stragglers
2011-03-09 21:03:40 -05:00
scottjehl
d183cc591f
applied data-jq- namespacing to all data attributes in docs
2011-03-09 20:53:02 -05:00
toddparker
9bd530b1fa
Added a new demo page showing how adding data-role="none" to form elements and buttons will show the default, native control. Added link to this page from the forms index.
...
Good news - the data-role="none" attribute seems to work great, no issues found.
2011-03-09 15:35:45 -05:00
Ernesto Jiménez
dae3e2fa74
Proper support for lists with search filter and dividers
2011-02-23 17:42:47 +00:00
Jim Hoskins
cbd890daa6
Changed <ul> to <ol> in html content formattic doc
2011-02-23 01:27:12 +08:00
Jim Hoskins
1b588fa76d
Updated grammatical errors in docs
...
Changed "an" to "a" where appropriate
2011-02-23 01:27:12 +08:00
Ashley Streb
767c35c629
Updating docs to specify that the default transition for dialogs is 'pop'
2011-02-16 22:52:44 -08:00
tschaub
899e9581e9
P free hamster.
2011-02-16 05:55:21 +08:00
Michael O'Hearn
554bb1e7e3
fixed a typo
2011-02-10 22:04:15 -08:00
John Bender
2a1935caf5
Revert "added autoInitialize documentation"
...
This reverts commit 7da26e1974
2011-02-07 08:11:57 -08:00
Ryan
ee56af59af
Added data-dividertheme to docs.
2011-02-05 20:08:23 -05:00
scottjehl
89cb6d455f
typos in page template urls.
2011-02-04 10:13:56 -05:00
scottjehl
a1867eef58
found a dead link that managed to take down our multipage demo.
2011-02-04 08:08:32 -05:00
toddparker
c618ef4251
Added bg color for demo pages
2011-02-03 18:38:51 -05:00
toddparker
6c63bc699b
Merge remote branch 'origin/master'
2011-02-03 18:34:55 -05:00
toddparker
0aeb20b180
home button fixes
2011-02-03 18:34:35 -05:00
scottjehl
0745af1292
typo in code example. Fixes #966
2011-02-03 17:49:58 -05:00
toddparker
2423c3cb59
Device image
2011-02-03 17:31:56 -05:00
toddparker
9806cdc221
Added a home link to all pages and changed the header bar theme swatch to b globally
2011-02-03 17:29:48 -05:00
toddparker
d79d0e3c45
Updated sample page templates and docs to mobile a3 and jquery 1.5
2011-02-03 16:36:21 -05:00
toddparker
1db7cfb360
New high-res logo with better compression
2011-02-03 14:17:06 -05:00
toddparker
6e50626914
Alpha 3 flag
2011-02-03 14:09:55 -05:00
toddparker
928562dd92
Created demo buttons for the new home and search icons
2011-02-03 13:38:25 -05:00
toddparker
985cc19934
Added h2 to intro page
2011-02-03 08:17:18 -05:00
toddparker
9e95212789
Added firefox mobile to the list of supported browers for alpha 3.
2011-02-03 08:15:14 -05:00
toddparker
faf36d02a1
Fixed broken footer example, added a few more color variations.
2011-02-03 08:11:57 -05:00
scottjehl
1c49c96b6c
added data-rel back attrs to dialog sample buttons
2011-02-03 02:59:30 -05:00
John Bender
7da26e1974
added autoInitialize documentation
2011-02-02 23:03:07 -08:00
toddparker
d76234b397
Content tweaks for form theme page, fixed a few broken links
2011-02-01 22:55:10 -05:00
toddparker
1644bca45b
Added data-role="button" attributes to links because these were rendering as links only. Added link to form theming page.
2011-02-01 22:38:22 -05:00
toddparker
cd17ceda97
Updated the status of alpha 3 borwser support page
2011-02-01 22:30:45 -05:00
scottjehl
698f7fd255
updated attribute for new option name
2011-02-01 15:50:40 -05:00
scottjehl
aad8ac174a
Removed the extra ways to set nativeMenu option in select plugin. Now like other plugins, the option is both available through the plugin's options (nativeMenu) or through a data-attribute (data-native-menu), which is automated through the camelcase option name. Unit tests updated
2011-02-01 13:27:35 -05:00
scottjehl
3f938fd2f9
fixed bug where a preset data-url was being prefixed by the base url, rather than replacing the whole hash. Fixes #591
2011-02-01 12:32:02 -05:00
scottjehl
e0d419d001
updated some docs pages to mention data-ajax="false" attribute on links.
2011-02-01 01:20:47 -05:00
scottjehl
0572757af3
updated docs to describe new listview li-level data-theme option
2011-02-01 01:07:17 -05:00
scottjehl
b3a8230638
This commit includes simplifications to the hashchange event handling & changePage logic, which results in a few bug fixes and removal of some previous limitations. Details:
...
- jquery.mobile.core.js no longer creates pages from every page and dialog in the DOM automatically at domready. Instead, pages are created as they are referenced via changePage, which can speed up pageload in multi-page documents, and means local "dialogs" referenced via data-rel="dialog" no longer need a data-role="dialog" attribute when served.
- in changePage, "from" is now allowed to be undefined. This simplifies the logic involved in showing the first page, which never had a "from" page, and previously needed a custom pageChange workaround to accommodate that.
- The pageshow event is no longer used as a callback for returning false and preventing the $.mobile.activePage from being set to the newly shown page. In other words, a page always becomes $.mobile.activePage once its shown now (the only reason this was optional before was because of a dialog restriction that's no longer true)
- the hashchange event logic for showing a particular page is now greatly simplified. It either shows the page referenced in location.hash, or if there's no hash it changes to the first page in the dom. This means every pageshow (including the first one) now uses pageChange internally.
- the hashchange event listener is no longer disabled when ajaxEnabled == false. Doing this before prevented local non-ajax page navigation from working properly. To disable hashchange listening, use $.mobile.urlHistory.listeningEnabled. We might consider defining (or moving) this on the $.mobile hash later as well for easier access.
- The internal var $.mobile.startPage is now $.mobile.firstPage, because it's not necessarily the page you started on, but merely a reference to the first "page" in the dom.
- Back buttons are auto-added to every page after the first one you first visit (this includes generated pages, such as those in a multipage document or nested listviews). Keep in mind that a "back" button does not take the place of a standard "home" link, and when building an app with jQuery Mobile, it's good to make use of both (particularly on deep-linked pages). Fixes #908
2011-01-31 17:05:57 -05:00
scottjehl
f842b46474
added data-rel attrs to close buttons
2011-01-31 17:05:41 -05:00
scottjehl
44806bcf58
added a dialog to the demo
2011-01-31 16:51:20 -05:00
scottjehl
b112b6ea84
updated doc version #
2011-01-31 16:45:41 -05:00
scottjehl
c470278a62
added data-direction to "back" link in content, in case the deep-linked page is opened first.
2011-01-30 16:54:33 -05:00
John Bender
e35952346f
whitespace correction for docs
2011-01-27 23:48:06 -08:00
John Bender
2dfa09bcf7
updated docs to include $.mobile.nativeSelectMenus
2011-01-27 23:42:56 -08:00
John Bender
3197f7e61a
corrected a duplicate id which was causing the two similarly identified selects to have doubled menu page header titles
2011-01-27 22:50:40 -08:00
toddparker
5b7201ef48
Added documentation and demos for the new data-native="true" option that speeds up performance of selects by using the browser's native menu (thanks John Bender!)
2011-01-27 13:40:20 -05:00
scottjehl
df05143371
edited some nav model info - needs filling out, but outdated info is removed now at least
2011-01-26 22:44:32 -05:00
scottjehl
b50d6a74c2
improved datepicker usage instructions and linked it up from the forms index under "experimental"
2011-01-26 20:48:25 -05:00
scottjehl
2c6cc45ad0
incomplete, but close to fixing the dialog-create-history entry piece. Also includes fix for nested-listview deep linking regression.
2011-01-26 14:27:10 -05:00
scottjehl
d9b84f3f60
added a note to docs. Fixes #880
2011-01-25 23:46:09 -05:00
scottjehl
b7001d8148
markup cleanup. Fixes #878
2011-01-25 22:24:05 -05:00
John Resig
4445ae3702
Remove support for stopping desk-based platforms, fixes #876 . In the future if you wish to stop desks on platforms I recommend a cheap solution to that problem:
...
http://www.amazon.com/Magic-Sliders-80934-Rubber-Door/dp/B000UVMQ38
If you wish to have support brought back it can only be done so through successfully beating me at iOS Carcassonne. My username is 'jeresig@gmail.com'. Warning: I don't lose.
2011-01-25 16:05:19 -05:00
scottjehl
0ba9acfc33
added support for URL updating via a preset data-url on the page div when it is sent from the server.
...
If data-url is set on a page div when it returns from the server, it's value will be used to replace the url in the hash, and as the base url for future requests if it adds additional segments (such as a trailing slash). This will enable developers to work around the limitation of directory links requiring a trailing slash, and will also allow developers to specify a new url after a redirect occurs (such as after a login). Fixes #867
2011-01-24 19:35:45 -05:00
scottjehl
2e6a396278
added ajaxEnabled option. ajaxLinksEnabled and ajaxFormsEnabled are deprecated and will be removed by 1.0. Fixes #851
2011-01-23 19:03:35 -05:00
scottjehl
be8eb3d0c6
deprecated data-back attribute on links in favor of data-direction="reverse". Updated docs and relevant demos.
2011-01-23 18:12:46 -05:00
scottjehl
9b57c46349
Refactored urlStack and updated dialog and page plugins to match. jQuery Mobile's internal history now attempts to follow the history menu when urls change from hashchange, even for changes that go multiple steps forward or back. The internal history stack is now pruned based on whether a user goes back and then changes direction, whereas before a back-button click would result in a pop off the history. Instead we now maintain an active index number in the history stack, which allows us to maintain references to transitions that are saved on pages reached through clicking the forward button as well. This fixes #636 .
...
In the process, some other small changes should be noted:
urlStack is now urlHistory, a hash of methods and properties used for history stack management (stack, activeIndex, getActive, getPrev, getNext, addNew, clearForward, and listening Enabled). All these are documented inline and exposed on $.mobile.urlHistory (I'm not sure these will be publicly documented, but just exposed internally for plugins for now).
$.changePage has two argument changes: the "back" argument is now called "reverse"; this results in no change from an end-user standpoint, but reflects the fact that it only reverses the direction of a transition without affecting the internal history stack, and second, a new argument at the end defines whether changePage was called from a hashChange which makes that url open to history menu guessing.
2011-01-23 17:33:36 -05:00
scottjehl
6a958ecba2
merge
2011-01-22 17:48:36 -05:00
scottjehl
9e4b0a484c
Overhauled path object and exposed it and the base object via $.mobile. Form and Link handlers now use the path methods internally. Unit tests adjusted, but more are needed to fully cover the path and base propeties and methods. Fixes #566 .
2011-01-22 17:42:07 -05:00
Kin Blas
161f5e6ae3
Removed jquery.js from js/index.php and updated all html doc/experiments/test files that incuded "js/" so that they also include jquery.js manually.
...
This makes our include model match the include model on the CDN, and allows devs to make use of mobileinit for debugging some of the samples since that must be set up after jquery.js, but before jquery-mobile.
2011-01-20 11:26:12 -08:00
John Bender
beb40bcd7f
corrected link to multi page template to have rel external per the docs
2011-01-20 00:38:07 -08:00
ehynds
f9c1592bc7
fix extra-wide pages in opera & opera mini
2011-01-12 18:00:53 -05:00
bclinkinbeard
32056c6873
Added type attribute to script tags and fixed footer comment
2011-01-12 03:52:33 +08:00
Kin Blas
8050fb0d01
Merge branch 'master' of https://github.com/walkingeyerobot/jquery-mobile into pull672
2011-01-11 09:04:32 -08:00
Kin Blas
38f09ee66f
Sweep through all files to add a trailing slash to <link> tags that include thems/default. This should fix Opera Mobile Issue 763.
2011-01-05 16:19:24 -08:00
scottjehl
3fb55aef0b
fixed up some duplicate IDs
2010-12-23 14:50:01 -05:00
