Skip to content

Commit

Permalink
Merge pull request #1626 from Polymer/0.9-add-version
Browse files Browse the repository at this point in the history
Add back Polymer.version string
  • Loading branch information
kevinpschaaf committed May 27, 2015
2 parents 77517e4 + cc2663d commit 5250037
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 55 deletions.
4 changes: 4 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ var distMicro = path.join(workdir, micro);
var distMini = path.join(workdir, mini);
var distMax = path.join(workdir, max);

var pkg = require('./package.json');

var cleanupPipe = lazypipe()
// Reduce script tags
.pipe(replace, /<\/script>\s*<script>/g, '\n\n')
// Add real version number
.pipe(replace, /(Polymer.version = )'master'/, '$1"' + pkg.version + '"')
// remove leading whitespace and comments
.pipe(polyclean.leftAlignJs)
// remove html wrapper
Expand Down
114 changes: 59 additions & 55 deletions polymer-micro.html
Original file line number Diff line number Diff line change
@@ -1,55 +1,59 @@
<!--
@license
Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<link rel="import" href="src/polymer-lib.html">
<link rel="import" href="src/micro/tag.html">
<link rel="import" href="src/micro/behaviors.html">
<link rel="import" href="src/micro/extends.html">
<link rel="import" href="src/micro/constructor.html">
<link rel="import" href="src/micro/properties.html">
<link rel="import" href="src/micro/attributes.html">
<link rel="import" href="src/micro/debouncer.html">

<script>

Polymer.Base._addFeature({

_registerFeatures: function() {
// identity
this._prepIs();
// attributes
this._prepAttributes();
// shared behaviors
this._prepBehaviors();
// inheritance
this._prepExtends();
// factory
this._prepConstructor();
},

_prepBehavior: function(b) {
this._addHostAttributes(b.hostAttributes);
},

_marshalBehavior: function(b) {
},

_initFeatures: function() {
// install host attributes
this._marshalHostAttributes();
// setup debouncers
this._setupDebouncers();
// acquire behaviors
this._marshalBehaviors();
}

});

</script>

<!--
@license
Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<link rel="import" href="src/polymer-lib.html">
<link rel="import" href="src/micro/tag.html">
<link rel="import" href="src/micro/behaviors.html">
<link rel="import" href="src/micro/extends.html">
<link rel="import" href="src/micro/constructor.html">
<link rel="import" href="src/micro/properties.html">
<link rel="import" href="src/micro/attributes.html">
<link rel="import" href="src/micro/debouncer.html">

<script>
Polymer.version = 'master';
</script>

<script>

Polymer.Base._addFeature({

_registerFeatures: function() {
// identity
this._prepIs();
// attributes
this._prepAttributes();
// shared behaviors
this._prepBehaviors();
// inheritance
this._prepExtends();
// factory
this._prepConstructor();
},

_prepBehavior: function(b) {
this._addHostAttributes(b.hostAttributes);
},

_marshalBehavior: function(b) {
},

_initFeatures: function() {
// install host attributes
this._marshalHostAttributes();
// setup debouncers
this._setupDebouncers();
// acquire behaviors
this._marshalBehaviors();
}

});

</script>

0 comments on commit 5250037

Please sign in to comment.