From d7c74e289e34ed872ea38d426d071428bd81b955 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Fri, 2 Nov 2012 02:04:22 -0300 Subject: [PATCH] Try to detect delete node error on close. --- .../main/javascript/MultilineTextEditor.js | 8 +- .../src/test/resources/data/wisemaps/bug2.mmr | 38 + .../data/wisemaps/{bug2.xml => bug2.wxml} | 0 .../src/test/resources/data/wisemaps/bug3.mmr | 790 ++++++++++++++++++ .../test/resources/data/wisemaps/bug3.wxml | 39 + 5 files changed, 873 insertions(+), 2 deletions(-) create mode 100644 wise-webapp/src/test/resources/data/wisemaps/bug2.mmr rename wise-webapp/src/test/resources/data/wisemaps/{bug2.xml => bug2.wxml} (100%) create mode 100644 wise-webapp/src/test/resources/data/wisemaps/bug3.mmr create mode 100644 wise-webapp/src/test/resources/data/wisemaps/bug3.wxml diff --git a/mindplot/src/main/javascript/MultilineTextEditor.js b/mindplot/src/main/javascript/MultilineTextEditor.js index b1b730c9..71f1f333 100644 --- a/mindplot/src/main/javascript/MultilineTextEditor.js +++ b/mindplot/src/main/javascript/MultilineTextEditor.js @@ -157,6 +157,10 @@ mindplot.MultilineTextEditor = new Class({ }, show:function (topic, text) { + // Close a previous node editor if it's opened ... + if (this._topic) { + this.close(false); + } this._topic = topic; if (!this.isVisible()) { @@ -272,7 +276,7 @@ mindplot.MultilineTextEditor = new Class({ }, close:function (update) { - if (this.isVisible()) { + if (this.isVisible() && this._topic) { // Update changes ... clearTimeout(this._timeoutId); @@ -286,9 +290,9 @@ mindplot.MultilineTextEditor = new Class({ // Remove it form the screen ... this._containerElem.dispose(); this._containerElem = null; - this._topic = null; this._timeoutId = -1; } + this._topic = null; } }); diff --git a/wise-webapp/src/test/resources/data/wisemaps/bug2.mmr b/wise-webapp/src/test/resources/data/wisemaps/bug2.mmr new file mode 100644 index 00000000..9f5c2212 --- /dev/null +++ b/wise-webapp/src/test/resources/data/wisemaps/bug2.mmr @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wise-webapp/src/test/resources/data/wisemaps/bug2.xml b/wise-webapp/src/test/resources/data/wisemaps/bug2.wxml similarity index 100% rename from wise-webapp/src/test/resources/data/wisemaps/bug2.xml rename to wise-webapp/src/test/resources/data/wisemaps/bug2.wxml diff --git a/wise-webapp/src/test/resources/data/wisemaps/bug3.mmr b/wise-webapp/src/test/resources/data/wisemaps/bug3.mmr new file mode 100644 index 00000000..fd2e1044 --- /dev/null +++ b/wise-webapp/src/test/resources/data/wisemaps/bug3.mmr @@ -0,0 +1,790 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +

Firm's turnover from (new to firm)

+

product innovation (as a pecentage of total turnover)

+ + +
+ +
+ + + + + +

Increase in the probability to innovate linked to ICT use

+

(in product innovation, process innovation, organisational innovaton, marketing innovation)

+ + +
+
+ + + + + +

Scientific articles by type of collaboration (per capita)

+

(international co-authoriship, domestic co-authoriship, single author)

+ + +
+ +
+ + + + + +

Increase in a share of expenditures on technological

+

innovations in the total amount of regional firms’ expenditures, %

+ + +
+ +
+ + + + + + + + + + + +

Increase in th number of firms with

+

international/national collaboration on innovation

+ + +
+ +
+ + + + + +

Highly cited scientific articles (as a percentage of

+

highly cited scientific article in the whole Federation)

+ + +
+ +
+ + + + + +

Patents filed by public research organisations

+

(as a percentafe of patent application filed under PCT)

+ + +
+ +
+ + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Amount of university and colleague

+

students per 10 thousands population

+ + +
+
+ + + + + +

Share of employees with higher education in

+

the total amount of population at the working age

+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Share of high-technology export in the total volume

+

of production of goods, works and services

+ + +
+ +
+ + + + + +

Share of innovation production/serivces that goes for export,

+

by zones (EU, US, CIS, other countries

+ + +
+ +
+
+ + + + + + + + + + + + + + + + +

Share of Innovative companies collaborating

+

with research institutions on innovation

+ + +
+
+ + + + + +

Number of joint projects conducted by the local comapnies

+

and local consulting/intermediary agencies

+ + +
+
+ + + + + + + + + +

Share of expenditures on technological innovations

+

in the amount of sales

+ + +
+
+ + + + + + + + +

Investments in ICT by asset (IT equipment,

+

communication equipment, software)

+ + +
+
+ + + + + + + +

Level of energy efficiency of the regional economy

+

(can be measured by sectors and for the whole region)

+ + +
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Amount of domestically protected intellectual

+

property per 1 mln. population

+ + +
+
+ + + + + + + +

Number of intellectual property exploited by regional

+

enterprises per 1 mln. population

+ + +
+ +
+ + + + + + + + + + + + + +

Number of advanced ICT introduced in the budgetary organizations

+

(regional power, municipal bodies, social and educational organizations)

+ + +
+
+ + + + + + +

Number of management innovations introduced in the budgetary organizations

+

(regional power, municipal bodies, social and educational organizations)

+ + +
+
+
+
+ + + + + + + + +

Number of interactions between universities

+

and large companies by university size

+ + +
+ +
+
+ + + + + + + + + + + + + + +

Publications: Academic articles in international peer-reviewed

+

journals per 1,000 researchers [articles/1,000 researchers].

+ + +
+
+
+ + + + + + + + + + + + +

Academic licenses: Number of licenses

+

per 1,000 researchers.[licenses/researcher]

+ + +
+
+
+ + + + + + +

Number of spin-offs with external private financing

+

as a share of the institution's R&D budget

+ + +
+
+
+ + + + + + + +

Foreign contracts: Number of contracts with foreign industria

+

l companies at scientific and educational organizations

+

per 1,000 researchers [contracts/researchers]

+ + +
+
+ + + + + + +

Revenue raised from industry R&D as a fraction

+

of total institutional budget (up to a cap)

+ + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Gazelle tenant: Share of tenants with

+

annual revenue growth of more than 20%

+

for each of the past four years or since formation [%]

+ + +
+
+ + + + + +

Globalization of tenants: Median share of tenant

+

revenues obtained from exports [%]

+ + +
+
+
+ + + + + + + + + + + + + +

Perception (opinion poll) of business managers

+

regarding public support programmes

+ + +
+
+
+ + + + + + +

Perception of business managers in terms

+

of level of transparency of support measures in the region

+ + +
+ +
+
+ + + + + +

Description by regional business managers of the way the

+

select and apply for regional and federal support schemes

+ + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Average leverage of 1rub (there would be

+

several programs with different leverage)

+ + +
+ +
+ + + + + +

Volume of attracted money per one ruble

+

of regional budget expenditures on innovation projects

+ + +
+ +
+
+ +
+ + + + + + + + + + + + + + + + +

Growth of the volume of production in the cluster companies

+

to the volume of state support for the cluster

+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

FASIE projects: Number of projects supported

+

by the FASIE per 1,000 workers [awards/worker]

+ + +
+
+
+
+
+ + + + + + + + + + + + + +
\ No newline at end of file diff --git a/wise-webapp/src/test/resources/data/wisemaps/bug3.wxml b/wise-webapp/src/test/resources/data/wisemaps/bug3.wxml new file mode 100644 index 00000000..adaae233 --- /dev/null +++ b/wise-webapp/src/test/resources/data/wisemaps/bug3.wxml @@ -0,0 +1,39 @@ + \ No newline at end of file