Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
b356997a
Commit
b356997a
authored
Oct 12, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove global export except in test environments
parent
9fd89990
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
60 additions
and
56 deletions
+60
-56
app/assets/javascripts/behaviors/copy_as_gfm.js
app/assets/javascripts/behaviors/copy_as_gfm.js
+9
-4
app/assets/javascripts/behaviors/index.js
app/assets/javascripts/behaviors/index.js
+2
-1
spec/features/copy_as_gfm_spec.rb
spec/features/copy_as_gfm_spec.rb
+2
-2
spec/javascripts/behaviors/copy_as_gfm_spec.js
spec/javascripts/behaviors/copy_as_gfm_spec.js
+47
-0
spec/javascripts/copy_as_gfm_spec.js
spec/javascripts/copy_as_gfm_spec.js
+0
-49
No files found.
app/assets/javascripts/behaviors/copy_as_gfm.js
View file @
b356997a
...
@@ -285,7 +285,7 @@ const gfmRules = {
...
@@ -285,7 +285,7 @@ const gfmRules = {
},
},
};
};
class
CopyAsGFM
{
export
class
CopyAsGFM
{
constructor
()
{
constructor
()
{
$
(
document
).
on
(
'
copy
'
,
'
.md, .wiki
'
,
(
e
)
=>
{
CopyAsGFM
.
copyAsGFM
(
e
,
CopyAsGFM
.
transformGFMSelection
);
});
$
(
document
).
on
(
'
copy
'
,
'
.md, .wiki
'
,
(
e
)
=>
{
CopyAsGFM
.
copyAsGFM
(
e
,
CopyAsGFM
.
transformGFMSelection
);
});
$
(
document
).
on
(
'
copy
'
,
'
pre.code.highlight, .diff-content .line_content
'
,
(
e
)
=>
{
CopyAsGFM
.
copyAsGFM
(
e
,
CopyAsGFM
.
transformCodeSelection
);
});
$
(
document
).
on
(
'
copy
'
,
'
pre.code.highlight, .diff-content .line_content
'
,
(
e
)
=>
{
CopyAsGFM
.
copyAsGFM
(
e
,
CopyAsGFM
.
transformCodeSelection
);
});
...
@@ -470,7 +470,12 @@ class CopyAsGFM {
...
@@ -470,7 +470,12 @@ class CopyAsGFM {
}
}
}
}
window
.
gl
=
window
.
gl
||
{};
// Export CopyAsGFM as a global for rspec to access
window
.
gl
.
CopyAsGFM
=
CopyAsGFM
;
// see /spec/features/copy_as_gfm_spec.rb
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
window
.
CopyAsGFM
=
CopyAsGFM
;
}
new
CopyAsGFM
();
export
default
function
initCopyAsGFM
()
{
return
new
CopyAsGFM
();
}
app/assets/javascripts/behaviors/index.js
View file @
b356997a
import
'
./autosize
'
;
import
'
./autosize
'
;
import
'
./bind_in_out
'
;
import
'
./bind_in_out
'
;
import
'
./copy_as_gfm
'
;
import
initCopyAsGFM
from
'
./copy_as_gfm
'
;
import
'
./details_behavior
'
;
import
'
./details_behavior
'
;
import
installGlEmojiElement
from
'
./gl_emoji
'
;
import
installGlEmojiElement
from
'
./gl_emoji
'
;
import
'
./quick_submit
'
;
import
'
./quick_submit
'
;
...
@@ -8,3 +8,4 @@ import './requires_input';
...
@@ -8,3 +8,4 @@ import './requires_input';
import
'
./toggler_behavior
'
;
import
'
./toggler_behavior
'
;
installGlEmojiElement
();
installGlEmojiElement
();
initCopyAsGFM
();
spec/features/copy_as_gfm_spec.rb
View file @
b356997a
...
@@ -664,7 +664,7 @@ describe 'Copy as GFM', :js do
...
@@ -664,7 +664,7 @@ describe 'Copy as GFM', :js do
def
html_to_gfm
(
html
,
transformer
=
'transformGFMSelection'
,
target:
nil
)
def
html_to_gfm
(
html
,
transformer
=
'transformGFMSelection'
,
target:
nil
)
js
=
<<-
JS
.
strip_heredoc
js
=
<<-
JS
.
strip_heredoc
(function(html) {
(function(html) {
var transformer = window.
gl.
CopyAsGFM[
#{
transformer
.
inspect
}
];
var transformer = window.CopyAsGFM[
#{
transformer
.
inspect
}
];
var node = document.createElement('div');
var node = document.createElement('div');
$(html).each(function() { node.appendChild(this) });
$(html).each(function() { node.appendChild(this) });
...
@@ -678,7 +678,7 @@ describe 'Copy as GFM', :js do
...
@@ -678,7 +678,7 @@ describe 'Copy as GFM', :js do
node = transformer(node, target);
node = transformer(node, target);
if (!node) return null;
if (!node) return null;
return window.
gl.
CopyAsGFM.nodeToGFM(node);
return window.CopyAsGFM.nodeToGFM(node);
})("
#{
escape_javascript
(
html
)
}
")
})("
#{
escape_javascript
(
html
)
}
")
JS
JS
page
.
evaluate_script
(
js
)
page
.
evaluate_script
(
js
)
...
...
spec/javascripts/behaviors/copy_as_gfm_spec.js
0 → 100644
View file @
b356997a
import
{
CopyAsGFM
}
from
'
~/behaviors/copy_as_gfm
'
;
describe
(
'
CopyAsGFM
'
,
()
=>
{
describe
(
'
CopyAsGFM.pasteGFM
'
,
()
=>
{
function
callPasteGFM
()
{
const
e
=
{
originalEvent
:
{
clipboardData
:
{
getData
(
mimeType
)
{
// When GFM code is copied, we put the regular plain text
// on the clipboard as `text/plain`, and the GFM as `text/x-gfm`.
// This emulates the behavior of `getData` with that data.
if
(
mimeType
===
'
text/plain
'
)
{
return
'
code
'
;
}
if
(
mimeType
===
'
text/x-gfm
'
)
{
return
'
`code`
'
;
}
return
null
;
},
},
},
preventDefault
()
{},
};
CopyAsGFM
.
pasteGFM
(
e
);
}
it
(
'
wraps pasted code when not already in code tags
'
,
()
=>
{
spyOn
(
window
.
gl
.
utils
,
'
insertText
'
).
and
.
callFake
((
el
,
textFunc
)
=>
{
const
insertedText
=
textFunc
(
'
This is code:
'
,
''
);
expect
(
insertedText
).
toEqual
(
'
`code`
'
);
});
callPasteGFM
();
});
it
(
'
does not wrap pasted code when already in code tags
'
,
()
=>
{
spyOn
(
window
.
gl
.
utils
,
'
insertText
'
).
and
.
callFake
((
el
,
textFunc
)
=>
{
const
insertedText
=
textFunc
(
'
This is code: `
'
,
'
`
'
);
expect
(
insertedText
).
toEqual
(
'
code
'
);
});
callPasteGFM
();
});
});
});
spec/javascripts/copy_as_gfm_spec.js
deleted
100644 → 0
View file @
9fd89990
import
'
~/copy_as_gfm
'
;
(()
=>
{
describe
(
'
gl.CopyAsGFM
'
,
()
=>
{
describe
(
'
gl.CopyAsGFM.pasteGFM
'
,
()
=>
{
function
callPasteGFM
()
{
const
e
=
{
originalEvent
:
{
clipboardData
:
{
getData
(
mimeType
)
{
// When GFM code is copied, we put the regular plain text
// on the clipboard as `text/plain`, and the GFM as `text/x-gfm`.
// This emulates the behavior of `getData` with that data.
if
(
mimeType
===
'
text/plain
'
)
{
return
'
code
'
;
}
if
(
mimeType
===
'
text/x-gfm
'
)
{
return
'
`code`
'
;
}
return
null
;
},
},
},
preventDefault
()
{},
};
window
.
gl
.
CopyAsGFM
.
pasteGFM
(
e
);
}
it
(
'
wraps pasted code when not already in code tags
'
,
()
=>
{
spyOn
(
window
.
gl
.
utils
,
'
insertText
'
).
and
.
callFake
((
el
,
textFunc
)
=>
{
const
insertedText
=
textFunc
(
'
This is code:
'
,
''
);
expect
(
insertedText
).
toEqual
(
'
`code`
'
);
});
callPasteGFM
();
});
it
(
'
does not wrap pasted code when already in code tags
'
,
()
=>
{
spyOn
(
window
.
gl
.
utils
,
'
insertText
'
).
and
.
callFake
((
el
,
textFunc
)
=>
{
const
insertedText
=
textFunc
(
'
This is code: `
'
,
'
`
'
);
expect
(
insertedText
).
toEqual
(
'
code
'
);
});
callPasteGFM
();
});
});
});
})();
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment