Commit Graph
34 Commits
Author SHA1 Message Date
Alfredo Sumaran 4472752595 Merge branch 'master' into issue_14206 2016-04-11 16:45:58 -05:00
Alfredo Sumaran 38a4f5cec6 Rename method and initialize .timeago inside 2016-04-11 16:45:03 -05:00
Alfredo SumaranandJacob Schatz 836301676a Use existence operator instead 2016-04-10 20:03:36 -04:00
Alfredo SumaranandJacob Schatz fe0aa82325 Check existence of variable method
This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.
2016-04-10 20:03:36 -04:00
Alfredo SumaranandJacob Schatz a7c11fe473 Ignore toggling sidebar for above 1200px resolution 2016-04-10 20:03:36 -04:00
Alfredo Sumaran 3440c0e61f Update datetime in .timeago elements
This should be done before .timeago() is called on the element
2016-04-07 12:02:43 -05:00
Robert Speicher 423e006840 Expand the issuable sidebar when coming back from the Changes tab
Unless the user explicitly requested the collapsed sidebar.
2016-03-17 21:24:17 -04:00
Phil Hughes bd411675d2 Fixes issue with issue sidebar toggle button not working
Closes #14195
2016-03-10 17:34:06 +00:00
Jacob Schatz 9afab2963c Only save right sidebar position cookie if user did the collapsing. 2016-03-04 14:31:33 -05:00
Alfredo Sumaran 9f2eb025d3 Apply nice date when diff page loads 2016-02-29 10:50:35 -05:00
Alfredo Sumaran ccabbaa9b3 Wait until listeners are set before triggering a 'click' event 2016-02-24 15:53:39 -05:00
Alfredo Sumaran 4d23af7507 Move script inside of MergeRequestTabs class 2016-02-24 15:39:56 -05:00
Alfredo Sumaran cd569a66ef Update button selector 2016-02-19 20:01:30 -05:00
Alfredo Sumaran 9a60bd54a5 Change method name for consistency 2016-02-19 16:34:20 -05:00
Alfredo Sumaran 27a0310f23 Make diff view name getter less error prone 2016-02-19 16:32:29 -05:00
Alfredo Sumaran ebceae3ead Add comment 2016-02-19 12:55:13 -05:00
Alfredo Sumaran 8dc78c6685 Expand view container if diff mode is set to paralells 2016-02-18 16:15:50 -05:00
Dmitriy Zaporozhets 3238b0bc9f Replace nav-tabs with nav-links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-13 17:13:36 +01:00
Douglas Barbosa Alexandre 9d6e5f0a28 Make selectors more specific when scroll to element 2015-12-10 15:42:00 -02:00
Douglas Barbosa Alexandre 67913670dc Make selectors more specific when setting the tab content
Reason: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2023
2015-12-10 13:50:31 -02:00
Douglas Barbosa Alexandre 0c54c9a8a3 USe innerHtml to avoid slow performance on a MR with very large diff 2015-12-10 13:42:10 -02:00
Douglas Barbosa Alexandre 05f06955ba Ensure existing notes are highlighted properly on a merge request diff 2015-12-09 12:16:54 -02:00
Douwe Maan 23b6a98de0 Move Builds tab to the end 2015-12-08 22:28:28 +01:00
Douwe Maan 1567572e79 Add Builds tab to MR detail page 2015-12-08 13:11:41 +01:00
Robert Speicher fc0d92746d Prevent a JS error in MergeRequestTabs
When `window.location.hash` is pointing to a note, e.g. `#note_1234`,
`scrollToElement` would throw an error because a selector such as
`.commits #note_1234` doesn't exist, so `offset()` returned `undefined`.

This error would prevent subsequent calls from running, which caused the
loading spinner to never be hidden.

Now we ensure the selector returns a valid element before trying to
scroll to it.
2015-10-14 15:01:25 -04:00
Robert Speicher 29fe488b0c Make the loading spinner toggle more explicit
Occasionally the loading spinner would stay visible after the tab
finished loading. This change makes the toggle explicit so that it's
always shown on `beforeSend`, and always hidden on `complete`.

Plus a bonus semi-colon eradication! 💥
2015-10-08 20:53:29 -04:00
Valery Sizov 31330e4a3c Fix anchors to comments in diffs 2015-10-05 14:00:41 +03:00
Stan Hu ae3f869fd1 Fix the "Reload with full diff" URL button
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to diff.json.

Closes #2041
2015-07-23 12:53:54 -07:00
Dmitriy Zaporozhets 9860ab0f22 Remove sticky-diff functionality
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-06 11:34:37 +02:00
Robert Speicher d2b5c3f6ce Trigger sticky_kit:recalc when diffs are pre-loaded 2015-06-25 21:26:20 -04:00
Robert Speicher 4e7f23fe0b Reorder MergeRequestTabs constructor
The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.

Fixes #1887
2015-06-25 18:33:24 -04:00
Robert Speicher e17020b907 Add MergeRequestTabs specs 2015-06-21 22:57:32 -04:00
Robert Speicher 8e72c65cda Minor style fixes in MergeRequestTabs 2015-06-21 18:57:04 -04:00
Robert Speicher ce20400628 Extract MergeRequest tab behavior to its own JS class 2015-06-17 16:59:50 -04:00