Permalink
Browse files

Merge branch 'master' of git://github.com/mozilla-b2g/gaia into updat…

…eDownloadCancel
  • Loading branch information...
2 parents 3852ed0 + 8783efc commit 1768a81032a7f104404d8cee8f45234c13729792 @marshall marshall committed Dec 4, 2012
Showing with 19,309 additions and 4,695 deletions.
  1. +12 −5 apps/bluetooth/js/transfer.js
  2. +3 −4 apps/bluetooth/manifest.webapp
  3. +16 −0 apps/bluetooth/style/transfer.css
  4. +10 −8 apps/browser/index.html
  5. +2 −4 apps/browser/js/browser.js
  6. +3 −1 apps/browser/style/browser.css
  7. +14 −33 apps/calendar/index.html
  8. +195 −119 apps/calendar/js/app.js
  9. +1 −1 apps/calendar/js/controllers/alarm.js
  10. +61 −9 apps/calendar/js/db.js
  11. +12 −5 apps/calendar/js/models/account.js
  12. +4 −4 apps/calendar/js/presets.js
  13. +77 −28 apps/calendar/js/router.js
  14. +12 −5 apps/calendar/js/service/caldav.js
  15. +7 −2 apps/calendar/js/store/account.js
  16. +32 −71 apps/calendar/js/template.js
  17. +15 −16 apps/calendar/js/templates/account.js
  18. +13 −13 apps/calendar/js/templates/calendar.js
  19. +27 −25 apps/calendar/js/templates/day.js
  20. +33 −31 apps/calendar/js/templates/month.js
  21. +19 −15 apps/calendar/js/templates/week.js
  22. +2 −2 apps/calendar/js/{ → utils}/input_parser.js
  23. +1 −1 apps/calendar/js/{ → utils}/ordered_map.js
  24. +5 −4 apps/calendar/js/{ → utils}/overlap.js
  25. +0 −1 apps/calendar/js/views/day.js
  26. +6 −2 apps/calendar/js/views/day_based.js
  27. +1 −1 apps/calendar/js/views/day_child.js
  28. +1 −1 apps/calendar/js/views/modify_event.js
  29. +1 −1 apps/calendar/js/views/time_parent.js
  30. +1 −1 apps/calendar/js/views/week_child.js
  31. +4 −0 apps/calendar/style/day_views.css
  32. +1 −0 apps/calendar/style/settings.css
  33. +5 −0 apps/calendar/style/ui.css
  34. +4 −0 apps/calendar/style/week_view.css
  35. +18 −0 apps/calendar/test/integration/atoms/get_pos.js
  36. +30 −0 apps/calendar/test/integration/atoms/view_swipe.js
  37. +101 −2 apps/calendar/test/integration/calendar_integration.js
  38. +14 −0 apps/calendar/test/integration/calendar_view.js
  39. +7 −4 apps/calendar/test/integration/factory/forms.js
  40. +73 −8 apps/calendar/test/integration/modify_events_test.js
  41. +181 −0 apps/calendar/test/integration/navigation_test.js
  42. +80 −0 apps/calendar/test/integration/views/day_view.js
  43. +5 −3 apps/calendar/test/integration/views/modify_event_view.js
  44. +16 −0 apps/calendar/test/integration/views/month_view.js
  45. +3 −1 apps/calendar/test/integration/views/months_day_view.js
  46. +10 −0 apps/calendar/test/integration/views/week_view.js
  47. +26 −56 apps/calendar/test/unit/app_test.js
  48. +100 −0 apps/calendar/test/unit/db_test.js
  49. +70 −0 apps/calendar/test/unit/dependency_loader_test.js
  50. +1 −1 apps/calendar/test/unit/helper.js
  51. +2 −2 apps/calendar/test/unit/input_parser_test.js
  52. +6 −4 apps/calendar/test/unit/models/account_test.js
  53. +2 −2 apps/calendar/test/unit/ordered_map_test.js
  54. +2 −33 apps/calendar/test/unit/router_test.js
  55. +17 −7 apps/calendar/test/unit/service/caldav_test.js
  56. +4 −6 apps/calendar/test/unit/store/account_test.js
  57. +3 −2 apps/calendar/test/unit/support/factories/all.js
  58. +10 −0 apps/calendar/test/unit/support/templates/mock_template.js
  59. +34 −0 apps/calendar/test/unit/support/views/lazy_mock_view.js
  60. +32 −32 apps/calendar/test/unit/template_test.js
  61. +26 −4 apps/calendar/test/unit/{ → utils}/overlap_test.js
  62. +11 −4 apps/calendar/test/unit/views/day_based_test.js
  63. +1 −1 apps/calendar/test/unit/views/day_child_test.js
  64. +1 −3 apps/calendar/test/unit/views/day_test.js
  65. +11 −5 apps/calendar/test/unit/views/modify_event_test.js
  66. +1 −1 apps/calendar/test/unit/views/month_test.js
  67. +1 −1 apps/calendar/test/unit/views/months_day_test.js
  68. +2 −2 apps/calendar/test/unit/views/time_parent_test.js
  69. +1 −1 apps/calendar/test/unit/views/week_child_test.js
  70. +1 −1 apps/calendar/test/unit/views/week_test.js
  71. +13 −8 apps/camera/js/camera.js
  72. +4 −3 apps/camera/manifest.webapp
  73. +2 −1 apps/clock/manifest.webapp
  74. +7 −8 apps/communications/contacts/fb_import.html
  75. +1 −1 apps/communications/contacts/fb_link.html
  76. +15 −10 apps/communications/contacts/index.html
  77. +8 −6 apps/communications/contacts/js/contacts.js
  78. +34 −9 apps/communications/contacts/js/contacts_form.js
  79. +15 −27 apps/communications/contacts/js/contacts_list.js
  80. +7 −11 apps/communications/contacts/js/contacts_shortcuts.js
  81. +3 −4 apps/communications/contacts/js/fb/fb_import.js
  82. +1 −1 apps/communications/contacts/js/search.js
  83. +4 −0 apps/communications/{facebook/js/fb_image_loader.js → contacts/js/utilities/image_loader.js}
  84. +11 −112 apps/communications/contacts/style/app.css
  85. +6 −16 apps/communications/contacts/style/contacts.css
  86. +9 −57 apps/communications/contacts/style/fb/facebook.css
  87. BIN apps/communications/contacts/style/gphx/bitmap/default/vw-jumper/fav.png
  88. BIN apps/communications/contacts/style/gphx/bitmap/default/vw-jumper/search.png
  89. +1 −2 apps/communications/contacts/style/search.css
  90. +2 −2 apps/communications/contacts/test/unit/contacts_list_test.js
  91. +70 −19 apps/communications/dialer/js/dialer.js
  92. +1 −6 apps/communications/dialer/js/handled_call.js
  93. +0 −15 apps/communications/dialer/js/keypad.js
  94. +12 −1 apps/communications/dialer/js/oncall.js
  95. +35 −27 apps/communications/dialer/js/ussd.js
  96. +3 −1 apps/communications/dialer/locales/dialer.en-US.properties
  97. +11 −13 apps/communications/dialer/test/unit/handled_call_test.js
  98. +11 −0 apps/communications/dialer/test/unit/mock_call_handler.js
  99. +21 −4 apps/communications/ftu/css/style.css
  100. +19 −6 apps/communications/ftu/index.html
  101. +7 −0 apps/communications/ftu/js/navigation.js
  102. +24 −10 apps/communications/ftu/locales/ftu.en-US.properties
  103. +2 −2 apps/communications/manifest.webapp
  104. +12 −18 apps/email/js/compose-cards.js
  105. +96 −38 apps/email/js/ext/gaia-email-opt.js
  106. +166 −373 apps/email/js/iframe-shims.js
  107. +7 −3 apps/email/js/message-cards.js
  108. +23 −19 apps/fm/style/fm.css
  109. +1 −0 apps/gallery/index.html
  110. +7 −29 apps/gallery/js/Frame.js
  111. +81 −0 apps/gallery/js/MP4Parser.js
  112. +121 −14 apps/gallery/js/MetadataParser.js
  113. +51 −11 apps/gallery/js/VideoPlayer.js
  114. +11 −5 apps/gallery/js/gallery.js
  115. +3 −0 apps/gallery/style/VideoPlayer.css
  116. +5 −5 apps/homescreen/index.html
  117. +43 −2 apps/homescreen/js/grid.js
  118. +6 −5 apps/homescreen/js/homescreen.js
  119. +30 −9 apps/homescreen/js/page.js
  120. +16 −6 apps/homescreen/js/request.js
  121. +3 −1 apps/homescreen/js/wallpaper.js
  122. +5 −0 apps/homescreen/locales/homescreen.en-US.properties
  123. +2 −2 apps/homescreen/style/request.css
  124. +2 −22 apps/keyboard/js/keyboard.js
  125. +0 −5 apps/keyboard/style/keyboard.css
  126. +63 −26 apps/music/js/metadata.js
  127. +8 −1 apps/music/js/music.js
  128. +2 −1 apps/music/manifest.webapp
  129. +1,846 −442 apps/pdfjs/content/build/pdf.js
  130. +9 −2 apps/pdfjs/content/web/images/annotation-check.svg
  131. +14 −2 apps/pdfjs/content/web/images/annotation-comment.svg
  132. +25 −0 apps/pdfjs/content/web/images/annotation-help.svg
  133. +9 −0 apps/pdfjs/content/web/images/annotation-insert.svg
  134. +10 −0 apps/pdfjs/content/web/images/annotation-key.svg
  135. +10 −0 apps/pdfjs/content/web/images/annotation-newparagraph.svg
  136. +41 −0 apps/pdfjs/content/web/images/annotation-note.svg
  137. +15 −0 apps/pdfjs/content/web/images/annotation-paragraph.svg
  138. BIN apps/pdfjs/content/web/images/div_line_left.png
  139. BIN apps/pdfjs/content/web/images/div_line_right.png
  140. BIN apps/pdfjs/content/web/images/document_bg.png
  141. BIN apps/pdfjs/content/web/images/findbarButton-next-rtl.png
  142. BIN apps/pdfjs/content/web/images/findbarButton-next.png
  143. BIN apps/pdfjs/content/web/images/findbarButton-previous-rtl.png
  144. BIN apps/pdfjs/content/web/images/findbarButton-previous.png
  145. BIN apps/pdfjs/content/web/images/icon_next_page.png
  146. BIN apps/pdfjs/content/web/images/icon_previous_page.png
  147. BIN apps/pdfjs/content/web/images/icon_zoom_in.png
  148. BIN apps/pdfjs/content/web/images/icon_zoom_out.png
  149. BIN apps/pdfjs/content/web/images/loading-small.png
  150. BIN apps/pdfjs/content/web/images/spinner.png
  151. BIN apps/pdfjs/content/web/images/toolbar_background.png
  152. +794 −194 apps/pdfjs/content/web/l10n.js
  153. +614 −283 apps/pdfjs/content/web/locale.properties
  154. +111 −0 apps/pdfjs/content/web/locale/ar/viewer.properties
  155. +127 −0 apps/pdfjs/content/web/locale/ca/viewer.properties
  156. +59 −0 apps/pdfjs/content/web/locale/cs/viewer.properties
  157. +107 −0 apps/pdfjs/content/web/locale/da/viewer.properties
  158. +45 −0 apps/pdfjs/content/web/locale/de/viewer.properties
  159. +122 −0 apps/pdfjs/content/web/locale/en-US/viewer.properties
  160. +107 −0 apps/pdfjs/content/web/locale/es/viewer.properties
  161. +108 −0 apps/pdfjs/content/web/locale/fi/viewer.properties
  162. +71 −0 apps/pdfjs/content/web/locale/fr/viewer.properties
  163. +60 −0 apps/pdfjs/content/web/locale/he/viewer.properties
  164. +45 −0 apps/pdfjs/content/web/locale/it/viewer.properties
  165. +122 −0 apps/pdfjs/content/web/locale/ja/viewer.properties
  166. +63 −0 apps/pdfjs/content/web/locale/locale.properties
  167. +121 −0 apps/pdfjs/content/web/locale/nl/viewer.properties
  168. +57 −0 apps/pdfjs/content/web/locale/pl/viewer.properties
  169. +45 −0 apps/pdfjs/content/web/locale/pt-BR/viewer.properties
  170. +56 −0 apps/pdfjs/content/web/locale/ro/viewer.properties
  171. +63 −0 apps/pdfjs/content/web/locale/ru/viewer.properties
  172. +56 −0 apps/pdfjs/content/web/locale/sr/viewer.properties
  173. +122 −0 apps/pdfjs/content/web/locale/sv/viewer.properties
  174. +59 −0 apps/pdfjs/content/web/locale/zh-CN/viewer.properties
  175. +112 −0 apps/pdfjs/content/web/locale/zh-TW/viewer.properties
  176. +8 −0 apps/pdfjs/content/web/viewer-b2g.css
  177. +90 −1,112 apps/pdfjs/content/web/viewer.css
  178. +116 −149 apps/pdfjs/content/web/viewer.html
  179. +1,010 −219 apps/pdfjs/content/web/viewer.js
  180. +2 −1 apps/pdfjs/manifest.webapp
  181. +49 −60 apps/settings/index.html
  182. +1 −1 apps/settings/js/apps.js
  183. +9 −0 apps/settings/js/connectivity.js
  184. +28 −0 apps/settings/js/hotspot.js
  185. +31 −13 apps/settings/js/icc.js
  186. +18 −1 apps/settings/js/icc_menu.js
  187. +20 −2 apps/settings/js/settings.js
  188. +6 −9 apps/settings/js/wifi.js
  189. +2 −1 apps/settings/locales/settings.en-US.properties
  190. +0 −2 apps/settings/manifest.webapp
  191. +6,920 −0 apps/settings/open-source-license.html
  192. +2 −2 apps/settings/style/apps.css
  193. +7 −7 apps/settings/style/lists.css
  194. +4 −4 apps/settings/style/onpair.css
  195. +2 −2 apps/settings/style/phone_lock.css
  196. +15 −3 apps/settings/style/settings.css
  197. +2 −2 apps/settings/style/simcard.css
  198. +5 −22 apps/sms/js/sms.js
  199. +3 −4 apps/sms/style/sms.css
  200. +0 −11 apps/system/emergency-call/js/keypad.js
  201. +101 −47 apps/system/js/app_install_manager.js
  202. +7 −2 apps/system/js/attention_screen.js
  203. +7 −0 apps/system/js/background_service.js
  204. +4 −4 apps/system/js/bluetooth_transfer.js
  205. +23 −0 apps/system/js/icc_cache.js
  206. +29 −10 apps/system/js/keyboard_manager.js
  207. +6 −3 apps/system/js/operator_variant/operator_variant.js
  208. +6 −4 apps/system/js/statusbar.js
  209. +21 −2 apps/system/js/update_manager.js
  210. +19 −10 apps/system/js/window_manager.js
  211. +3 −3 apps/system/manifest.webapp
  212. BIN apps/system/style/bluetooth_transfer/images/icon_bluetooth.png
  213. +5 −1 apps/system/style/statusbar/statusbar.css
  214. +0 −4 apps/system/style/system/keyboard.css
  215. +1 −0 apps/system/style/system/system.css
  216. +26 −11 apps/system/style/update_manager/update_manager.css
  217. +1 −0 apps/system/style/zindex.css
  218. +329 −127 apps/system/test/unit/app_install_manager_test.js
  219. +64 −0 apps/system/test/unit/mock_navigator_settings.js
  220. +69 −79 apps/system/test/unit/update_manager_test.js
  221. +2 −0 apps/video/js/video.js
  222. +2 −1 apps/video/manifest.webapp
  223. +2 −2 apps/wallpaper/js/pick.js
  224. +3 −2 build/multilocale.py
  225. +3 −5 build/settings.py
  226. +3 −0 build/ua-override-prefs.js
  227. +1 −1 external-apps/maps/origin
  228. +11 −1 shared/js/idletimer.js
  229. +3 −1 shared/js/l10n.js
  230. +13 −12 shared/js/l10n_date.js
  231. +4 −0 shared/js/tz_select.js
  232. +81 −51 shared/locales/date/date.en-US.properties
  233. +0 −1 shared/locales/permissions/permissions.en-US.properties
  234. +0 −1 shared/locales/permissions/permissions.fr.properties
  235. +4 −4 shared/resources/apn.json
  236. +4 −0 shared/resources/apn/operator-variant.xml
  237. +9 −3 shared/resources/apn/query.js
  238. +6 −6 shared/style/headers.css
  239. +0 −2 test_apps/test-container/manifest.webapp
  240. +8 −32 test_apps/uitest/js/contacts.js
  241. +0 −11 test_apps/uitest/tests/inlineactivities.html
  242. +37 −20 tests/atoms/gaia_apps.js
  243. +161 −0 tests/atoms/gaia_data_layer.js
  244. +58 −0 tests/atoms/gaia_lock_screen.js
  245. +0 −21 tests/atoms/gaia_unlock.js
  246. +7 −4 tests/js/app_integration.js
  247. +184 −26 tests/python/gaiatest/gaia_test.py
  248. 0 tests/python/gaiatest/mocks/__init__.py
  249. +40 −0 tests/python/gaiatest/mocks/mock_contact.py
  250. +8 −0 tests/python/gaiatest/tests/contacts/manifest.ini
  251. +84 −0 tests/python/gaiatest/tests/contacts/test_add_new_contact.py
  252. +83 −0 tests/python/gaiatest/tests/contacts/test_call_contact.py
  253. +115 −0 tests/python/gaiatest/tests/contacts/test_edit_contact.py
  254. +76 −0 tests/python/gaiatest/tests/contacts/test_sms_contact.py
  255. +38 −0 tests/python/gaiatest/tests/manifest.ini
  256. +5 −0 tests/python/gaiatest/tests/marketplace/manifest.ini
  257. +55 −0 tests/python/gaiatest/tests/marketplace/test_marketplace_login.py
  258. +96 −0 tests/python/gaiatest/tests/marketplace/test_search_marketplace_and_install_app.py
  259. +58 −0 tests/python/gaiatest/tests/test_browser_cell_data.py
  260. +58 −0 tests/python/gaiatest/tests/test_browser_wifi.py
  261. +30 −20 tests/python/gaiatest/tests/test_calculator.py
  262. +64 −0 tests/python/gaiatest/tests/test_calendar.py
  263. +90 −0 tests/python/gaiatest/tests/test_call_log.py
  264. +85 −0 tests/python/gaiatest/tests/test_camera.py
  265. +65 −0 tests/python/gaiatest/tests/test_cards_view.py
  266. +92 −0 tests/python/gaiatest/tests/test_clock.py
  267. +96 −0 tests/python/gaiatest/tests/test_dialer.py
  268. +49 −0 tests/python/gaiatest/tests/test_gallery.py
  269. +0 −29 tests/python/gaiatest/tests/test_killall.py
  270. +57 −0 tests/python/gaiatest/tests/test_lockscreen.py
  271. +68 −0 tests/python/gaiatest/tests/test_music.py
  272. +101 −0 tests/python/gaiatest/tests/test_sms.py
  273. +41 −0 tests/python/gaiatest/tests/test_updater.py
  274. +70 −0 tests/python/gaiatest/tests/test_video_player.py
  275. +8 −0 tests/python/gaiatest/tests/unit/manifest.ini
  276. +44 −0 tests/python/gaiatest/tests/unit/test_killall.py
  277. +5 −5 tests/python/gaiatest/tests/{ → unit}/test_launch_entrypoint.py
  278. +13 −0 tests/python/gaiatest/tests/unit/test_lock_screen.py
  279. +59 −0 tests/python/gaiatest/tests/unit/test_settings.py
  280. +18 −0 tests/python/gaiatest/tests/unit/test_wifi.py
  281. +9 −0 tests/python/gaiatest/testvars_template.json
  282. +1 −1 tests/python/setup.py
@@ -16,7 +16,7 @@ window.addEventListener('localized', function showPanel() {
activity = activityRequest;
if (settings && bluetooth &&
(activity.source.name == 'share') &&
- (activity.source.data.filenames != null)) {
+ (activity.source.data.filepaths != null)) {
isBluetoothEnabled();
} else {
var msg = 'Cannot transfer without blobs data!';
@@ -41,6 +41,10 @@ window.addEventListener('localized', function showPanel() {
var deviceCancelButton =
document.getElementById('device-select-button-cancel');
var deviceOkButton = document.getElementById('device-select-button-ok');
+ // Don't let this form accidentally get submitted
+ document.getElementById('select-option-popup').onsubmit =
+ function handleSubmit(e) { e.preventDefault(); };
+
var _debug = false;
function debug(msg) {
@@ -110,7 +114,10 @@ window.addEventListener('localized', function showPanel() {
};
}
- function cancelTransfer() {
+ function cancelTransfer(evt) {
+ if (evt)
+ evt.preventDefault();
+
dialogConfirmBluetooth.hidden = true;
dialogDeviceSelector.hidden = true;
activity.postError('cancelled');
@@ -219,7 +226,7 @@ window.addEventListener('localized', function showPanel() {
evt.target.setAttribute('aria-checked', 'true');
}
- function transferToDevice() {
+ function transferToDevice(evt) {
var selectee =
deviceSelectorContainers.querySelectorAll('[aria-checked="true"]');
deviceSelect.selectedIndex = selectee[0].dataset.optionIndex;
@@ -232,9 +239,9 @@ window.addEventListener('localized', function showPanel() {
// XXX: Bug 811615 - Miss file name when passing file by Web Activity.
// If above issue is fixed,
// we could refine following code to pass blob to API directly.
- var filenames = activity.source.data.filenames;
+ var filepaths = activity.source.data.filepaths;
var storage = navigator.getDeviceStorage('sdcard');
- var getRequest = storage.get(filenames[0]);
+ var getRequest = storage.get(filepaths[0]);
getRequest.onsuccess = function() {
defaultAdapter.sendFile(targetDevice.address, getRequest.result);
@@ -17,17 +17,16 @@
"activities": {
"share": {
"filters": {
+ "number": 1
},
"disposition": "inline",
"returnValue": true,
"href": "/transfer.html"
}
},
"permissions": {
- "settings":{ "access": "readwrite" },
"bluetooth":{},
- "mozBluetooth":{},
- "device-storage:pictures":{ "access": "readwrite" },
- "device-storage:music":{ "access": "readwrite" }
+ "device-storage:sdcard":{ "access": "readonly" },
+ "settings":{ "access": "readwrite" }
}
}
@@ -151,6 +151,22 @@ button.affirmative.active {
height: 100%;
}
+/* The following rules is to override the styles defined in building blocks of value selector */
+#value-selector li {
+ height: auto;
+ padding-bottom: 0px;
+ line-height: 3.9rem;
+}
+
+#value-selector li span {
+ padding: 1rem 2rem 1rem 1.5rem;
+}
+
+#value-selector li input:checked + span,
+#value-selector li[aria-checked="true"] span {
+ background: url("/bb/value_selector/images/icons/checked.png") no-repeat right center border-box transparent;
+}
+
/* 320x480 phones */
@media screen and (width: 320px) {
html {
@@ -65,14 +65,16 @@ <h2 data-l10n-id="top-sites">Top Sites</h2>
</li>
</ul>
</nav>
- <section id="top-sites" role="tabpanel" class="selected">
- </section>
- <section id="bookmarks" role="tabpanel">
- </section>
- <section id="history" role="tabpanel">
- </section>
- <section id="results">
- </section>
+ <div id="tab-panels">
+ <section id="top-sites" role="tabpanel" class="selected">
+ </section>
+ <section id="bookmarks" role="tabpanel">
+ </section>
+ <section id="history" role="tabpanel">
+ </section>
+ <section id="results">
+ </section>
+ </div>
</div>
<div id="crashscreen">
@@ -63,9 +63,7 @@ var Browser = {
this.urlInput.addEventListener('mouseup', this.urlMouseUp.bind(this));
this.urlInput.addEventListener('keyup',
this.handleUrlInputKeypress.bind(this));
- this.topSites.addEventListener('click', this.followLink.bind(this));
- this.bookmarks.addEventListener('click', this.followLink.bind(this));
- this.history.addEventListener('click', this.followLink.bind(this));
+ this.tabPanels.addEventListener('click', this.followLink.bind(this));
this.urlButton.addEventListener('click',
this.handleUrlFormSubmit.bind(this));
this.tabsBadge.addEventListener('click',
@@ -169,7 +167,7 @@ var Browser = {
'bookmark-entry-sheet-done', 'bookmark-title', 'bookmark-url',
'bookmark-previous-url', 'bookmark-menu-add-home', 'new-tab-button',
'awesomescreen-cancel-button', 'startscreen', 'top-site-thumbnails',
- 'no-top-sites', 'clear-private-data-button', 'results'];
+ 'no-top-sites', 'clear-private-data-button', 'results', 'tab-panels'];
// Loop and add element with camel style name to Modal Dialog attribute.
elementIDs.forEach(function createElementRef(name) {
@@ -611,7 +611,6 @@ ul[role="tablist"] {
li[role="tab"] {
display: inline;
-
}
li[role="tab"] a {
@@ -626,6 +625,9 @@ li[role="tab"] a {
font-size: 14px;
outline: none;
margin-left: -30px;
+ text-overflow: ellipsis;
+ max-width: calc(33% - 37px);
+ overflow: hidden;
}
li[role="tab"]:first-child a {
@@ -4,18 +4,13 @@
<meta charset="utf-8">
<meta http-equiv="pragma" content="no-cache">
<title>Calendar</title>
- <link rel="stylesheet" type="text/css" href="/style/fonts.css">
<link rel="stylesheet" type="text/css" href="/style/calendar.css">
<link rel="stylesheet" type="text/css" href="/style/ui.css">
<link rel="stylesheet" type="text/css" href="/style/day_views.css">
- <link rel="stylesheet" type="text/css" href="/style/week_view.css">
- <link rel="stylesheet" type="text/css" href="/style/modify_event_view.css">
<link rel="stylesheet" type="text/css" href="/style/forms.css">
- <link rel="stylesheet" type="text/css" href="/style/settings.css">
<link rel="stylesheet" type="text/css" href="/style/overlay.css">
<link rel="stylesheet" type="text/css" href="/style/building_blocks.css" />
-
<!-- localization -->
<link rel="resource" type="application/l10n" href="/locales/locales.ini">
<link rel="resource" type="application/l10n" href="/shared/locales/date.ini">
@@ -43,7 +38,6 @@
<!--- utils -->
<script defer src="/js/presets.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/ordered_map.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/calc.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/template.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/responder.js" type="text/javascript" charset="utf-8"></script>
@@ -53,22 +47,27 @@
<script defer src="/js/timespan.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/time_observer.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/interval_tree.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/overlap.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/input_parser.js" type="text/javascript" charset="utf-8"></script>
-
- <!--- templates -->
- <script defer src="/js/templates/month.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/templates/day.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/templates/week.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/templates/account.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/templates/calendar.js" type="text/javascript" charset="utf-8"></script>
<!--- providers -->
<script defer src="/js/provider/abstract.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/provider/local.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/provider/caldav.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/provider/caldav_pull_events.js" type="text/javascript" charset="utf-8"></script>
+ <!-- It's possible to lazy load these, but we include them here to reduce flickering -->
+ <script defer src="/js/views/calendar_colors.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/views/time_header.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/templates/month.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/templates/day.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/views/month_child.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/utils/ordered_map.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/utils/overlap.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/views/time_parent.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/views/day_based.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/views/month.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/views/day_child.js" type="text/javascript" charset="utf-8"></script>
+ <script defer src="/js/views/months_day.js" type="text/javascript" charset="utf-8"></script>
+
<!--- store -->
<script defer src="/js/store/abstract.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/store/busytime.js" type="text/javascript" charset="utf-8"></script>
@@ -85,24 +84,6 @@
<script defer src="/js/models/calendar.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/models/event.js" type="text/javascript" charset="utf-8"></script>
- <!--- views -->
- <script defer src="/js/views/calendar_colors.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/time_header.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/day_based.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/month_child.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/day_child.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/week_child.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/months_day.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/time_parent.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/month.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/day.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/week.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/settings.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/advanced_settings.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/create_account.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/modify_account.js" type="text/javascript" charset="utf-8"></script>
- <script defer src="/js/views/modify_event.js" type="text/javascript" charset="utf-8"></script>
-
<!-- workers / main / controller -->
<script defer src="/js/worker/manager.js" type="text/javascript" charset="utf-8"></script>
<script defer src="/js/controllers/service.js" type="text/javascript" charset="utf-8"></script>
Oops, something went wrong.

0 comments on commit 1768a81

Please sign in to comment.