diff options
| author | Alon Levy <alon@pobox.com> | 2015-01-21 19:09:53 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-01-21 19:10:34 +0200 |
| commit | e53e4cc2fb141c5a64018bd988fb4fa3efd898f7 (patch) | |
| tree | 9184aba399e174884bc1671804d465e3923d5172 | |
| parent | 03f58e44fe293028038f06e7a52379f6edb68465 (diff) | |
client/model/core: cannot delete id (create_node_from_spec) due to it using Object.defineProperty
| -rw-r--r-- | build.ant | 7 | ||||
| -rw-r--r-- | src/client/model/core.js | 4 |
2 files changed, 8 insertions, 3 deletions
@@ -62,6 +62,9 @@ <mkdir dir="${targetDeploymentDir}/static" /> + <copy file="res/etc/rhizi-server.conf.example" + tofile="res/etc/rhizi-server.conf" /> + <parallel> <rsync src="${src_client}/" dst="${targetDeploymentDir}/static" /> <rsync src="res/client/" dst="${targetDeploymentDir}/static" /> @@ -71,7 +74,7 @@ link="${targetDeploymentDir}/bin" resource="${basedir}/${src_server}" /> - <copy file="res/etc/rhizi-server.conf.example" + <copy file="res/etc/rhizi-server.conf" tofile="${targetDeploymentDir}/etc/rhizi-server.conf" /> <copy file="res/etc/htpasswd" tofile="${targetDeploymentDir}/etc/htpasswd" /> @@ -139,4 +142,4 @@ </exec> </target> -</project>
\ No newline at end of file +</project> diff --git a/src/client/model/core.js b/src/client/model/core.js index 2eeff72f..41850d92 100644 --- a/src/client/model/core.js +++ b/src/client/model/core.js @@ -64,7 +64,6 @@ define(['util'], function(util) { // reuse id if present __set_obj_id(ret, node_spec.id); } - delete node_spec.id; util.assert(undefined != node_spec.name, 'create_node_from_spec: name missing'); @@ -92,6 +91,9 @@ define(['util'], function(util) { // other for (var property in node_spec) { + if (property === 'id') { + continue; + } ret[property] = node_spec[property]; } |