mirror of
https://bitbucket.org/wisemapping/wisemapping-frontend.git
synced 2024-11-15 19:47:57 +01:00
Merged in feature/remove_actions (pull request #45)
Remove actions in toobar when user is not owner. * Fix eslit errors
This commit is contained in:
parent
be638eb7ed
commit
a9b6a7ac13
@ -120,15 +120,13 @@ export default function Toolbar({
|
|||||||
>
|
>
|
||||||
<img src={ExportSvg} />
|
<img src={ExportSvg} />
|
||||||
</ToolbarButton>
|
</ToolbarButton>
|
||||||
{(editorMode === 'edition-owner' || editorMode === 'edition-editor' || editorMode === 'edition-viewer') && (
|
<ToolbarButton
|
||||||
<ToolbarButton
|
id="print"
|
||||||
id="print"
|
className="buttonOn"
|
||||||
className="buttonOn"
|
onClick={() => onAction('print')}
|
||||||
onClick={() => onAction('print')}
|
>
|
||||||
>
|
<img src={PrintSvg} />
|
||||||
<img src={PrintSvg} />
|
</ToolbarButton>
|
||||||
</ToolbarButton>
|
|
||||||
)}
|
|
||||||
{editorMode === 'edition-owner' && (
|
{editorMode === 'edition-owner' && (
|
||||||
<>
|
<>
|
||||||
<ToolbarButton
|
<ToolbarButton
|
||||||
@ -148,9 +146,9 @@ export default function Toolbar({
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{(editorMode === 'edition-owner' || editorMode === 'edition-editor') && (
|
{(editorMode === 'edition-owner' || editorMode === 'edition-editor') && (
|
||||||
<ToolbarButton id="account">
|
<ToolbarButton id="account">
|
||||||
<img src={AccountSvg} />
|
<img src={AccountSvg} />
|
||||||
</ToolbarButton>
|
</ToolbarButton>
|
||||||
)}
|
)}
|
||||||
{editorMode === 'edition-owner' && (
|
{editorMode === 'edition-owner' && (
|
||||||
<ActionButton onClick={() => onAction('share')}>
|
<ActionButton onClick={() => onAction('share')}>
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
type EditorRenderMode = 'viewonly' | 'edition-owner' | 'edition-editor' | 'edition-viewer' | 'showcase';
|
type EditorRenderMode = 'viewonly' | 'edition-owner' | 'edition-editor' | 'showcase';
|
||||||
export default EditorRenderMode;
|
export default EditorRenderMode;
|
||||||
|
@ -707,11 +707,10 @@ abstract class Topic extends NodeGraph {
|
|||||||
// Do some fancy animation ....
|
// Do some fancy animation ....
|
||||||
const elements = this._flatten2DElements(this);
|
const elements = this._flatten2DElements(this);
|
||||||
elements.forEach((elem) => {
|
elements.forEach((elem) => {
|
||||||
elem.setVisibility(!value, 250)
|
elem.setVisibility(!value, 250);
|
||||||
});
|
});
|
||||||
|
|
||||||
EventBus.instance.fireEvent('childShrinked', model);
|
EventBus.instance.fireEvent('childShrinked', model);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getShrinkConnector(): ShirinkConnector | undefined {
|
getShrinkConnector(): ShirinkConnector | undefined {
|
||||||
@ -903,7 +902,6 @@ abstract class Topic extends NodeGraph {
|
|||||||
current.setVisibility(value);
|
current.setVisibility(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** */
|
|
||||||
setVisibility(value: boolean, fade = 0): void {
|
setVisibility(value: boolean, fade = 0): void {
|
||||||
this._setTopicVisibility(value, fade);
|
this._setTopicVisibility(value, fade);
|
||||||
|
|
||||||
@ -960,8 +958,9 @@ abstract class Topic extends NodeGraph {
|
|||||||
relationship.setVisibility(
|
relationship.setVisibility(
|
||||||
value
|
value
|
||||||
&& (targetParent == null || !targetParent.areChildrenShrunken())
|
&& (targetParent == null || !targetParent.areChildrenShrunken())
|
||||||
&& (sourceParent == null || !sourceParent.areChildrenShrunken())
|
&& (sourceParent == null || !sourceParent.areChildrenShrunken()),
|
||||||
, fade);
|
fade,
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,9 +15,9 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
import RootedTreeSet from "./RootedTreeSet";
|
import RootedTreeSet from './RootedTreeSet';
|
||||||
import Node from './Node';
|
import Node from './Node';
|
||||||
import PositionType from "../PositionType";
|
import PositionType from '../PositionType';
|
||||||
|
|
||||||
abstract class ChildrenSorterStrategy {
|
abstract class ChildrenSorterStrategy {
|
||||||
abstract computeChildrenIdByHeights(treeSet: RootedTreeSet, node: Node);
|
abstract computeChildrenIdByHeights(treeSet: RootedTreeSet, node: Node);
|
||||||
|
Loading…
Reference in New Issue
Block a user