Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matefun
Frontend
Commits
1962e505
Commit
1962e505
authored
Feb 21, 2019
by
Franco Pariani
Browse files
Fix
parent
9c8e3b75
Changes
3
Show whitespace changes
Inline
Side-by-side
Frontend Angular 4/src/app/layout/matefun/codemirror/addons/functions_definition_EN.js
View file @
1962e505
...
@@ -349,7 +349,7 @@ var mac = /Mac/.test(navigator.platform);
...
@@ -349,7 +349,7 @@ var mac = /Mac/.test(navigator.platform);
}
}
function
resolveAutoHints
(
cm
,
pos
)
{
function
resolveAutoHints
(
cm
,
pos
)
{
var
helpers
=
cm
.
getHelpers
(
pos
,
"
functionDefinition
"
),
words
var
helpers
=
cm
.
getHelpers
(
pos
,
"
functionDefinition
EN
"
),
words
if
(
helpers
.
length
)
{
if
(
helpers
.
length
)
{
var
resolved
=
function
(
cm
,
callback
,
options
)
{
var
resolved
=
function
(
cm
,
callback
,
options
)
{
var
app
=
applicableHelpers
(
cm
,
helpers
);
var
app
=
applicableHelpers
(
cm
,
helpers
);
...
@@ -374,11 +374,11 @@ var mac = /Mac/.test(navigator.platform);
...
@@ -374,11 +374,11 @@ var mac = /Mac/.test(navigator.platform);
}
}
}
}
CodeMirror
.
registerHelper
(
"
functionDefinition
"
,
"
auto
"
,
{
CodeMirror
.
registerHelper
(
"
functionDefinition
EN
"
,
"
auto
"
,
{
resolve
:
resolveAutoHints
resolve
:
resolveAutoHints
});
});
CodeMirror
.
registerHelper
(
"
functionDefinition
"
,
"
fromList
"
,
function
(
cm
,
options
)
{
CodeMirror
.
registerHelper
(
"
functionDefinition
EN
"
,
"
fromList
"
,
function
(
cm
,
options
)
{
var
cur
=
cm
.
getCursor
(),
token
=
cm
.
getTokenAt
(
cur
)
var
cur
=
cm
.
getCursor
(),
token
=
cm
.
getTokenAt
(
cur
)
var
term
,
from
=
CodeMirror
.
Pos
(
cur
.
line
,
token
.
start
),
to
=
cur
var
term
,
from
=
CodeMirror
.
Pos
(
cur
.
line
,
token
.
start
),
to
=
cur
if
(
token
.
start
<
cur
.
ch
&&
/
\w
/
.
test
(
token
.
string
.
charAt
(
cur
.
ch
-
token
.
start
-
1
)))
{
if
(
token
.
start
<
cur
.
ch
&&
/
\w
/
.
test
(
token
.
string
.
charAt
(
cur
.
ch
-
token
.
start
-
1
)))
{
...
@@ -416,7 +416,7 @@ var mac = /Mac/.test(navigator.platform);
...
@@ -416,7 +416,7 @@ var mac = /Mac/.test(navigator.platform);
// functions definitions
// functions definitions
CodeMirror
.
defineExtension
(
"
functionDefinition
"
,
function
(
filename
,
archivos
,
options
)
{
CodeMirror
.
defineExtension
(
"
functionDefinition
EN
"
,
function
(
filename
,
archivos
,
options
)
{
if
(
options
.
mode
.
name
==
"
matefun-EN
"
){
if
(
options
.
mode
.
name
==
"
matefun-EN
"
){
options
=
parseOptions
(
this
,
this
.
getCursor
(
"
start
"
),
options
);
options
=
parseOptions
(
this
,
this
.
getCursor
(
"
start
"
),
options
);
if
(
this
.
state
.
completionActive
)
this
.
state
.
completionActive
.
close
();
if
(
this
.
state
.
completionActive
)
this
.
state
.
completionActive
.
close
();
...
...
Frontend Angular 4/src/app/layout/matefun/codemirror/addons/functions_definition_ES.js
View file @
1962e505
...
@@ -349,7 +349,7 @@ var mac = /Mac/.test(navigator.platform);
...
@@ -349,7 +349,7 @@ var mac = /Mac/.test(navigator.platform);
}
}
function
resolveAutoHints
(
cm
,
pos
)
{
function
resolveAutoHints
(
cm
,
pos
)
{
var
helpers
=
cm
.
getHelpers
(
pos
,
"
functionDefinition
"
),
words
var
helpers
=
cm
.
getHelpers
(
pos
,
"
functionDefinition
ES
"
),
words
if
(
helpers
.
length
)
{
if
(
helpers
.
length
)
{
var
resolved
=
function
(
cm
,
callback
,
options
)
{
var
resolved
=
function
(
cm
,
callback
,
options
)
{
var
app
=
applicableHelpers
(
cm
,
helpers
);
var
app
=
applicableHelpers
(
cm
,
helpers
);
...
@@ -374,11 +374,11 @@ var mac = /Mac/.test(navigator.platform);
...
@@ -374,11 +374,11 @@ var mac = /Mac/.test(navigator.platform);
}
}
}
}
CodeMirror
.
registerHelper
(
"
functionDefinition
"
,
"
auto
"
,
{
CodeMirror
.
registerHelper
(
"
functionDefinition
ES
"
,
"
auto
"
,
{
resolve
:
resolveAutoHints
resolve
:
resolveAutoHints
});
});
CodeMirror
.
registerHelper
(
"
functionDefinition
"
,
"
fromList
"
,
function
(
cm
,
options
)
{
CodeMirror
.
registerHelper
(
"
functionDefinition
ES
"
,
"
fromList
"
,
function
(
cm
,
options
)
{
var
cur
=
cm
.
getCursor
(),
token
=
cm
.
getTokenAt
(
cur
)
var
cur
=
cm
.
getCursor
(),
token
=
cm
.
getTokenAt
(
cur
)
var
term
,
from
=
CodeMirror
.
Pos
(
cur
.
line
,
token
.
start
),
to
=
cur
var
term
,
from
=
CodeMirror
.
Pos
(
cur
.
line
,
token
.
start
),
to
=
cur
if
(
token
.
start
<
cur
.
ch
&&
/
\w
/
.
test
(
token
.
string
.
charAt
(
cur
.
ch
-
token
.
start
-
1
)))
{
if
(
token
.
start
<
cur
.
ch
&&
/
\w
/
.
test
(
token
.
string
.
charAt
(
cur
.
ch
-
token
.
start
-
1
)))
{
...
@@ -416,7 +416,7 @@ var mac = /Mac/.test(navigator.platform);
...
@@ -416,7 +416,7 @@ var mac = /Mac/.test(navigator.platform);
// functions definitions
// functions definitions
CodeMirror
.
defineExtension
(
"
functionDefinition
"
,
function
(
filename
,
archivos
,
options
)
{
CodeMirror
.
defineExtension
(
"
functionDefinition
ES
"
,
function
(
filename
,
archivos
,
options
)
{
if
(
options
.
mode
.
name
==
"
matefun-ES
"
){
if
(
options
.
mode
.
name
==
"
matefun-ES
"
){
options
=
parseOptions
(
this
,
this
.
getCursor
(
"
start
"
),
options
);
options
=
parseOptions
(
this
,
this
.
getCursor
(
"
start
"
),
options
);
if
(
this
.
state
.
completionActive
)
this
.
state
.
completionActive
.
close
();
if
(
this
.
state
.
completionActive
)
this
.
state
.
completionActive
.
close
();
...
...
Frontend Angular 4/src/app/layout/matefun/matefun.component.ts
View file @
1962e505
...
@@ -462,8 +462,14 @@ export class MateFunComponent {
...
@@ -462,8 +462,14 @@ export class MateFunComponent {
}
}
clickEnEditor
(
event
){
clickEnEditor
(
event
){
if
(
this
.
typingCheck
)
if
(
this
.
typingCheck
){
this
.
codemirror
.
instance
.
functionDefinition
(
this
.
archivo
.
nombre
,
this
.
archivosTree
.
archivos
,
this
.
codemirror
.
instance
.
doc
,
event
);
let
currentSession
=
sessionStorage
.
getItem
(
"
currentUser
"
);
let
langCode
=
currentSession
?
JSON
.
parse
(
currentSession
).
language
:
'
es
'
;
if
(
langCode
==
'
en
'
)
this
.
codemirror
.
instance
.
functionDefinitionEN
(
this
.
archivo
.
nombre
,
this
.
archivosTree
.
archivos
,
this
.
codemirror
.
instance
.
doc
,
event
);
else
if
(
langCode
==
'
es
'
)
this
.
codemirror
.
instance
.
functionDefinitionES
(
this
.
archivo
.
nombre
,
this
.
archivosTree
.
archivos
,
this
.
codemirror
.
instance
.
doc
,
event
);
}
}
}
guardarArchivo
(){
guardarArchivo
(){
...
...
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