Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

feat(chips): Make chips edittable on demand. #7210

Merged
merged 69 commits into from
Mar 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
76d89c7
fix(sticky): compile cloned element in the same scope
devversion Feb 13, 2016
879081f
update(ci): remove CI testing with Chrome
ThomasBurleson Feb 23, 2016
f493eb0
update(tests): improve Travis CI configuration
ThomasBurleson Feb 23, 2016
0b5fa37
fix(travis): removed allow_failures
ThomasBurleson Feb 23, 2016
5539916
fix(travis): download PhantomJS2 from bitBucket
ThomasBurleson Feb 23, 2016
3badcc0
fix(travis): update use of 'secure' token for git pushes
ThomasBurleson Feb 23, 2016
30b370d
fix(travis): update secure access token for Github pushes
ThomasBurleson Feb 23, 2016
6c42ac7
update(sticky): only compile the self-cloned element in the given scope.
devversion Feb 23, 2016
eaf0fe5
fix(build): partition IE-only CSS fixes during build
ThomasBurleson Feb 24, 2016
ced1e83
fix(docs): docs stylesheet should not prevent scrolling in code pens
devversion Feb 24, 2016
71e6bff
update(guides): update PR contribution section
ThomasBurleson Feb 25, 2016
19551e4
docs(select): remove fixed height for select demo
devversion Feb 1, 2016
528a439
fix(list): fix list margin if anchor is present.
devversion Jan 5, 2016
3d97ede
docs(autocomplete): better describe the `md-autofocus` attribute
devversion Feb 25, 2016
042086f
fix(autocomplete): clean up md-scroll-mask element on destroy
cah-alexsukhodolsky Feb 25, 2016
0b12f2f
Add style and scss fields to package.json
Feb 25, 2016
f348e3e
update(travis): rebuild node-sass on Travis
ThomasBurleson Feb 25, 2016
99c9b60
Revert "fix(layout): Chrome 48 bug with flexbox"
ThomasBurleson Feb 12, 2016
263f644
docs(contactChipsDemo): Add demo of using a promise in the query func
jamesfer Feb 22, 2016
48968d0
fix(select) trim option text value like a vanilla html select element.
zeitiger Feb 25, 2016
8499d02
fix(list): multi-line inner-text-container should not overflow
devversion Feb 24, 2016
ad019c8
docs(input): document the `md-select-on-focus` directive.
devversion Feb 24, 2016
70489c2
fix(list): fix converted space when target is content editable.
devversion Feb 15, 2016
e6176fb
fix(input): ngMessages height changing.
topherfangio Feb 11, 2016
2941859
Removed text-shadow for inputs with -webkit-autofill
webmaxru Feb 16, 2016
7803395
fix(docs): stretched icon button will interfere with ripple
devversion Feb 21, 2016
96cfa74
fix(autocomplete): fix not found template detection when element is h…
devversion Feb 5, 2016
a838761
fix(tabs): remove inline css width if tabs should stretch
JSMike Feb 15, 2016
6e685c3
fix(input): Fix transition when switching tabs in Safari.
topherfangio Feb 18, 2016
72f8dfd
fix(dialog): correctly disable keydown listener for escapeToClose
devversion Feb 20, 2016
0627d9e
fix(handleMenuItemHover): allow any mdButton to be a focusableTarget
snaumets Feb 20, 2016
4b9f93d
feat(autocomplete): forward `md-select-on-focus` attribute to input a…
devversion Feb 11, 2016
32ba92f
fix(autocomplete, select, virtualrepeat): correctly validate attribut…
devversion Feb 12, 2016
db763bc
fix(list): apply ripple only once and fix list-inner alignment for mu…
devversion Feb 7, 2016
1efe816
feat(toast): add highlight class method + improved docs design + alig…
devversion Feb 23, 2016
78ccef6
refactor(css): Identify private CSS classes.
topherfangio Jan 15, 2016
20a4c2f
fix(sticky): tests relaid on private classes
EladBezalel Feb 26, 2016
08bf4f9
1- Add rtl-prop to use @include rtl-prop(margin-left, margin-right, 1…
hosseinkhaledi Feb 23, 2016
1aa98f9
fix(constants): add semicolon keycode
ThomasBurleson Feb 27, 2016
38f6651
update(docs): remove refs to
ThomasBurleson Feb 27, 2016
5cf32d0
fix(sticky): NPE in
ThomasBurleson Feb 27, 2016
d5a887c
refactor(bidi): add mdUtil.bidi() method
ThomasBurleson Feb 28, 2016
557eea8
fix(layout): revert temp fix for Chrome flexbox bug
ThomasBurleson Feb 29, 2016
ada5850
fix(icon): disable e11 focus for SVG icons
devversion Feb 28, 2016
a5a0eaf
fix(checkbox): fix IE11 focus for checkbox
devversion Feb 9, 2016
6d39c21
fix(interim-element): cancel was emitted as list and not as stack
EladBezalel Feb 6, 2016
fc07353
update(slider): improve disabled attribute validation
devversion Feb 26, 2016
8177ee9
fix(chips): removed redundant class the enable custom colors on chips
EladBezalel Feb 6, 2016
6db1796
style(list): material spec conformance and high-density
EladBezalel Feb 28, 2016
5a528b8
fix(icon): change line-height to icon size
EladBezalel Dec 2, 2015
eb33c37
fix(checkbox): replaced inherit margin values with 0
EladBezalel Dec 27, 2015
abde470
fix(datepicker): Set vertical align on datepicker tables
jshoudy11 Feb 24, 2016
b2afa36
fix(list): removed `keypress` event listener from first child on destroy
EladBezalel Feb 6, 2016
f171fd2
fix(grid-list): validate that row height is defined
EladBezalel Feb 29, 2016
ea15952
feat(chips): Make chips edittable on demand.
mertdeg2 Feb 19, 2016
a945350
feat(chips): Make chips editable on demand
mertdeg2 Feb 19, 2016
1b84d58
feat(chips): Make chips editable on demand.
mertdeg2 Feb 19, 2016
e654286
feat(chips): Arrows don't work while chip edited.
mertdeg2 Feb 19, 2016
8789e1a
feat(chips): Use contenteditable for editing chips
mertdeg2 Feb 22, 2016
3613d8b
feat(chips): Addressing DevVersion's feedback
mertdeg2 Feb 22, 2016
cf3ef0d
feat(chips): Make demo page use separate model
mertdeg2 Feb 22, 2016
1df0fef
feat(chips): Remove chip if content is empty text
mertdeg2 Feb 22, 2016
07f44d5
feat(chips): Get chip in edit mode on second click
mertdeg2 Feb 23, 2016
6fa8e0a
feat(chips): Set bgColor transparent while editing
mertdeg2 Feb 29, 2016
91cc46f
feat(chips): Correct md-chip-content reference.
mertdeg2 Feb 29, 2016
4ef99ff
feat(chips): Make chips editable on demand.
mertdeg2 Feb 19, 2016
8d5660e
feat(chips): Use contenteditable for editing chips
mertdeg2 Feb 22, 2016
ef1a081
feat(chips): Make chips editable on demand.
mertdeg2 Feb 19, 2016
e52679e
feat(chips): Use contenteditable for editing chips
mertdeg2 Feb 22, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 31 additions & 51 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,61 +1,41 @@
language: node_js
sudo: true
sudo: false
node_js:
- '4.2.3'
- 4.2.3
env:
global:
- CXX=g++-4.8 # node 4 likes the G++ v4.8 compiler
- SAUCE_USERNAME=angular-ci
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987

secure: TWmpBzRG68b9e5wbJ7I6ox8TrZTnU/XpOkBvggJyuMgvUz27accp92Y9U7DWUPiXYXcWnoc7pqVAvEbwd1/ykHKCqezmyEXsrzZo6POg2lNFXkI9vSuDukL8A4Ct9zANVmr+5Y+kEBtQ/viyO5Rxc5H9bZskSeMaegqR60ZT2E8=


# node 4 likes the G++ v4.8 compiler
# see https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8

- LOGS_DIR=/tmp/angular-material1-build/logs
- SAUCE_USERNAME=angular-ci
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
- BROWSER_STACK_USERNAME=angularteam1
- BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
- secure: X7CNmOMemAJ9Jqrsmv6MXyeh8n8TIL5CKzE9LYsZUbsyKo0l5CyyysJq0y/AbpQS6awsSv2qP/cZ/kand6r6z0wMFbUcxa4HjMZEfRwv3sGtwj1OKJko/GvjcZQzD54FtHy1NU7wR0mYhAlE5IwH7f8bMa/nUiijgD/TOCTtKH8=
cache:
directories:
- node_modules
- "$HOME/.pub-cache"
branches:
only:
- master
- patch
- minor

- master
before_install:
# configure latest google-chrome version
- export CHROME_BIN=/usr/bin/google-chrome
- sudo apt-get update
- sudo apt-get install -y libappindicator1 fonts-liberation
- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- sudo dpkg -i google-chrome*.deb
# configure phantomjs2
- mkdir travis-phantomjs
- wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
- export PHANTOMJS_BIN=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin/phantomjs
# firefox virtual screen
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start


- mkdir travis-phantomjs
- wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
-O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
- export PHANTOMJS_BIN=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin/phantomjs
install:
- npm install
- npm rebuild node-sass
before_script:
- git config --global user.email "ngmaterial@googlegroups.com"
- git config --global user.name "ngMaterial Bot"

# Necessary to run test on Travis CI that require a graphical interface.
# See https://docs.travis-ci.com/user/gui-and-headless-browsers
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- mkdir -p $LOGS_DIR
- git config --global user.email "ngmaterial@googlegroups.com"
- git config --global user.name "ngMaterial Bot"
script:
# Fail builds which use iit/ddescribe, but run the tests anyways
- gulp ddescribe-iit
- gulp karma --reporters='dots'

- gulp ddescribe-iit
- gulp karma --reporters='dots'
after_success:
- ./scripts/travis-build-init.sh --sha=$TRAVIS_COMMIT

notifications:
flowdock: ca58afe1354053b15fe75a763138829d


- "./scripts/travis-build-init.sh --sha=$TRAVIS_COMMIT"
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Here are two examples of well-defined issues:
unsolicited PRs to Angular Material.

Please check with us via [the discussion forum](https://groups.google.com/forum/#!forum/ngmaterial)
before investing significant effort in any pre-1.0 PR contribution; it's likely that we are already
before investing significant effort in a planned Pull Request submission; it's likely that we are already
working on a related PR.

* All contributions must be consistent with the Angular Material coding conventions. See the
Expand Down
7 changes: 6 additions & 1 deletion config/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ module.exports = function(config) {
// - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
// - PhantomJS
// - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
browsers: ['Chrome', 'PhantomJS2']
browsers: ['Firefox', 'PhantomJS2'],

client: {
// Do not clear the context as this can cause reload failures with Jasmine
clearContext:false
}
});

};
7 changes: 2 additions & 5 deletions docs/app/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ body {
font-size: 1.6rem;
}

body {
/* This styling should be not applied to codepen demos, so we need to add a unique identifier. */
body.docs-body {
overflow: hidden;
max-width: 100%;
max-height: 100%;
Expand Down Expand Up @@ -430,10 +431,6 @@ a.docs-logo {
margin: 0 24px;
width: auto;
}
.docs-tools .md-button {
padding: 0;
margin: 0 0 0 8px;
}
.docs-tools .md-button,
.docs-tools .md-button md-icon {
color: #666 !important;
Expand Down
2 changes: 1 addition & 1 deletion docs/app/partials/menu-link.tmpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ng-href="{{section.url}}"
ng-click="focusSection()">
{{section | humanizeDoc}}
<span class="md-visually-hidden"
<span class="_md-visually-hidden"
ng-if="isSelected()">
current page
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/config/template/index.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" href="angular-material.min.css">
<link rel="stylesheet" href="docs.css">
</head>
<body layout="row" ng-cloak>
<body class="docs-body" layout="row" ng-cloak>

<md-sidenav class="site-sidenav md-sidenav-left md-whiteframe-z2"
md-component-id="left" hide-print
Expand Down Expand Up @@ -65,7 +65,7 @@ <h2 class="md-toolbar-item md-breadcrumb md-headline">
<span ng-if="menu.currentPage.name !== menu.currentSection.name">
<span hide-sm hide-md>{{menu.currentSection.name}}</span>
<span class="docs-menu-separator-icon" hide-sm hide-md style="transform: translate3d(0, 1px, 0)">
<span class="md-visually-hidden">-</span>
<span class="_md-visually-hidden">-</span>
<md-icon
aria-hidden="true"
md-svg-src="img/icons/ic_chevron_right_24px.svg"
Expand Down
1 change: 1 addition & 0 deletions gulp/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ module.exports = {
'src/components/**/*.scss',
'src/core/services/**/*.scss'
],
cssIEPaths : 'src/**/ie_fixes.css',
paths: 'src/{components, services}/**',
outputDir: 'dist/',
demoFolder: 'demo-partials'
Expand Down
8 changes: 5 additions & 3 deletions gulp/tasks/build-scss.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ var sassUtils = require('../../scripts/gulp-utils');
var sass = require('gulp-sass');
var minifyCss = require('gulp-minify-css');
var insert = require('gulp-insert');
var addsrc = require('gulp-add-src');
var gulpif = require('gulp-if');
var args = util.args;
var IS_DEV = require('../const').IS_DEV;
Expand All @@ -31,6 +32,7 @@ exports.task = function() {
streams.push(
scssPipe = gulp.src(getPaths())
.pipe(util.filterNonCodeFiles())
.pipe(filter(['**', '!**/*.css']))
.pipe(filter(['**', '!**/*-theme.scss']))
.pipe(filter(['**', '!**/*-print.scss']))
.pipe(filter(['**', '!**/*-attributes.scss']))
Expand All @@ -41,11 +43,11 @@ exports.task = function() {
streams.push(
scssPipe
.pipe(sass())
.pipe(rename({extname: '.css'})) // unminified
.pipe(rename({ basename: filename }))
.pipe(util.autoprefix())
.pipe(insert.prepend(config.banner))
.pipe(gulp.dest(dest))
.pipe(addsrc.append(config.cssIEPaths)) // append raw CSS for IE Fixes
.pipe(concat('angular-material.css'))
.pipe(gulp.dest(dest)) // unminified
.pipe(gulpif(!IS_DEV, minifyCss()))
.pipe(rename({extname: '.min.css'}))
.pipe(gulp.dest(dest)) // minified
Expand Down
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@
"type": "git",
"url": "git://github.com/angular/material.git"
},
"style": "./dist/angular-material.css",
"scss": "./dist/angular-material.scss",
"devDependencies": {
"angular": "^1.4.8",
"angular-animate": "^1.4.8",
"angular-aria": "^1.4.8",
"angular-messages": "^1.4.8",
"angular-mocks": "^1.4.8",
"angular-route": "^1.4.8",
"angular-sanitize": "^1.4.8",
"angular-touch": "^1.4.8",
"angular": "^1.5.0",
"angular-animate": "^1.5.0",
"angular-aria": "^1.5.0",
"angular-messages": "^1.5.0",
"angular-mocks": "^1.5.0",
"angular-route": "^1.5.0",
"angular-sanitize": "^1.5.0",
"angular-touch": "^1.5.0",
"angularytics": "^0.3.0",
"canonical-path": "0.0.2",
"cli-color": "^1.0.0",
Expand All @@ -35,6 +37,7 @@
"esprima": "^1.2.2",
"glob": "~4.0.2",
"gulp": "^3.9.0",
"gulp-add-src": "^0.2.0",
"gulp-autoprefixer": "^1.0.1",
"gulp-concat": "^2.2.0",
"gulp-connect": "^2.2.0",
Expand Down Expand Up @@ -80,4 +83,3 @@
"squash": "git rebase -i $(npm run -s merge-base)"
}
}

Loading