Merging exports via strings
authorJaroslav Tulach <jtulach@netbeans.org>
Wed, 28 May 2014 14:50:18 +0200
changeset 6738ba1935e4b08
parent 671 f3a99fd259f7
parent 672 ea4d5a372845
child 674 a61fd3f48997
Merging exports via strings
     1.1 --- a/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java	Mon May 26 14:29:50 2014 +0200
     1.2 +++ b/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java	Wed May 28 14:50:18 2014 +0200
     1.3 @@ -106,22 +106,22 @@
     1.4          + "  }\n"
     1.5          + "  var activeGetter = function() { return value; };\n"
     1.6          + "  var bnd = {\n"
     1.7 -        + "    read: function() {\n"
     1.8 +        + "    'read': function() {\n"
     1.9          + "      var r = activeGetter();\n"
    1.10          + "      activeGetter = realGetter;\n"
    1.11          + "      if (r) try { r = r.valueOf(); } catch (err) {}\n"
    1.12          + "      return r;\n"
    1.13          + "    },\n"
    1.14 -        + "    owner: ret\n"
    1.15 +        + "    'owner': ret\n"
    1.16          + "  };\n"
    1.17          + "  if (!readOnly) {\n"
    1.18 -        + "    bnd.write = function(val) {\n"
    1.19 +        + "    bnd['write'] = function(val) {\n"
    1.20          + "      prop.@org.apidesign.html.json.spi.PropertyBinding::setValue(Ljava/lang/Object;)(val);\n"
    1.21          + "    };\n"
    1.22          + "  };\n"
    1.23 -        + "  var cmpt = ko.computed(bnd);\n"
    1.24 -        + "  var vhm = cmpt.valueHasMutated;\n"
    1.25 -        + "  cmpt.valueHasMutated = function(val) {\n"
    1.26 +        + "  var cmpt = ko['computed'](bnd);\n"
    1.27 +        + "  var vhm = cmpt['valueHasMutated'];\n"
    1.28 +        + "  cmpt['valueHasMutated'] = function(val) {\n"
    1.29          + "    if (arguments.length === 1) activeGetter = function() { return val; };\n"
    1.30          + "    vhm();\n"
    1.31          + "  };\n"
     2.1 --- a/ko4j/src/main/resources/org/netbeans/html/ko4j/knockout-2.2.1.js	Mon May 26 14:29:50 2014 +0200
     2.2 +++ b/ko4j/src/main/resources/org/netbeans/html/ko4j/knockout-2.2.1.js	Wed May 28 14:50:18 2014 +0200
     2.3 @@ -1312,6 +1312,7 @@
     2.4      ko.subscribable.call(dependentObservable);
     2.5      ko.utils.extend(dependentObservable, ko.dependentObservable['fn']);
     2.6  
     2.7 +    ko.exportProperty(dependentObservable, 'valueHasMutated', dependentObservable.valueHasMutated);
     2.8      ko.exportProperty(dependentObservable, 'peek', dependentObservable.peek);
     2.9      ko.exportProperty(dependentObservable, 'dispose', dependentObservable.dispose);
    2.10      ko.exportProperty(dependentObservable, 'isActive', dependentObservable.isActive);