diff --git a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu4WxKOzY.woff2 b/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu4WxKOzY.woff2 deleted file mode 100644 index fa0d664..0000000 Binary files a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu4WxKOzY.woff2 and /dev/null differ diff --git a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu5mxKOzY.woff2 b/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu5mxKOzY.woff2 deleted file mode 100644 index f1b8ed7..0000000 Binary files a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu5mxKOzY.woff2 and /dev/null differ diff --git a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu72xKOzY.woff2 b/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu72xKOzY.woff2 deleted file mode 100644 index c6d7d06..0000000 Binary files a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu72xKOzY.woff2 and /dev/null differ diff --git a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu7GxKOzY.woff2 b/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu7GxKOzY.woff2 deleted file mode 100644 index e2f7d27..0000000 Binary files a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu7GxKOzY.woff2 and /dev/null differ diff --git a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu7WxKOzY.woff2 b/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu7WxKOzY.woff2 deleted file mode 100644 index d5ca3ce..0000000 Binary files a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu7WxKOzY.woff2 and /dev/null differ diff --git a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu7mxKOzY.woff2 b/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu7mxKOzY.woff2 deleted file mode 100644 index f8b68e3..0000000 Binary files a/css/thirdparty/fonts/KFOmCnqEu92Fr1Mu7mxKOzY.woff2 and /dev/null differ diff --git a/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUJiZTaR.woff2 b/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUJiZTaR.woff2 deleted file mode 100644 index d2964a0..0000000 Binary files a/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUJiZTaR.woff2 and /dev/null differ diff --git a/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUhiZTaR.woff2 b/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUhiZTaR.woff2 deleted file mode 100644 index d0f4f58..0000000 Binary files a/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUhiZTaR.woff2 and /dev/null differ diff --git a/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUliZTaR.woff2 b/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUliZTaR.woff2 deleted file mode 100644 index 0dbd026..0000000 Binary files a/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUliZTaR.woff2 and /dev/null differ diff --git a/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUtiZTaR.woff2 b/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUtiZTaR.woff2 deleted file mode 100644 index 05382d5..0000000 Binary files a/css/thirdparty/fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUtiZTaR.woff2 and /dev/null differ diff --git a/css/thirdparty/oswald-css.css b/css/thirdparty/oswald-css.css index bd4ac69..6d4799c 100644 --- a/css/thirdparty/oswald-css.css +++ b/css/thirdparty/oswald-css.css @@ -1,35 +1,4 @@ /* cyrillic-ext */ -@font-face { - font-family: 'Oswald'; - font-style: normal; - font-weight: 400; - src: url('fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUtiZTaR.woff2') format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Oswald'; - font-style: normal; - font-weight: 400; - src: url('fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUJiZTaR.woff2') format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Oswald'; - font-style: normal; - font-weight: 400; - src: url('fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUliZTaR.woff2') format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Oswald'; - font-style: normal; - font-weight: 400; - src: url('fonts/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUhiZTaR.woff2') format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} /* latin */ @font-face { font-family: 'Oswald'; diff --git a/css/thirdparty/roboto-css.css b/css/thirdparty/roboto-css.css index 5dfaffb..9fea8d2 100644 --- a/css/thirdparty/roboto-css.css +++ b/css/thirdparty/roboto-css.css @@ -1,51 +1,4 @@ /* cyrillic-ext */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: url('fonts/KFOmCnqEu92Fr1Mu72xKOzY.woff2') format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: url('fonts/KFOmCnqEu92Fr1Mu5mxKOzY.woff2') format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* greek-ext */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: url('fonts/KFOmCnqEu92Fr1Mu7mxKOzY.woff2') format('woff2'); - unicode-range: U+1F00-1FFF; -} -/* greek */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: url('fonts/KFOmCnqEu92Fr1Mu4WxKOzY.woff2') format('woff2'); - unicode-range: U+0370-03FF; -} -/* vietnamese */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: url('fonts/KFOmCnqEu92Fr1Mu7WxKOzY.woff2') format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: url('fonts/KFOmCnqEu92Fr1Mu7GxKOzY.woff2') format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} /* latin */ @font-face { font-family: 'Roboto'; @@ -54,4 +7,3 @@ src: url('fonts/KFOmCnqEu92Fr1Mu4mxK.woff2') format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } - diff --git a/js/networkgraph/mynetwork.js b/js/networkgraph/mynetwork.js index 58ed0ce..6b26c90 100644 --- a/js/networkgraph/mynetwork.js +++ b/js/networkgraph/mynetwork.js @@ -1046,7 +1046,7 @@ function draw(isImport) { copyDetails = selectedEdges[selectedEdges.length - 1]; if (copyDetails.component_type != edgeDetails.component_type) { - showMessage(alertType.Error, 'Please select same type of fiber'); + showMessage(alertType.Error, 'Please select same type of element (Fiber)'); return; } else { @@ -1085,7 +1085,7 @@ function draw(isImport) { }); if (hEdges.length > 0) { - showMessage(alertType.Error, 'Please select same type of fiber'); + showMessage(alertType.Error, 'Please select same type of element (Fiber)'); return; } @@ -1392,45 +1392,50 @@ function draw(isImport) { if (isCopyPara) { if (sNodes.length > 0) copyDetails = network.body.data.nodes.get(sNodes[sNodes.length - 1].id); - else - copyDetails = network.body.data.nodes.get(nodeDatas.id); + else { + if(nodeDatas) + copyDetails = network.body.data.nodes.get(nodeDatas.id); + } + } else copyDetails = network.body.data.nodes.get(sNodes[0].id); - type_name = copyDetails.node_type; - if (copyDetails.node_type == amplifierJSON.node_type) { - if (copyDetails.amp_category == ramanampJSON.amp_category) - type_name = 'Raman Amplifier'; - else - type_name = copyDetails.amp_category; - } - else if (copyDetails.node_type == roadmJSON.node_type) - type_name = copyDetails.node_type.toUpperCase(); - else if (copyDetails.node_type == fusedJSON.node_type) - type_name = "Attenuator"; + if (copyDetails) { + + type_name = copyDetails.node_type; + if (copyDetails.node_type == amplifierJSON.node_type) { + if (copyDetails.amp_category == ramanampJSON.amp_category) + type_name = 'Raman Amplifier'; + else + type_name = copyDetails.amp_category; + } + else if (copyDetails.node_type == roadmJSON.node_type) + type_name = copyDetails.node_type.toUpperCase(); + else if (copyDetails.node_type == fusedJSON.node_type) + type_name = "Attenuator"; - if (type != copyDetails.node_type) { + if (type != copyDetails.node_type) { - showMessage(alertType.Error, 'Please select same type of node (' + type_name + ')'); - return; - } - else { - if (type == copyDetails.node_type) { + showMessage(alertType.Error, 'Please select same type of node (' + type_name + ')'); + return; + } + else { + if (type == copyDetails.node_type) { - if (type == amplifierJSON.node_type && copyDetails.node_type == amplifierJSON.node_type) { - if (amp_category != copyDetails.amp_category) { - showMessage(alertType.Error, 'Please select same type of node (' + type_name + ')'); - return; + if (type == amplifierJSON.node_type && copyDetails.node_type == amplifierJSON.node_type) { + if (amp_category != copyDetails.amp_category) { + showMessage(alertType.Error, 'Please select same type of node (' + type_name + ')'); + return; + } } + + $('#toast').toast('hide'); + } - - $('#toast').toast('hide'); - } } - } @@ -1441,7 +1446,7 @@ function draw(isImport) { copyDetails = network.body.data.edges.get(edgeDatas.id); if (type != copyDetails.component_type) { - showMessage(alertType.Error, 'Please select same type of fiber'); + showMessage(alertType.Error, 'Please select same type of element (Fiber)'); return; } else { @@ -1454,7 +1459,7 @@ function draw(isImport) { if (nodeDatas != undefined) { } - if (edgeDatas != undefined) { + if (!nodeDatas && edgeDatas != undefined) { network.body.data.edges.update({ id: edgeDatas.id, shadow: singleFiberJSON.options.shadow, is_highlight: true });