Skip to content

Commit

Permalink
Fixup a few places where comments were misplaced.
Browse files Browse the repository at this point in the history
  • Loading branch information
rictic committed Apr 16, 2018
1 parent f664f25 commit ac2fa81
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 38 deletions.
10 changes: 3 additions & 7 deletions lib/mixins/property-effects.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,16 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
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
*/
/* for notify, reflect */
/* for annotated effects */
/*
FIXME(polymer-modulizer): the above comments were extracted
from HTML and may be out of place here. Review them and
then delete this comment!
*/

import '../utils/boot.js';

import { dedupingMixin } from '../utils/mixin.js';
import { root as root$0, isAncestor, isDescendant, get as get$0, translate, isPath as isPath$0, set as set$0, normalize } from '../utils/path.js';
/* for notify, reflect */
import * as caseMap from '../utils/case-map.js';
import { camelToDashCase as camelToDashCase$0, dashToCamelCase } from '../utils/case-map.js';
import { PropertyAccessors } from './property-accessors.js';
/* for annotated effects */
import { TemplateStamp } from './template-stamp.js';
import { sanitizeDOMValue } from '../utils/settings.js';

Expand Down
26 changes: 13 additions & 13 deletions polymer-legacy.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
import { LegacyElementMixin } from './lib/legacy/legacy-element-mixin.js';
import './lib/legacy/polymer-fn.js';
import './lib/legacy/templatizer-behavior.js';
import './lib/elements/dom-bind.js';
import './lib/elements/dom-repeat.js';
import './lib/elements/dom-if.js';
import './lib/elements/array-selector.js';
import './lib/elements/custom-style.js';
import './lib/legacy/mutable-data-behavior.js';
import { html as html$0 } from './lib/utils/html-tag.js';

// bc
/**
@license
Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
Expand All @@ -19,11 +7,23 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
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
*/

import { LegacyElementMixin } from './lib/legacy/legacy-element-mixin.js';
import './lib/legacy/polymer-fn.js';
/* template elements */
import './lib/legacy/templatizer-behavior.js';
import './lib/elements/dom-bind.js';
import './lib/elements/dom-repeat.js';
import './lib/elements/dom-if.js';
import './lib/elements/array-selector.js';
/* custom-style */
import './lib/elements/custom-style.js';
/* bc behaviors */
import './lib/legacy/mutable-data-behavior.js';
/* import html-tag to export html */
import { html as html$0 } from './lib/utils/html-tag.js';

// bc
export const Base = LegacyElementMixin(HTMLElement).prototype;

// NOTE: this is here for modulizer to export `html` for the module version of this file
export { html$0 as html };
30 changes: 12 additions & 18 deletions test/unit/shady-unscoped-style-import.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
/**
@license
Copyright (c) 2017 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
*/

const $_documentContainer = document.createElement('div');
$_documentContainer.setAttribute('style', 'display: none;');

$_documentContainer.innerHTML = `<dom-module id="global-shared1">
<template>
<style shady-unscoped="">
:root {
Expand All @@ -22,23 +32,7 @@ $_documentContainer.innerHTML = `<dom-module id="global-shared1">
</style>
</template>
</dom-module><dom-module id="global-shared2">
</dom-module>`;

document.head.appendChild($_documentContainer);

/**
@license
Copyright (c) 2017 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
*/
/*
FIXME(polymer-modulizer): the above comments were extracted
from HTML and may be out of place here. Review them and
then delete this comment!
*/
;

0 comments on commit ac2fa81

Please sign in to comment.