Browse Source

fix: update regex with lookbehind to support safari

re #799

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/805/head
Pranav C 3 years ago
parent
commit
eabdfc7825
  1. 2
      packages/nc-gui/components/templates/editor.vue
  2. 39
      packages/nc-gui/pages/project/index.js.vue
  3. 1
      packages/nc-gui/pages/project/templates/_id.vue

2
packages/nc-gui/components/templates/editor.vue

@ -833,7 +833,7 @@ export default {
return return
} }
// todo: fix // todo: fix
const re = /(?<=^|,\s*)(\w+)(?:\(((\w+)(?:\s*,\s*\w+)?)?\)){0,1}(?=\s*,|\s*$)/g const re = /(?:^|,\s*)(\w+)(?:\(((\w+)(?:\s*,\s*\w+)?)?\)){0,1}(?=\s*,|\s*$)/g
let m let m
// eslint-disable-next-line no-cond-assign // eslint-disable-next-line no-cond-assign
while (m = re.exec(this.tableNamesInput)) { while (m = re.exec(this.tableNamesInput)) {

39
packages/nc-gui/pages/project/index.js.vue

@ -1,39 +0,0 @@
<template>
<create-or-edit-project />
</template>
<script>
import CreateOrEditProject from '@/components/createOrEditProject'
export default {
name: 'index.js',
components: { CreateOrEditProject }
}
</script>
<style scoped>
</style>
<!--
/**
* @copyright Copyright (c) 2021, Xgene Cloud Ltd
*
* @author Naveen MR <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-->

1
packages/nc-gui/pages/project/templates/_id.vue

@ -5,7 +5,6 @@
<script> <script>
import ProjectTemplate from '~/components/templates/detailed' import ProjectTemplate from '~/components/templates/detailed'
export default { export default {
name: '_id.vue',
components: { ProjectTemplate } components: { ProjectTemplate }
} }
</script> </script>

Loading…
Cancel
Save