Skip to content

Commit

Permalink
Merge pull request #2680 from owncloud/bugfix/no-checkbox-label-in-fi…
Browse files Browse the repository at this point in the history
…les-list

Bugfix/no checkbox label in files list
  • Loading branch information
DeepDiver1975 committed Dec 12, 2019
2 parents 98d0f5f + 65ee1fb commit 502aa9e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions apps/files/src/components/FileList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<thead>
<oc-table-row>
<oc-table-cell shrink type="head">
<oc-checkbox class="uk-margin-small-left" id="filelist-check-all" labelVisuallyHidden="true" :label="labelSelectAllItems" @click.native="toggleAll" :value="selectedAll" />
<oc-checkbox class="uk-margin-small-left" id="filelist-check-all" :hideLabel="true" :label="labelSelectAllItems" @click.native="toggleAll" :value="selectedAll" />
</oc-table-cell>
<slot name="headerColumns"/>
<oc-table-cell shrink type="head" :class="{ 'uk-visible@s' : compactMode }" v-translate>Actions</oc-table-cell>
Expand All @@ -15,7 +15,7 @@
<oc-table-group>
<oc-table-row v-for="(item, index) in fileData" :key="index" :class="_rowClasses(item)" @click="selectRow(item, $event)" :id="'file-row-' + item.id">
<oc-table-cell>
<oc-checkbox class="uk-margin-small-left" @click.stop @change.native="toggleFileSelect(item)" :value="selectedFiles.indexOf(item) >= 0" :label="labelSelectSingleItem(item)"/>
<oc-checkbox :hideLabel="true" class="uk-margin-small-left" @click.stop @change.native="toggleFileSelect(item)" :value="selectedFiles.indexOf(item) >= 0" :label="labelSelectSingleItem(item)"/>
</oc-table-cell>
<slot name="rowColumns" :item="item" :index="index" />
<oc-table-cell :class="{ 'uk-visible@s' : compactMode }" class="uk-position-relative">
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/components/Trashbin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<oc-table-group>
<oc-table-row>
<oc-table-cell shrink type="head">
<oc-checkbox class="uk-margin-small-left" id="filelist-check-all" @click.native="$_ocTrashbin_toggleAll" :value="all" />
<oc-checkbox :hideLabel="true" class="uk-margin-small-left" id="filelist-check-all" @click.native="$_ocTrashbin_toggleAll" :value="all" />
</oc-table-cell>
<oc-table-cell type="head" class="uk-text-nowrap" v-translate>Name</oc-table-cell>
<oc-table-cell shrink type="head" class="uk-text-nowrap uk-visible@m" v-translate>Deletion Time</oc-table-cell>
Expand All @@ -14,7 +14,7 @@
<oc-table-group>
<oc-table-row v-for="(item, index) in fileData" :key="index" class="file-row">
<oc-table-cell>
<oc-checkbox class="uk-margin-small-left" @change.native="$_ocTrashbin_toggleFileSelect(item)" :value="selectedFiles.indexOf(item) >= 0" />
<oc-checkbox :hideLabel="true" class="uk-margin-small-left" @change.native="$_ocTrashbin_toggleFileSelect(item)" :value="selectedFiles.indexOf(item) >= 0" />
</oc-table-cell>
<oc-table-cell class="uk-text-truncate">
<oc-file :name="$_ocTrashbin_fileName(item)" :extension="item.extension" class="file-row-name"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"node-fetch": "^2.6.0",
"npm-run-all": "^4.1.5",
"oidc-client": "^1.9.1",
"owncloud-design-system": "^1.0.0-1030",
"owncloud-design-system": "^1.0.0-1041",
"owncloud-sdk": "^1.0.0-368",
"p-limit": "^2.2.1",
"parse-json": "^5.0.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6440,10 +6440,10 @@ osenv@^0.1.4:
os-homedir "^1.0.0"
os-tmpdir "^1.0.0"

owncloud-design-system@^1.0.0-1030:
version "1.0.0-1030"
resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-1.0.0-1030.tgz#fd61d2e2d3c5caf2e453ae320f1737263949a8ac"
integrity sha512-jjQBk/FnsG0JmRJmut4mFP7CTh2s2uOVE81wCYCwQP11JwCusR+1/75fECJUZR2Q2GXLD6ytd/VvaSA9XhyFWA==
owncloud-design-system@^1.0.0-1041:
version "1.0.0-1041"
resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-1.0.0-1041.tgz#039ba19420ec5055f6436e361c5ad49cd82db1e4"
integrity sha512-lpzBaGK71FgXintVw9B39mo1EcM10pa2dUS+LUTHp9P3rIWbipkydnahYQXPGM0Mkw7KQoq0jjGLVZWAwB16iw==
dependencies:
lodash "^4.17.11"
mini-css-extract-plugin "^0.7.0"
Expand Down

0 comments on commit 502aa9e

Please sign in to comment.