diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..34b06b5d Binary files /dev/null and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 486efd97..22aa8f55 100644 --- a/.gitignore +++ b/.gitignore @@ -20,8 +20,11 @@ src/main/javascript/client/SXP* /logs/ /simpleDb/ src/main/js/SXP-linux-x64/ +src/main/js/SXP-darwin-x64/ src/main/js/node_modules/ certConfig.conf keystore.jks .cache* derby.log +SXP.iml +/.idea/ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b1b2593..aac59de3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,10 @@ tests: except: - master - + deploy: + stage: deploy + script: + - ./deploy #selenium: # stage: test # image: selenium/standalone-firefox diff --git a/build.gradle b/build.gradle index 7f8cd6e7..5dc0fd1a 100644 --- a/build.gradle +++ b/build.gradle @@ -10,23 +10,23 @@ jacoco { //Adding Google java format and sonar pluggins for jdk >= 8 buildscript { - repositories { - maven { - url "https://plugins.gradle.org/m2/" + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + //classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.3.2" + if (JavaVersion.current() >= JavaVersion.VERSION_1_8) { + classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.1" + } + classpath "com.netflix.nebula:nebula-ospackage-plugin:3.+" } - } - dependencies { - //classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.3.2" - if(JavaVersion.current()>= JavaVersion.VERSION_1_8){ - classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.1" - } - classpath "com.netflix.nebula:nebula-ospackage-plugin:3.+" - } } //apply plugin: "com.github.sherter.google-java-format" -if(JavaVersion.current()>= JavaVersion.VERSION_1_8){ - apply plugin: "org.sonarqube" +if (JavaVersion.current() >= JavaVersion.VERSION_1_8) { + apply plugin: "org.sonarqube" } @@ -37,15 +37,17 @@ targetCompatibility = 1.7 repositories { mavenCentral() maven { + url 'http://www.janus-project.org/maven' url uri('libs') + } } jar { - manifest { - attributes 'Implementation-Title': 'SXP network', - 'Implementation-Version': 1.0 - } + manifest { + attributes 'Implementation-Title': 'SXP network', + 'Implementation-Version': 1.0 + } } sourceSets.main.resources.srcDirs += ["src/main/resources"] @@ -57,15 +59,15 @@ configurations { } //Define selenium sources and resources -sourceSets { - selenium { +sourceSets { + selenium { java { compileClasspath += main.output + test.output runtimeClasspath += main.output + test.output srcDir file('src/selenium/java') } resources.srcDir file('src/selenium/resources') - } + } } //selenium task @@ -75,28 +77,28 @@ task selenium(type: Test) { testClassesDir = sourceSets.selenium.output.classesDir classpath = sourceSets.selenium.runtimeClasspath outputs.upToDateWhen { false } - // jvmArgs "" + // jvmArgs "" } -test{ - //exclude 'model/syncManager/**' - //exclude 'controller/**' - //exclude 'crypt/**' - //exclude 'model/entity/**' - //exclude 'model/validator/**' - //exclude 'network/**' - //exclude 'protocol/**' - //exclude 'rest/**' - //exclude 'util/**' - - testLogging { - showStandardStreams = false - showExceptions = false - showStackTraces = false - } - - - if (System.getProperty('DEBUG', 'false') == 'true') { +test { + //exclude 'model/syncManager/**' + //exclude 'controller/**' + //exclude 'crypt/**' + //exclude 'model/entity/**' + //exclude 'model/validator/**' + //exclude 'network/**' + //exclude 'protocol/**' + //exclude 'rest/**' + //exclude 'util/**' + + testLogging { + showStandardStreams = false + showExceptions = false + showStackTraces = false + } + + + if (System.getProperty('DEBUG', 'false') == 'true') { jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006' } } @@ -130,52 +132,53 @@ tasks.withType(Test) { } dependencies { - - compile 'org.hibernate:hibernate-validator:5.2.4.Final' - - compile 'org.apache.logging.log4j:log4j-api:2.1' - compile 'org.apache.logging.log4j:log4j-core:2.1' - compile 'org.apache.logging.log4j:log4j-1.2-api:2.1' - compile 'org.apache.logging.log4j:log4j-web:2.5' - - compile 'org.eclipse.jetty:jetty-server:9.2+' - compile 'org.eclipse.jetty:jetty-servlet:9.2+' - compile 'org.eclipse.jetty:jetty-webapp:9.3+' + + compile 'org.hibernate:hibernate-validator:5.2.4.Final' + + compile 'org.apache.logging.log4j:log4j-api:2.1' + compile 'org.apache.logging.log4j:log4j-core:2.1' + compile 'org.apache.logging.log4j:log4j-1.2-api:2.1' + compile 'org.apache.logging.log4j:log4j-web:2.5' + + compile 'org.eclipse.jetty:jetty-server:9.2+' + compile 'org.eclipse.jetty:jetty-servlet:9.2+' + compile 'org.eclipse.jetty:jetty-webapp:9.3+' compile 'org.eclipse.jetty:jetty-util:9.2+' - //compile 'org.eclipse.jetty:apache-jsp:9.2+' - //compile 'org.eclipse.jetty:apache-jstl:9.2+' - - compile 'org.apache.commons:commons-collections4:4.0' - - compile 'org.glassfish.jersey.core:jersey-server:2.7' - compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.7' - compile 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.7' - compile 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.7' - compile 'org.glassfish.jersey.media:jersey-media-moxy:2.7' - compile 'javax:javaee-api:7.0' - compile 'org.apache.derby:derby:10.12.1.1' - compile 'org.eclipse.persistence:eclipselink:2.6.3-M1' - compile 'org.eclipse.persistence:javax.persistence:2.1.1' - compile 'com.fasterxml.jackson.core:jackson-databind:2.6.3' - compile fileTree(dir: './libs', include: '*.jar') - compile ('com.kenai.jxse:jxse:2.7') - { - // org.jboss.netty has moved to io.netty - exclude group: 'org.jboss.netty', module: 'httptunnel' - } - compile 'org.jdom:jdom2:2.0.6' - compile 'com.google.guava:guava:19.0' - compile 'org.shredzone.acme4j:acme4j-utils:0.8' - compile 'com.fasterxml.jackson.core:jackson-databind:2.6.3' - - compile 'org.hibernate:hibernate-validator:5.3.3.Final' - compile 'javax.el:javax.el-api:2.2.4' - compile 'org.glassfish.web:javax.el:2.2.4' - - - testCompile 'org.apache.commons:commons-lang3:3.1' - testCompile fileTree(dir: './libs', include: 'loremipsum-1.0.jar') - testCompile group: 'junit', name: 'junit', version: '4.+' + //compile 'org.eclipse.jetty:apache-jsp:9.2+' + //compile 'org.eclipse.jetty:apache-jstl:9.2+' + + compile 'org.apache.commons:commons-collections4:4.0' + + compile 'org.glassfish.jersey.core:jersey-server:2.7' + compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.7' + compile 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.7' + compile 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.7' + compile 'org.glassfish.jersey.media:jersey-media-moxy:2.7' + compile 'javax:javaee-api:7.0' + compile 'org.apache.derby:derby:10.12.1.1' + compile 'org.eclipse.persistence:eclipselink:2.6.3-M1' + compile 'org.eclipse.persistence:javax.persistence:2.1.1' + compile 'com.fasterxml.jackson.core:jackson-databind:2.6.3' + compile 'io.netty:netty-all:4.0.24.Final' + compile('com.kenai.jxse:jxse:2.7') { + exclude group: 'org.jboss.netty', module: 'httptunnel' + + } + compile 'org.jdom:jdom2:2.0.6' + compile fileTree(dir: './libs', include: '*.jar') + compile 'com.google.guava:guava:19.0' + compile 'org.shredzone.acme4j:acme4j-utils:0.8' + compile 'com.fasterxml.jackson.core:jackson-databind:2.6.3' + + compile 'org.hibernate:hibernate-validator:5.3.3.Final' + compile 'javax.el:javax.el-api:2.2.4' + compile 'org.glassfish.web:javax.el:2.2.4' + + + testCompile 'org.apache.commons:commons-lang3:3.1' + testCompile fileTree(dir: './libs', include: 'loremipsum-1.0.jar') + testCompile group: 'junit', name: 'junit', version: '4.+' + testCompile group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.16.0' testCompile group: 'org.json', name: 'json', version: '20160810' seleniumCompile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.0.1' @@ -184,20 +187,19 @@ dependencies { configurations.all { exclude group: "log4j", module: "log4j" } - [compileJava, compileTestJava]*.options.collect {options -> options.encoding = 'UTF-8'} eclipse { - classpath { - downloadSources = true - downloadJavadoc = true - } + classpath { + downloadSources = true + downloadJavadoc = true + } } //Copy dependencies in the libs directory task libs(type: Sync) { - from configurations.compile + from configurations.compile //from configurations.runtime from configurations.testCompile from configurations.seleniumCompile diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 2268bec0..925a4de9 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -1,63 +1,73 @@ - + - + - + - + {{ site.title | default: site.github.repository_name }} - - - - securely exchange anything, anywhere, with anyone. - -
-
- View on GitHub - - - -

{{ site.description | default: site.github.project_tagline }}

- - {% if site.show_downloads %} -
- Download this project as a .zip file - Download this project as a tar.gz file -
- {% endif %} -
-
- - -
-
+ + + +securely exchange anything, anywhere, with anyone. + +
+
+ View on GitHub + + + +

{{ site.description | default: site.github.project_tagline }}

+ + {% if site.show_downloads %} +
+ Download this project as a .zip file + Download this project as a tar.gz file +
+ {% endif %} +
+
+ + +
+
{{ content }} -
-
+
+
- - + +{% if site.google_analytics %} + +{% endif %} + diff --git a/docs/_layouts/tagpage.html b/docs/_layouts/tagpage.html index c64d2f57..bce0bfd9 100644 --- a/docs/_layouts/tagpage.html +++ b/docs/_layouts/tagpage.html @@ -3,18 +3,18 @@ ---
-

{{ page.title }}

- {{ content }} +

{{ page.title }}

+ {{ content }} -
diff --git a/docs/_layouts/wiki.html b/docs/_layouts/wiki.html index 5ba82cc0..5a6811b3 100644 --- a/docs/_layouts/wiki.html +++ b/docs/_layouts/wiki.html @@ -3,9 +3,12 @@ ---
- -

{{ page.title }}

- {{ content }} + + + + +

{{ page.title }}

+ {{ content }}
diff --git a/docs/images/sxp.svg b/docs/images/sxp.svg index c4a45fc9..8def9d51 100644 --- a/docs/images/sxp.svg +++ b/docs/images/sxp.svg @@ -1,7 +1,7 @@ - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3391a4cd..be1189c1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1714424..f413c044 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jul 12 11:30:16 CEST 2016 +#Sun Nov 19 19:20:42 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-2-bin.zip diff --git a/gradlew b/gradlew index 9d82f789..4453ccea 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730..e95643d6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/libs/.DS_Store b/libs/.DS_Store new file mode 100644 index 00000000..d5b49515 Binary files /dev/null and b/libs/.DS_Store differ diff --git a/libs/netty-3.1.5.GA.jar b/libs/netty-3.1.5.GA.jar new file mode 100644 index 00000000..3729ddd0 Binary files /dev/null and b/libs/netty-3.1.5.GA.jar differ diff --git a/out/.DS_Store b/out/.DS_Store new file mode 100644 index 00000000..6e0151d2 Binary files /dev/null and b/out/.DS_Store differ diff --git a/out/production/.DS_Store b/out/production/.DS_Store new file mode 100644 index 00000000..0efabae5 Binary files /dev/null and b/out/production/.DS_Store differ diff --git a/out/production/classes/controller/Application.class b/out/production/classes/controller/Application.class new file mode 100644 index 00000000..56c627b2 Binary files /dev/null and b/out/production/classes/controller/Application.class differ diff --git a/out/production/classes/controller/CASingingRequest.class b/out/production/classes/controller/CASingingRequest.class new file mode 100644 index 00000000..f449233f Binary files /dev/null and b/out/production/classes/controller/CASingingRequest.class differ diff --git a/out/production/classes/controller/Contracts$1.class b/out/production/classes/controller/Contracts$1.class new file mode 100644 index 00000000..a80681fb Binary files /dev/null and b/out/production/classes/controller/Contracts$1.class differ diff --git a/out/production/classes/controller/Contracts$2.class b/out/production/classes/controller/Contracts$2.class new file mode 100644 index 00000000..219d80f1 Binary files /dev/null and b/out/production/classes/controller/Contracts$2.class differ diff --git a/out/production/classes/controller/Contracts$3.class b/out/production/classes/controller/Contracts$3.class new file mode 100644 index 00000000..d72ec7c9 Binary files /dev/null and b/out/production/classes/controller/Contracts$3.class differ diff --git a/out/production/classes/controller/Contracts$4.class b/out/production/classes/controller/Contracts$4.class new file mode 100644 index 00000000..fd6a9363 Binary files /dev/null and b/out/production/classes/controller/Contracts$4.class differ diff --git a/out/production/classes/controller/Contracts$5.class b/out/production/classes/controller/Contracts$5.class new file mode 100644 index 00000000..3aa19653 Binary files /dev/null and b/out/production/classes/controller/Contracts$5.class differ diff --git a/out/production/classes/controller/Contracts$6.class b/out/production/classes/controller/Contracts$6.class new file mode 100644 index 00000000..7f69129b Binary files /dev/null and b/out/production/classes/controller/Contracts$6.class differ diff --git a/out/production/classes/controller/Contracts$7.class b/out/production/classes/controller/Contracts$7.class new file mode 100644 index 00000000..e80bbc5f Binary files /dev/null and b/out/production/classes/controller/Contracts$7.class differ diff --git a/out/production/classes/controller/Contracts.class b/out/production/classes/controller/Contracts.class new file mode 100644 index 00000000..df85178a Binary files /dev/null and b/out/production/classes/controller/Contracts.class differ diff --git a/out/production/classes/controller/CryptCommander.class b/out/production/classes/controller/CryptCommander.class new file mode 100644 index 00000000..1ee7a75b Binary files /dev/null and b/out/production/classes/controller/CryptCommander.class differ diff --git a/out/production/classes/controller/Items$1.class b/out/production/classes/controller/Items$1.class new file mode 100644 index 00000000..5dc9dd8d Binary files /dev/null and b/out/production/classes/controller/Items$1.class differ diff --git a/out/production/classes/controller/Items$2.class b/out/production/classes/controller/Items$2.class new file mode 100644 index 00000000..0689c4cb Binary files /dev/null and b/out/production/classes/controller/Items$2.class differ diff --git a/out/production/classes/controller/Items$3.class b/out/production/classes/controller/Items$3.class new file mode 100644 index 00000000..38bec324 Binary files /dev/null and b/out/production/classes/controller/Items$3.class differ diff --git a/out/production/classes/controller/Items$4.class b/out/production/classes/controller/Items$4.class new file mode 100644 index 00000000..266cf045 Binary files /dev/null and b/out/production/classes/controller/Items$4.class differ diff --git a/out/production/classes/controller/Items.class b/out/production/classes/controller/Items.class new file mode 100644 index 00000000..2aa3c6b3 Binary files /dev/null and b/out/production/classes/controller/Items.class differ diff --git a/out/production/classes/controller/Messages$1$1.class b/out/production/classes/controller/Messages$1$1.class new file mode 100644 index 00000000..0b84fc26 Binary files /dev/null and b/out/production/classes/controller/Messages$1$1.class differ diff --git a/out/production/classes/controller/Messages$1$2.class b/out/production/classes/controller/Messages$1$2.class new file mode 100644 index 00000000..379dd993 Binary files /dev/null and b/out/production/classes/controller/Messages$1$2.class differ diff --git a/out/production/classes/controller/Messages$1.class b/out/production/classes/controller/Messages$1.class new file mode 100644 index 00000000..201d78bd Binary files /dev/null and b/out/production/classes/controller/Messages$1.class differ diff --git a/out/production/classes/controller/Messages$2$1.class b/out/production/classes/controller/Messages$2$1.class new file mode 100644 index 00000000..62281fe9 Binary files /dev/null and b/out/production/classes/controller/Messages$2$1.class differ diff --git a/out/production/classes/controller/Messages$2$2.class b/out/production/classes/controller/Messages$2$2.class new file mode 100644 index 00000000..66ed4413 Binary files /dev/null and b/out/production/classes/controller/Messages$2$2.class differ diff --git a/out/production/classes/controller/Messages$2$3.class b/out/production/classes/controller/Messages$2$3.class new file mode 100644 index 00000000..68c33e53 Binary files /dev/null and b/out/production/classes/controller/Messages$2$3.class differ diff --git a/out/production/classes/controller/Messages$2.class b/out/production/classes/controller/Messages$2.class new file mode 100644 index 00000000..56314158 Binary files /dev/null and b/out/production/classes/controller/Messages$2.class differ diff --git a/out/production/classes/controller/Messages.class b/out/production/classes/controller/Messages.class new file mode 100644 index 00000000..5fa9ee78 Binary files /dev/null and b/out/production/classes/controller/Messages.class differ diff --git a/out/production/classes/controller/Search$1$1$1.class b/out/production/classes/controller/Search$1$1$1.class new file mode 100644 index 00000000..e4ab7061 Binary files /dev/null and b/out/production/classes/controller/Search$1$1$1.class differ diff --git a/out/production/classes/controller/Search$1$1.class b/out/production/classes/controller/Search$1$1.class new file mode 100644 index 00000000..b6e60159 Binary files /dev/null and b/out/production/classes/controller/Search$1$1.class differ diff --git a/out/production/classes/controller/Search$1.class b/out/production/classes/controller/Search$1.class new file mode 100644 index 00000000..4b7e37ed Binary files /dev/null and b/out/production/classes/controller/Search$1.class differ diff --git a/out/production/classes/controller/Search$2$1$1.class b/out/production/classes/controller/Search$2$1$1.class new file mode 100644 index 00000000..87ae20ad Binary files /dev/null and b/out/production/classes/controller/Search$2$1$1.class differ diff --git a/out/production/classes/controller/Search$2$1.class b/out/production/classes/controller/Search$2$1.class new file mode 100644 index 00000000..91509c6c Binary files /dev/null and b/out/production/classes/controller/Search$2$1.class differ diff --git a/out/production/classes/controller/Search$2.class b/out/production/classes/controller/Search$2.class new file mode 100644 index 00000000..2f927f71 Binary files /dev/null and b/out/production/classes/controller/Search$2.class differ diff --git a/out/production/classes/controller/Search.class b/out/production/classes/controller/Search.class new file mode 100644 index 00000000..9593932c Binary files /dev/null and b/out/production/classes/controller/Search.class differ diff --git a/out/production/classes/controller/Users$1.class b/out/production/classes/controller/Users$1.class new file mode 100644 index 00000000..7e5d8677 Binary files /dev/null and b/out/production/classes/controller/Users$1.class differ diff --git a/out/production/classes/controller/Users$2.class b/out/production/classes/controller/Users$2.class new file mode 100644 index 00000000..9d268a33 Binary files /dev/null and b/out/production/classes/controller/Users$2.class differ diff --git a/out/production/classes/controller/Users$3.class b/out/production/classes/controller/Users$3.class new file mode 100644 index 00000000..c0ee8702 Binary files /dev/null and b/out/production/classes/controller/Users$3.class differ diff --git a/out/production/classes/controller/Users$4.class b/out/production/classes/controller/Users$4.class new file mode 100644 index 00000000..568928b7 Binary files /dev/null and b/out/production/classes/controller/Users$4.class differ diff --git a/out/production/classes/controller/Users$5.class b/out/production/classes/controller/Users$5.class new file mode 100644 index 00000000..ddc29a62 Binary files /dev/null and b/out/production/classes/controller/Users$5.class differ diff --git a/out/production/classes/controller/Users.class b/out/production/classes/controller/Users.class new file mode 100644 index 00000000..e001e7d6 Binary files /dev/null and b/out/production/classes/controller/Users.class differ diff --git a/out/production/classes/controller/managers/CryptoItemManagerDecorator$1.class b/out/production/classes/controller/managers/CryptoItemManagerDecorator$1.class new file mode 100644 index 00000000..20d630bf Binary files /dev/null and b/out/production/classes/controller/managers/CryptoItemManagerDecorator$1.class differ diff --git a/out/production/classes/controller/managers/CryptoItemManagerDecorator$2.class b/out/production/classes/controller/managers/CryptoItemManagerDecorator$2.class new file mode 100644 index 00000000..3f2e9248 Binary files /dev/null and b/out/production/classes/controller/managers/CryptoItemManagerDecorator$2.class differ diff --git a/out/production/classes/controller/managers/CryptoItemManagerDecorator$3.class b/out/production/classes/controller/managers/CryptoItemManagerDecorator$3.class new file mode 100644 index 00000000..8305d60e Binary files /dev/null and b/out/production/classes/controller/managers/CryptoItemManagerDecorator$3.class differ diff --git a/out/production/classes/controller/managers/CryptoItemManagerDecorator.class b/out/production/classes/controller/managers/CryptoItemManagerDecorator.class new file mode 100644 index 00000000..9ca9832b Binary files /dev/null and b/out/production/classes/controller/managers/CryptoItemManagerDecorator.class differ diff --git a/out/production/classes/controller/managers/CryptoMessageManagerDecorator$1.class b/out/production/classes/controller/managers/CryptoMessageManagerDecorator$1.class new file mode 100644 index 00000000..ee884622 Binary files /dev/null and b/out/production/classes/controller/managers/CryptoMessageManagerDecorator$1.class differ diff --git a/out/production/classes/controller/managers/CryptoMessageManagerDecorator.class b/out/production/classes/controller/managers/CryptoMessageManagerDecorator.class new file mode 100644 index 00000000..4641e7cb Binary files /dev/null and b/out/production/classes/controller/managers/CryptoMessageManagerDecorator.class differ diff --git a/out/production/classes/controller/managers/CryptoUserManagerDecorator.class b/out/production/classes/controller/managers/CryptoUserManagerDecorator.class new file mode 100644 index 00000000..334c853d Binary files /dev/null and b/out/production/classes/controller/managers/CryptoUserManagerDecorator.class differ diff --git a/out/production/classes/controller/managers/NetworkContractManagerDecorator$1$1.class b/out/production/classes/controller/managers/NetworkContractManagerDecorator$1$1.class new file mode 100644 index 00000000..181853b1 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkContractManagerDecorator$1$1.class differ diff --git a/out/production/classes/controller/managers/NetworkContractManagerDecorator$1.class b/out/production/classes/controller/managers/NetworkContractManagerDecorator$1.class new file mode 100644 index 00000000..eec6af83 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkContractManagerDecorator$1.class differ diff --git a/out/production/classes/controller/managers/NetworkContractManagerDecorator$2$1.class b/out/production/classes/controller/managers/NetworkContractManagerDecorator$2$1.class new file mode 100644 index 00000000..ecef8273 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkContractManagerDecorator$2$1.class differ diff --git a/out/production/classes/controller/managers/NetworkContractManagerDecorator$2.class b/out/production/classes/controller/managers/NetworkContractManagerDecorator$2.class new file mode 100644 index 00000000..85f692fd Binary files /dev/null and b/out/production/classes/controller/managers/NetworkContractManagerDecorator$2.class differ diff --git a/out/production/classes/controller/managers/NetworkContractManagerDecorator.class b/out/production/classes/controller/managers/NetworkContractManagerDecorator.class new file mode 100644 index 00000000..52f49ebf Binary files /dev/null and b/out/production/classes/controller/managers/NetworkContractManagerDecorator.class differ diff --git a/out/production/classes/controller/managers/NetworkItemManagerDecorator$1$1.class b/out/production/classes/controller/managers/NetworkItemManagerDecorator$1$1.class new file mode 100644 index 00000000..b9da4e54 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkItemManagerDecorator$1$1.class differ diff --git a/out/production/classes/controller/managers/NetworkItemManagerDecorator$1.class b/out/production/classes/controller/managers/NetworkItemManagerDecorator$1.class new file mode 100644 index 00000000..5eeb40d1 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkItemManagerDecorator$1.class differ diff --git a/out/production/classes/controller/managers/NetworkItemManagerDecorator$2.class b/out/production/classes/controller/managers/NetworkItemManagerDecorator$2.class new file mode 100644 index 00000000..ffc40cc6 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkItemManagerDecorator$2.class differ diff --git a/out/production/classes/controller/managers/NetworkItemManagerDecorator.class b/out/production/classes/controller/managers/NetworkItemManagerDecorator.class new file mode 100644 index 00000000..c9adc939 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkItemManagerDecorator.class differ diff --git a/out/production/classes/controller/managers/NetworkMessageManagerDecorator$1$1.class b/out/production/classes/controller/managers/NetworkMessageManagerDecorator$1$1.class new file mode 100644 index 00000000..88ab382a Binary files /dev/null and b/out/production/classes/controller/managers/NetworkMessageManagerDecorator$1$1.class differ diff --git a/out/production/classes/controller/managers/NetworkMessageManagerDecorator$1.class b/out/production/classes/controller/managers/NetworkMessageManagerDecorator$1.class new file mode 100644 index 00000000..1c7d994d Binary files /dev/null and b/out/production/classes/controller/managers/NetworkMessageManagerDecorator$1.class differ diff --git a/out/production/classes/controller/managers/NetworkMessageManagerDecorator$2.class b/out/production/classes/controller/managers/NetworkMessageManagerDecorator$2.class new file mode 100644 index 00000000..5ee58d1b Binary files /dev/null and b/out/production/classes/controller/managers/NetworkMessageManagerDecorator$2.class differ diff --git a/out/production/classes/controller/managers/NetworkMessageManagerDecorator.class b/out/production/classes/controller/managers/NetworkMessageManagerDecorator.class new file mode 100644 index 00000000..68849a4a Binary files /dev/null and b/out/production/classes/controller/managers/NetworkMessageManagerDecorator.class differ diff --git a/out/production/classes/controller/managers/NetworkUserManagerDecorator$1$1.class b/out/production/classes/controller/managers/NetworkUserManagerDecorator$1$1.class new file mode 100644 index 00000000..d6bb1ca1 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkUserManagerDecorator$1$1.class differ diff --git a/out/production/classes/controller/managers/NetworkUserManagerDecorator$1.class b/out/production/classes/controller/managers/NetworkUserManagerDecorator$1.class new file mode 100644 index 00000000..47d2a0c1 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkUserManagerDecorator$1.class differ diff --git a/out/production/classes/controller/managers/NetworkUserManagerDecorator$2.class b/out/production/classes/controller/managers/NetworkUserManagerDecorator$2.class new file mode 100644 index 00000000..3c70a672 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkUserManagerDecorator$2.class differ diff --git a/out/production/classes/controller/managers/NetworkUserManagerDecorator$3$1.class b/out/production/classes/controller/managers/NetworkUserManagerDecorator$3$1.class new file mode 100644 index 00000000..9e0ff87e Binary files /dev/null and b/out/production/classes/controller/managers/NetworkUserManagerDecorator$3$1.class differ diff --git a/out/production/classes/controller/managers/NetworkUserManagerDecorator$3.class b/out/production/classes/controller/managers/NetworkUserManagerDecorator$3.class new file mode 100644 index 00000000..4acf5500 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkUserManagerDecorator$3.class differ diff --git a/out/production/classes/controller/managers/NetworkUserManagerDecorator$4.class b/out/production/classes/controller/managers/NetworkUserManagerDecorator$4.class new file mode 100644 index 00000000..4212bd9f Binary files /dev/null and b/out/production/classes/controller/managers/NetworkUserManagerDecorator$4.class differ diff --git a/out/production/classes/controller/managers/NetworkUserManagerDecorator.class b/out/production/classes/controller/managers/NetworkUserManagerDecorator.class new file mode 100644 index 00000000..97b01097 Binary files /dev/null and b/out/production/classes/controller/managers/NetworkUserManagerDecorator.class differ diff --git a/out/production/classes/controller/managers/ResilienceContractManagerDecorator.class b/out/production/classes/controller/managers/ResilienceContractManagerDecorator.class new file mode 100644 index 00000000..fde0fe3f Binary files /dev/null and b/out/production/classes/controller/managers/ResilienceContractManagerDecorator.class differ diff --git a/out/production/classes/controller/managers/ResilienceItemManagerDecorator.class b/out/production/classes/controller/managers/ResilienceItemManagerDecorator.class new file mode 100644 index 00000000..f441cda7 Binary files /dev/null and b/out/production/classes/controller/managers/ResilienceItemManagerDecorator.class differ diff --git a/out/production/classes/controller/tools/BigIntegerDeserializer.class b/out/production/classes/controller/tools/BigIntegerDeserializer.class new file mode 100644 index 00000000..73f4800a Binary files /dev/null and b/out/production/classes/controller/tools/BigIntegerDeserializer.class differ diff --git a/out/production/classes/controller/tools/BigIntegerSerializer.class b/out/production/classes/controller/tools/BigIntegerSerializer.class new file mode 100644 index 00000000..59284f31 Binary files /dev/null and b/out/production/classes/controller/tools/BigIntegerSerializer.class differ diff --git a/out/production/classes/controller/tools/JsonTools.class b/out/production/classes/controller/tools/JsonTools.class new file mode 100644 index 00000000..0cbb91d5 Binary files /dev/null and b/out/production/classes/controller/tools/JsonTools.class differ diff --git a/out/production/classes/controller/tools/LoggerUtilities.class b/out/production/classes/controller/tools/LoggerUtilities.class new file mode 100644 index 00000000..8cb93f4b Binary files /dev/null and b/out/production/classes/controller/tools/LoggerUtilities.class differ diff --git a/out/production/classes/controller/tools/MapKeyStringDeserializer.class b/out/production/classes/controller/tools/MapKeyStringDeserializer.class new file mode 100644 index 00000000..18056b8d Binary files /dev/null and b/out/production/classes/controller/tools/MapKeyStringDeserializer.class differ diff --git a/out/production/classes/controller/tools/MapResponseKeyDeserializer.class b/out/production/classes/controller/tools/MapResponseKeyDeserializer.class new file mode 100644 index 00000000..9093e010 Binary files /dev/null and b/out/production/classes/controller/tools/MapResponseKeyDeserializer.class differ diff --git a/out/production/classes/controller/tools/MapSerializer.class b/out/production/classes/controller/tools/MapSerializer.class new file mode 100644 index 00000000..97bf3379 Binary files /dev/null and b/out/production/classes/controller/tools/MapSerializer.class differ diff --git a/out/production/classes/controller/tools/MapStringDeserializer.class b/out/production/classes/controller/tools/MapStringDeserializer.class new file mode 100644 index 00000000..3d569638 Binary files /dev/null and b/out/production/classes/controller/tools/MapStringDeserializer.class differ diff --git a/out/production/classes/crypt/CryptCommander.class b/out/production/classes/crypt/CryptCommander.class new file mode 100644 index 00000000..9b20d71e Binary files /dev/null and b/out/production/classes/crypt/CryptCommander.class differ diff --git a/out/production/classes/crypt/ElGamalEngineK.class b/out/production/classes/crypt/ElGamalEngineK.class new file mode 100644 index 00000000..c07ea470 Binary files /dev/null and b/out/production/classes/crypt/ElGamalEngineK.class differ diff --git a/out/production/classes/crypt/annotations/CryptCryptAnnotation.class b/out/production/classes/crypt/annotations/CryptCryptAnnotation.class new file mode 100644 index 00000000..8cf53f01 Binary files /dev/null and b/out/production/classes/crypt/annotations/CryptCryptAnnotation.class differ diff --git a/out/production/classes/crypt/annotations/CryptHashAnnotation.class b/out/production/classes/crypt/annotations/CryptHashAnnotation.class new file mode 100644 index 00000000..fd973279 Binary files /dev/null and b/out/production/classes/crypt/annotations/CryptHashAnnotation.class differ diff --git a/out/production/classes/crypt/annotations/CryptSigneAnnotation.class b/out/production/classes/crypt/annotations/CryptSigneAnnotation.class new file mode 100644 index 00000000..b79fe304 Binary files /dev/null and b/out/production/classes/crypt/annotations/CryptSigneAnnotation.class differ diff --git a/out/production/classes/crypt/api/annotation/ParserAction.class b/out/production/classes/crypt/api/annotation/ParserAction.class new file mode 100644 index 00000000..8d008065 Binary files /dev/null and b/out/production/classes/crypt/api/annotation/ParserAction.class differ diff --git a/out/production/classes/crypt/api/annotation/ParserAnnotation.class b/out/production/classes/crypt/api/annotation/ParserAnnotation.class new file mode 100644 index 00000000..6856ac77 Binary files /dev/null and b/out/production/classes/crypt/api/annotation/ParserAnnotation.class differ diff --git a/out/production/classes/crypt/api/certificate/CertificateGenerator.class b/out/production/classes/crypt/api/certificate/CertificateGenerator.class new file mode 100644 index 00000000..e779edf3 Binary files /dev/null and b/out/production/classes/crypt/api/certificate/CertificateGenerator.class differ diff --git a/out/production/classes/crypt/api/encryption/Encryptable.class b/out/production/classes/crypt/api/encryption/Encryptable.class new file mode 100644 index 00000000..32438b69 Binary files /dev/null and b/out/production/classes/crypt/api/encryption/Encryptable.class differ diff --git a/out/production/classes/crypt/api/encryption/Encrypter.class b/out/production/classes/crypt/api/encryption/Encrypter.class new file mode 100644 index 00000000..b65a2b6c Binary files /dev/null and b/out/production/classes/crypt/api/encryption/Encrypter.class differ diff --git a/out/production/classes/crypt/api/hashs/Hashable.class b/out/production/classes/crypt/api/hashs/Hashable.class new file mode 100644 index 00000000..6cf9b97f Binary files /dev/null and b/out/production/classes/crypt/api/hashs/Hashable.class differ diff --git a/out/production/classes/crypt/api/hashs/Hasher.class b/out/production/classes/crypt/api/hashs/Hasher.class new file mode 100644 index 00000000..79eaf3dc Binary files /dev/null and b/out/production/classes/crypt/api/hashs/Hasher.class differ diff --git a/out/production/classes/crypt/api/key/AsymKey.class b/out/production/classes/crypt/api/key/AsymKey.class new file mode 100644 index 00000000..30a3feb8 Binary files /dev/null and b/out/production/classes/crypt/api/key/AsymKey.class differ diff --git a/out/production/classes/crypt/api/signatures/ParamName.class b/out/production/classes/crypt/api/signatures/ParamName.class new file mode 100644 index 00000000..42cbcc6c Binary files /dev/null and b/out/production/classes/crypt/api/signatures/ParamName.class differ diff --git a/out/production/classes/crypt/api/signatures/Signable.class b/out/production/classes/crypt/api/signatures/Signable.class new file mode 100644 index 00000000..5a728819 Binary files /dev/null and b/out/production/classes/crypt/api/signatures/Signable.class differ diff --git a/out/production/classes/crypt/api/signatures/Signature.class b/out/production/classes/crypt/api/signatures/Signature.class new file mode 100644 index 00000000..19561db6 Binary files /dev/null and b/out/production/classes/crypt/api/signatures/Signature.class differ diff --git a/out/production/classes/crypt/api/signatures/Signer.class b/out/production/classes/crypt/api/signatures/Signer.class new file mode 100644 index 00000000..ef2459a4 Binary files /dev/null and b/out/production/classes/crypt/api/signatures/Signer.class differ diff --git a/out/production/classes/crypt/base/AbstractAsymKey.class b/out/production/classes/crypt/base/AbstractAsymKey.class new file mode 100644 index 00000000..89031449 Binary files /dev/null and b/out/production/classes/crypt/base/AbstractAsymKey.class differ diff --git a/out/production/classes/crypt/base/AbstractHasher.class b/out/production/classes/crypt/base/AbstractHasher.class new file mode 100644 index 00000000..46afd123 Binary files /dev/null and b/out/production/classes/crypt/base/AbstractHasher.class differ diff --git a/out/production/classes/crypt/base/AbstractSigner.class b/out/production/classes/crypt/base/AbstractSigner.class new file mode 100644 index 00000000..fb816293 Binary files /dev/null and b/out/production/classes/crypt/base/AbstractSigner.class differ diff --git a/out/production/classes/crypt/base/BaseSignature.class b/out/production/classes/crypt/base/BaseSignature.class new file mode 100644 index 00000000..c8b59037 Binary files /dev/null and b/out/production/classes/crypt/base/BaseSignature.class differ diff --git a/out/production/classes/crypt/factories/AsymKeyFactory.class b/out/production/classes/crypt/factories/AsymKeyFactory.class new file mode 100644 index 00000000..040ec148 Binary files /dev/null and b/out/production/classes/crypt/factories/AsymKeyFactory.class differ diff --git a/out/production/classes/crypt/factories/ElGamalAsymKeyFactory.class b/out/production/classes/crypt/factories/ElGamalAsymKeyFactory.class new file mode 100644 index 00000000..616e68a6 Binary files /dev/null and b/out/production/classes/crypt/factories/ElGamalAsymKeyFactory.class differ diff --git a/out/production/classes/crypt/factories/EncrypterFactory.class b/out/production/classes/crypt/factories/EncrypterFactory.class new file mode 100644 index 00000000..492809c8 Binary files /dev/null and b/out/production/classes/crypt/factories/EncrypterFactory.class differ diff --git a/out/production/classes/crypt/factories/HasherFactory.class b/out/production/classes/crypt/factories/HasherFactory.class new file mode 100644 index 00000000..d1eb0226 Binary files /dev/null and b/out/production/classes/crypt/factories/HasherFactory.class differ diff --git a/out/production/classes/crypt/factories/ParserFactory.class b/out/production/classes/crypt/factories/ParserFactory.class new file mode 100644 index 00000000..c8e95159 Binary files /dev/null and b/out/production/classes/crypt/factories/ParserFactory.class differ diff --git a/out/production/classes/crypt/factories/SignerFactory.class b/out/production/classes/crypt/factories/SignerFactory.class new file mode 100644 index 00000000..e86e07a4 Binary files /dev/null and b/out/production/classes/crypt/factories/SignerFactory.class differ diff --git a/out/production/classes/crypt/impl/certificate/X509V3Generator.class b/out/production/classes/crypt/impl/certificate/X509V3Generator.class new file mode 100644 index 00000000..32334fe4 Binary files /dev/null and b/out/production/classes/crypt/impl/certificate/X509V3Generator.class differ diff --git a/out/production/classes/crypt/impl/encryption/ElGamalEncrypter.class b/out/production/classes/crypt/impl/encryption/ElGamalEncrypter.class new file mode 100644 index 00000000..c7fb7624 Binary files /dev/null and b/out/production/classes/crypt/impl/encryption/ElGamalEncrypter.class differ diff --git a/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$1.class b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$1.class new file mode 100644 index 00000000..a8c5fc51 Binary files /dev/null and b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$1.class differ diff --git a/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$2.class b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$2.class new file mode 100644 index 00000000..06188f96 Binary files /dev/null and b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$2.class differ diff --git a/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$3.class b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$3.class new file mode 100644 index 00000000..37c432ff Binary files /dev/null and b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$3.class differ diff --git a/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$4.class b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$4.class new file mode 100644 index 00000000..ac6a3ffe Binary files /dev/null and b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter$4.class differ diff --git a/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter.class b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter.class new file mode 100644 index 00000000..e2e96d76 Binary files /dev/null and b/out/production/classes/crypt/impl/encryption/ElGamalSerpentEncrypter.class differ diff --git a/out/production/classes/crypt/impl/encryption/SerpentEncrypter.class b/out/production/classes/crypt/impl/encryption/SerpentEncrypter.class new file mode 100644 index 00000000..056d16fc Binary files /dev/null and b/out/production/classes/crypt/impl/encryption/SerpentEncrypter.class differ diff --git a/out/production/classes/crypt/impl/hashs/SHA256Hasher.class b/out/production/classes/crypt/impl/hashs/SHA256Hasher.class new file mode 100644 index 00000000..84434028 Binary files /dev/null and b/out/production/classes/crypt/impl/hashs/SHA256Hasher.class differ diff --git a/out/production/classes/crypt/impl/key/ElGamalAsymKey.class b/out/production/classes/crypt/impl/key/ElGamalAsymKey.class new file mode 100644 index 00000000..04a934a8 Binary files /dev/null and b/out/production/classes/crypt/impl/key/ElGamalAsymKey.class differ diff --git a/out/production/classes/crypt/impl/signatures/ElGamalSignature.class b/out/production/classes/crypt/impl/signatures/ElGamalSignature.class new file mode 100644 index 00000000..9ce1028f Binary files /dev/null and b/out/production/classes/crypt/impl/signatures/ElGamalSignature.class differ diff --git a/out/production/classes/crypt/impl/signatures/ElGamalSigner.class b/out/production/classes/crypt/impl/signatures/ElGamalSigner.class new file mode 100644 index 00000000..e645e2b6 Binary files /dev/null and b/out/production/classes/crypt/impl/signatures/ElGamalSigner.class differ diff --git a/out/production/classes/crypt/impl/signatures/SigmaSigner.class b/out/production/classes/crypt/impl/signatures/SigmaSigner.class new file mode 100644 index 00000000..fab1e368 Binary files /dev/null and b/out/production/classes/crypt/impl/signatures/SigmaSigner.class differ diff --git a/out/production/classes/crypt/utils/AbstractParser.class b/out/production/classes/crypt/utils/AbstractParser.class new file mode 100644 index 00000000..96f4ffba Binary files /dev/null and b/out/production/classes/crypt/utils/AbstractParser.class differ diff --git a/out/production/classes/crypt/utils/BigIntegerRandom.class b/out/production/classes/crypt/utils/BigIntegerRandom.class new file mode 100644 index 00000000..c7145ea6 Binary files /dev/null and b/out/production/classes/crypt/utils/BigIntegerRandom.class differ diff --git a/out/production/classes/crypt/utils/CryptoParser$1.class b/out/production/classes/crypt/utils/CryptoParser$1.class new file mode 100644 index 00000000..5e19bcfa Binary files /dev/null and b/out/production/classes/crypt/utils/CryptoParser$1.class differ diff --git a/out/production/classes/crypt/utils/CryptoParser.class b/out/production/classes/crypt/utils/CryptoParser.class new file mode 100644 index 00000000..076aa53a Binary files /dev/null and b/out/production/classes/crypt/utils/CryptoParser.class differ diff --git a/out/production/classes/model/api/ContractSyncManager.class b/out/production/classes/model/api/ContractSyncManager.class new file mode 100644 index 00000000..17de90e0 Binary files /dev/null and b/out/production/classes/model/api/ContractSyncManager.class differ diff --git a/out/production/classes/model/api/EntityValidation.class b/out/production/classes/model/api/EntityValidation.class new file mode 100644 index 00000000..430f4726 Binary files /dev/null and b/out/production/classes/model/api/EntityValidation.class differ diff --git a/out/production/classes/model/api/EstablisherType.class b/out/production/classes/model/api/EstablisherType.class new file mode 100644 index 00000000..b5dc675f Binary files /dev/null and b/out/production/classes/model/api/EstablisherType.class differ diff --git a/out/production/classes/model/api/ItemSyncManager.class b/out/production/classes/model/api/ItemSyncManager.class new file mode 100644 index 00000000..ed73904a Binary files /dev/null and b/out/production/classes/model/api/ItemSyncManager.class differ diff --git a/out/production/classes/model/api/Manager.class b/out/production/classes/model/api/Manager.class new file mode 100644 index 00000000..5cd8ada6 Binary files /dev/null and b/out/production/classes/model/api/Manager.class differ diff --git a/out/production/classes/model/api/ManagerDecorator.class b/out/production/classes/model/api/ManagerDecorator.class new file mode 100644 index 00000000..5392a9b5 Binary files /dev/null and b/out/production/classes/model/api/ManagerDecorator.class differ diff --git a/out/production/classes/model/api/ManagerListener.class b/out/production/classes/model/api/ManagerListener.class new file mode 100644 index 00000000..f377474f Binary files /dev/null and b/out/production/classes/model/api/ManagerListener.class differ diff --git a/out/production/classes/model/api/MessageSyncManager.class b/out/production/classes/model/api/MessageSyncManager.class new file mode 100644 index 00000000..2bb474bc Binary files /dev/null and b/out/production/classes/model/api/MessageSyncManager.class differ diff --git a/out/production/classes/model/api/Status.class b/out/production/classes/model/api/Status.class new file mode 100644 index 00000000..480c492c Binary files /dev/null and b/out/production/classes/model/api/Status.class differ diff --git a/out/production/classes/model/api/SyncManager.class b/out/production/classes/model/api/SyncManager.class new file mode 100644 index 00000000..3cc95d77 Binary files /dev/null and b/out/production/classes/model/api/SyncManager.class differ diff --git a/out/production/classes/model/api/UserSyncManager.class b/out/production/classes/model/api/UserSyncManager.class new file mode 100644 index 00000000..64a067c4 Binary files /dev/null and b/out/production/classes/model/api/UserSyncManager.class differ diff --git a/out/production/classes/model/api/Wish.class b/out/production/classes/model/api/Wish.class new file mode 100644 index 00000000..4c6149a4 Binary files /dev/null and b/out/production/classes/model/api/Wish.class differ diff --git a/out/production/classes/model/entity/ContractEntity.class b/out/production/classes/model/entity/ContractEntity.class new file mode 100644 index 00000000..6a5f20ab Binary files /dev/null and b/out/production/classes/model/entity/ContractEntity.class differ diff --git a/out/production/classes/model/entity/ElGamalKey.class b/out/production/classes/model/entity/ElGamalKey.class new file mode 100644 index 00000000..233cfb3e Binary files /dev/null and b/out/production/classes/model/entity/ElGamalKey.class differ diff --git a/out/production/classes/model/entity/ElGamalSignEntity.class b/out/production/classes/model/entity/ElGamalSignEntity.class new file mode 100644 index 00000000..0a517de1 Binary files /dev/null and b/out/production/classes/model/entity/ElGamalSignEntity.class differ diff --git a/out/production/classes/model/entity/Item.class b/out/production/classes/model/entity/Item.class new file mode 100644 index 00000000..e8e4e33b Binary files /dev/null and b/out/production/classes/model/entity/Item.class differ diff --git a/out/production/classes/model/entity/LoginToken.class b/out/production/classes/model/entity/LoginToken.class new file mode 100644 index 00000000..42492e04 Binary files /dev/null and b/out/production/classes/model/entity/LoginToken.class differ diff --git a/out/production/classes/model/entity/Message$ReceptionStatus.class b/out/production/classes/model/entity/Message$ReceptionStatus.class new file mode 100644 index 00000000..036d81eb Binary files /dev/null and b/out/production/classes/model/entity/Message$ReceptionStatus.class differ diff --git a/out/production/classes/model/entity/Message.class b/out/production/classes/model/entity/Message.class new file mode 100644 index 00000000..5f5b9227 Binary files /dev/null and b/out/production/classes/model/entity/Message.class differ diff --git a/out/production/classes/model/entity/User.class b/out/production/classes/model/entity/User.class new file mode 100644 index 00000000..0bdab3e4 Binary files /dev/null and b/out/production/classes/model/entity/User.class differ diff --git a/out/production/classes/model/entity/sigma/And.class b/out/production/classes/model/entity/sigma/And.class new file mode 100644 index 00000000..68ab732a Binary files /dev/null and b/out/production/classes/model/entity/sigma/And.class differ diff --git a/out/production/classes/model/entity/sigma/Masks.class b/out/production/classes/model/entity/sigma/Masks.class new file mode 100644 index 00000000..897d3852 Binary files /dev/null and b/out/production/classes/model/entity/sigma/Masks.class differ diff --git a/out/production/classes/model/entity/sigma/Or.class b/out/production/classes/model/entity/sigma/Or.class new file mode 100644 index 00000000..1e03bef1 Binary files /dev/null and b/out/production/classes/model/entity/sigma/Or.class differ diff --git a/out/production/classes/model/entity/sigma/ResEncrypt.class b/out/production/classes/model/entity/sigma/ResEncrypt.class new file mode 100644 index 00000000..ae39ff8f Binary files /dev/null and b/out/production/classes/model/entity/sigma/ResEncrypt.class differ diff --git a/out/production/classes/model/entity/sigma/Responses.class b/out/production/classes/model/entity/sigma/Responses.class new file mode 100644 index 00000000..e182d345 Binary files /dev/null and b/out/production/classes/model/entity/sigma/Responses.class differ diff --git a/out/production/classes/model/entity/sigma/ResponsesCCD.class b/out/production/classes/model/entity/sigma/ResponsesCCD.class new file mode 100644 index 00000000..52a7489e Binary files /dev/null and b/out/production/classes/model/entity/sigma/ResponsesCCD.class differ diff --git a/out/production/classes/model/entity/sigma/ResponsesCCE.class b/out/production/classes/model/entity/sigma/ResponsesCCE.class new file mode 100644 index 00000000..8c096a9f Binary files /dev/null and b/out/production/classes/model/entity/sigma/ResponsesCCE.class differ diff --git a/out/production/classes/model/entity/sigma/ResponsesSchnorr.class b/out/production/classes/model/entity/sigma/ResponsesSchnorr.class new file mode 100644 index 00000000..9af9745e Binary files /dev/null and b/out/production/classes/model/entity/sigma/ResponsesSchnorr.class differ diff --git a/out/production/classes/model/entity/sigma/SigmaSignature$1.class b/out/production/classes/model/entity/sigma/SigmaSignature$1.class new file mode 100644 index 00000000..eff05a71 Binary files /dev/null and b/out/production/classes/model/entity/sigma/SigmaSignature$1.class differ diff --git a/out/production/classes/model/entity/sigma/SigmaSignature$2.class b/out/production/classes/model/entity/sigma/SigmaSignature$2.class new file mode 100644 index 00000000..ea7d0a67 Binary files /dev/null and b/out/production/classes/model/entity/sigma/SigmaSignature$2.class differ diff --git a/out/production/classes/model/entity/sigma/SigmaSignature$3.class b/out/production/classes/model/entity/sigma/SigmaSignature$3.class new file mode 100644 index 00000000..d2a1c458 Binary files /dev/null and b/out/production/classes/model/entity/sigma/SigmaSignature$3.class differ diff --git a/out/production/classes/model/entity/sigma/SigmaSignature.class b/out/production/classes/model/entity/sigma/SigmaSignature.class new file mode 100644 index 00000000..ab25f6e0 Binary files /dev/null and b/out/production/classes/model/entity/sigma/SigmaSignature.class differ diff --git a/out/production/classes/model/factory/ManagerFactory.class b/out/production/classes/model/factory/ManagerFactory.class new file mode 100644 index 00000000..3baea766 Binary files /dev/null and b/out/production/classes/model/factory/ManagerFactory.class differ diff --git a/out/production/classes/model/factory/SyncManagerFactory.class b/out/production/classes/model/factory/SyncManagerFactory.class new file mode 100644 index 00000000..9ac44121 Binary files /dev/null and b/out/production/classes/model/factory/SyncManagerFactory.class differ diff --git a/out/production/classes/model/factory/ValidatorFactory.class b/out/production/classes/model/factory/ValidatorFactory.class new file mode 100644 index 00000000..8ac49456 Binary files /dev/null and b/out/production/classes/model/factory/ValidatorFactory.class differ diff --git a/out/production/classes/model/manager/ManagerAdapter.class b/out/production/classes/model/manager/ManagerAdapter.class new file mode 100644 index 00000000..44623912 Binary files /dev/null and b/out/production/classes/model/manager/ManagerAdapter.class differ diff --git a/out/production/classes/model/syncManager/AbstractSyncManager.class b/out/production/classes/model/syncManager/AbstractSyncManager.class new file mode 100644 index 00000000..1726b365 Binary files /dev/null and b/out/production/classes/model/syncManager/AbstractSyncManager.class differ diff --git a/out/production/classes/model/syncManager/ContractSyncManagerImpl.class b/out/production/classes/model/syncManager/ContractSyncManagerImpl.class new file mode 100644 index 00000000..276cfaaa Binary files /dev/null and b/out/production/classes/model/syncManager/ContractSyncManagerImpl.class differ diff --git a/out/production/classes/model/syncManager/ItemSyncManagerImpl.class b/out/production/classes/model/syncManager/ItemSyncManagerImpl.class new file mode 100644 index 00000000..44235f6e Binary files /dev/null and b/out/production/classes/model/syncManager/ItemSyncManagerImpl.class differ diff --git a/out/production/classes/model/syncManager/MessageSyncManagerImpl.class b/out/production/classes/model/syncManager/MessageSyncManagerImpl.class new file mode 100644 index 00000000..6ad14317 Binary files /dev/null and b/out/production/classes/model/syncManager/MessageSyncManagerImpl.class differ diff --git a/out/production/classes/model/syncManager/UserSyncManagerImpl.class b/out/production/classes/model/syncManager/UserSyncManagerImpl.class new file mode 100644 index 00000000..f3dddcad Binary files /dev/null and b/out/production/classes/model/syncManager/UserSyncManagerImpl.class differ diff --git a/out/production/classes/model/validator/ContractValidator.class b/out/production/classes/model/validator/ContractValidator.class new file mode 100644 index 00000000..23676917 Binary files /dev/null and b/out/production/classes/model/validator/ContractValidator.class differ diff --git a/out/production/classes/model/validator/EntityValidator.class b/out/production/classes/model/validator/EntityValidator.class new file mode 100644 index 00000000..d4511779 Binary files /dev/null and b/out/production/classes/model/validator/EntityValidator.class differ diff --git a/out/production/classes/model/validator/ItemValidator.class b/out/production/classes/model/validator/ItemValidator.class new file mode 100644 index 00000000..2560d0ec Binary files /dev/null and b/out/production/classes/model/validator/ItemValidator.class differ diff --git a/out/production/classes/model/validator/MessageValidator.class b/out/production/classes/model/validator/MessageValidator.class new file mode 100644 index 00000000..6d29858c Binary files /dev/null and b/out/production/classes/model/validator/MessageValidator.class differ diff --git a/out/production/classes/model/validator/UserValidator.class b/out/production/classes/model/validator/UserValidator.class new file mode 100644 index 00000000..ae92f554 Binary files /dev/null and b/out/production/classes/model/validator/UserValidator.class differ diff --git a/out/production/classes/network/api/EstablisherService.class b/out/production/classes/network/api/EstablisherService.class new file mode 100644 index 00000000..57bae8a9 Binary files /dev/null and b/out/production/classes/network/api/EstablisherService.class differ diff --git a/out/production/classes/network/api/EstablisherServiceListener.class b/out/production/classes/network/api/EstablisherServiceListener.class new file mode 100644 index 00000000..97f2e4bd Binary files /dev/null and b/out/production/classes/network/api/EstablisherServiceListener.class differ diff --git a/out/production/classes/network/api/ItemRequestService.class b/out/production/classes/network/api/ItemRequestService.class new file mode 100644 index 00000000..70d509a1 Binary files /dev/null and b/out/production/classes/network/api/ItemRequestService.class differ diff --git a/out/production/classes/network/api/ItemService.class b/out/production/classes/network/api/ItemService.class new file mode 100644 index 00000000..49070017 Binary files /dev/null and b/out/production/classes/network/api/ItemService.class differ diff --git a/out/production/classes/network/api/MessageRequestService.class b/out/production/classes/network/api/MessageRequestService.class new file mode 100644 index 00000000..96880031 Binary files /dev/null and b/out/production/classes/network/api/MessageRequestService.class differ diff --git a/out/production/classes/network/api/MessageService.class b/out/production/classes/network/api/MessageService.class new file mode 100644 index 00000000..486660f4 Binary files /dev/null and b/out/production/classes/network/api/MessageService.class differ diff --git a/out/production/classes/network/api/Messages.class b/out/production/classes/network/api/Messages.class new file mode 100644 index 00000000..dd2a4d06 Binary files /dev/null and b/out/production/classes/network/api/Messages.class differ diff --git a/out/production/classes/network/api/Node.class b/out/production/classes/network/api/Node.class new file mode 100644 index 00000000..e3a3bb49 Binary files /dev/null and b/out/production/classes/network/api/Node.class differ diff --git a/out/production/classes/network/api/Peer.class b/out/production/classes/network/api/Peer.class new file mode 100644 index 00000000..eda9976a Binary files /dev/null and b/out/production/classes/network/api/Peer.class differ diff --git a/out/production/classes/network/api/Search.class b/out/production/classes/network/api/Search.class new file mode 100644 index 00000000..edd894a0 Binary files /dev/null and b/out/production/classes/network/api/Search.class differ diff --git a/out/production/classes/network/api/SearchListener.class b/out/production/classes/network/api/SearchListener.class new file mode 100644 index 00000000..7a61d8cd Binary files /dev/null and b/out/production/classes/network/api/SearchListener.class differ diff --git a/out/production/classes/network/api/ServiceListener.class b/out/production/classes/network/api/ServiceListener.class new file mode 100644 index 00000000..bdb0f656 Binary files /dev/null and b/out/production/classes/network/api/ServiceListener.class differ diff --git a/out/production/classes/network/api/UserRequestService.class b/out/production/classes/network/api/UserRequestService.class new file mode 100644 index 00000000..a6d25a76 Binary files /dev/null and b/out/production/classes/network/api/UserRequestService.class differ diff --git a/out/production/classes/network/api/UserService.class b/out/production/classes/network/api/UserService.class new file mode 100644 index 00000000..5f52e6d9 Binary files /dev/null and b/out/production/classes/network/api/UserService.class differ diff --git a/out/production/classes/network/api/advertisement/Advertisement.class b/out/production/classes/network/api/advertisement/Advertisement.class new file mode 100644 index 00000000..264f8ecf Binary files /dev/null and b/out/production/classes/network/api/advertisement/Advertisement.class differ diff --git a/out/production/classes/network/api/advertisement/EstablisherAdvertisementInterface.class b/out/production/classes/network/api/advertisement/EstablisherAdvertisementInterface.class new file mode 100644 index 00000000..4742730a Binary files /dev/null and b/out/production/classes/network/api/advertisement/EstablisherAdvertisementInterface.class differ diff --git a/out/production/classes/network/api/advertisement/ItemAdvertisementInterface.class b/out/production/classes/network/api/advertisement/ItemAdvertisementInterface.class new file mode 100644 index 00000000..78713721 Binary files /dev/null and b/out/production/classes/network/api/advertisement/ItemAdvertisementInterface.class differ diff --git a/out/production/classes/network/api/advertisement/MessageAdvertisementInterface.class b/out/production/classes/network/api/advertisement/MessageAdvertisementInterface.class new file mode 100644 index 00000000..1561c764 Binary files /dev/null and b/out/production/classes/network/api/advertisement/MessageAdvertisementInterface.class differ diff --git a/out/production/classes/network/api/advertisement/PeerAdvertisementInterface.class b/out/production/classes/network/api/advertisement/PeerAdvertisementInterface.class new file mode 100644 index 00000000..00de6c3c Binary files /dev/null and b/out/production/classes/network/api/advertisement/PeerAdvertisementInterface.class differ diff --git a/out/production/classes/network/api/advertisement/UserAdvertisementInterface.class b/out/production/classes/network/api/advertisement/UserAdvertisementInterface.class new file mode 100644 index 00000000..a15fffc6 Binary files /dev/null and b/out/production/classes/network/api/advertisement/UserAdvertisementInterface.class differ diff --git a/out/production/classes/network/api/annotation/AdvertisementAttribute.class b/out/production/classes/network/api/annotation/AdvertisementAttribute.class new file mode 100644 index 00000000..e68a4eb4 Binary files /dev/null and b/out/production/classes/network/api/annotation/AdvertisementAttribute.class differ diff --git a/out/production/classes/network/api/annotation/MessageElement.class b/out/production/classes/network/api/annotation/MessageElement.class new file mode 100644 index 00000000..1235a2c1 Binary files /dev/null and b/out/production/classes/network/api/annotation/MessageElement.class differ diff --git a/out/production/classes/network/api/annotation/ServiceName.class b/out/production/classes/network/api/annotation/ServiceName.class new file mode 100644 index 00000000..b8e82005 Binary files /dev/null and b/out/production/classes/network/api/annotation/ServiceName.class differ diff --git a/out/production/classes/network/api/service/InvalidServiceException.class b/out/production/classes/network/api/service/InvalidServiceException.class new file mode 100644 index 00000000..4ec9ef7d Binary files /dev/null and b/out/production/classes/network/api/service/InvalidServiceException.class differ diff --git a/out/production/classes/network/api/service/Service.class b/out/production/classes/network/api/service/Service.class new file mode 100644 index 00000000..7df03a7b Binary files /dev/null and b/out/production/classes/network/api/service/Service.class differ diff --git a/out/production/classes/network/factories/AdvertisementFactory.class b/out/production/classes/network/factories/AdvertisementFactory.class new file mode 100644 index 00000000..56473ad9 Binary files /dev/null and b/out/production/classes/network/factories/AdvertisementFactory.class differ diff --git a/out/production/classes/network/factories/PeerFactory.class b/out/production/classes/network/factories/PeerFactory.class new file mode 100644 index 00000000..75945e4f Binary files /dev/null and b/out/production/classes/network/factories/PeerFactory.class differ diff --git a/out/production/classes/network/factories/ServiceFactory.class b/out/production/classes/network/factories/ServiceFactory.class new file mode 100644 index 00000000..6577f764 Binary files /dev/null and b/out/production/classes/network/factories/ServiceFactory.class differ diff --git a/out/production/classes/network/impl/AbstractAdvertisement.class b/out/production/classes/network/impl/AbstractAdvertisement.class new file mode 100644 index 00000000..e595abb8 Binary files /dev/null and b/out/production/classes/network/impl/AbstractAdvertisement.class differ diff --git a/out/production/classes/network/impl/MessagesGeneric.class b/out/production/classes/network/impl/MessagesGeneric.class new file mode 100644 index 00000000..c616e177 Binary files /dev/null and b/out/production/classes/network/impl/MessagesGeneric.class differ diff --git a/out/production/classes/network/impl/MessagesImpl.class b/out/production/classes/network/impl/MessagesImpl.class new file mode 100644 index 00000000..8af9088e Binary files /dev/null and b/out/production/classes/network/impl/MessagesImpl.class differ diff --git a/out/production/classes/network/impl/advertisement/EstablisherAdvertisement.class b/out/production/classes/network/impl/advertisement/EstablisherAdvertisement.class new file mode 100644 index 00000000..f619738c Binary files /dev/null and b/out/production/classes/network/impl/advertisement/EstablisherAdvertisement.class differ diff --git a/out/production/classes/network/impl/advertisement/ItemAdvertisement.class b/out/production/classes/network/impl/advertisement/ItemAdvertisement.class new file mode 100644 index 00000000..339d8ee4 Binary files /dev/null and b/out/production/classes/network/impl/advertisement/ItemAdvertisement.class differ diff --git a/out/production/classes/network/impl/advertisement/MessageAdvertisement.class b/out/production/classes/network/impl/advertisement/MessageAdvertisement.class new file mode 100644 index 00000000..7aae14c2 Binary files /dev/null and b/out/production/classes/network/impl/advertisement/MessageAdvertisement.class differ diff --git a/out/production/classes/network/impl/advertisement/PeerAdvertisement.class b/out/production/classes/network/impl/advertisement/PeerAdvertisement.class new file mode 100644 index 00000000..9b9ba7b0 Binary files /dev/null and b/out/production/classes/network/impl/advertisement/PeerAdvertisement.class differ diff --git a/out/production/classes/network/impl/advertisement/UserAdvertisement.class b/out/production/classes/network/impl/advertisement/UserAdvertisement.class new file mode 100644 index 00000000..91e5c2ad Binary files /dev/null and b/out/production/classes/network/impl/advertisement/UserAdvertisement.class differ diff --git a/out/production/classes/network/impl/jxta/AdvertisementBridge.class b/out/production/classes/network/impl/jxta/AdvertisementBridge.class new file mode 100644 index 00000000..681966e7 Binary files /dev/null and b/out/production/classes/network/impl/jxta/AdvertisementBridge.class differ diff --git a/out/production/classes/network/impl/jxta/AdvertisementInstanciator.class b/out/production/classes/network/impl/jxta/AdvertisementInstanciator.class new file mode 100644 index 00000000..5ad9774b Binary files /dev/null and b/out/production/classes/network/impl/jxta/AdvertisementInstanciator.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaAdvertisement.class b/out/production/classes/network/impl/jxta/JxtaAdvertisement.class new file mode 100644 index 00000000..1867b932 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaAdvertisement.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaEstablisherService$1.class b/out/production/classes/network/impl/jxta/JxtaEstablisherService$1.class new file mode 100644 index 00000000..d1946107 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaEstablisherService$1.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaEstablisherService$2.class b/out/production/classes/network/impl/jxta/JxtaEstablisherService$2.class new file mode 100644 index 00000000..614d0a85 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaEstablisherService$2.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaEstablisherService$3.class b/out/production/classes/network/impl/jxta/JxtaEstablisherService$3.class new file mode 100644 index 00000000..1703b31d Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaEstablisherService$3.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaEstablisherService$ListenerWithParam.class b/out/production/classes/network/impl/jxta/JxtaEstablisherService$ListenerWithParam.class new file mode 100644 index 00000000..981dd559 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaEstablisherService$ListenerWithParam.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaEstablisherService.class b/out/production/classes/network/impl/jxta/JxtaEstablisherService.class new file mode 100644 index 00000000..888dd4c8 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaEstablisherService.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaItemService.class b/out/production/classes/network/impl/jxta/JxtaItemService.class new file mode 100644 index 00000000..7eae827f Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaItemService.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaItemsSenderService$1.class b/out/production/classes/network/impl/jxta/JxtaItemsSenderService$1.class new file mode 100644 index 00000000..1383bd17 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaItemsSenderService$1.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaItemsSenderService.class b/out/production/classes/network/impl/jxta/JxtaItemsSenderService.class new file mode 100644 index 00000000..aa4cf8d7 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaItemsSenderService.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaMessageSenderService$1.class b/out/production/classes/network/impl/jxta/JxtaMessageSenderService$1.class new file mode 100644 index 00000000..0aa1d6ec Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaMessageSenderService$1.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaMessageSenderService.class b/out/production/classes/network/impl/jxta/JxtaMessageSenderService.class new file mode 100644 index 00000000..f61f850a Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaMessageSenderService.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaMessageService.class b/out/production/classes/network/impl/jxta/JxtaMessageService.class new file mode 100644 index 00000000..5006a8ca Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaMessageService.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaNode.class b/out/production/classes/network/impl/jxta/JxtaNode.class new file mode 100644 index 00000000..bdb4910e Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaNode.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaPeer.class b/out/production/classes/network/impl/jxta/JxtaPeer.class new file mode 100644 index 00000000..2fa24b65 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaPeer.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaService.class b/out/production/classes/network/impl/jxta/JxtaService.class new file mode 100644 index 00000000..d0988e15 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaService.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaSyncSearch.class b/out/production/classes/network/impl/jxta/JxtaSyncSearch.class new file mode 100644 index 00000000..6a0a5078 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaSyncSearch.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaUserService.class b/out/production/classes/network/impl/jxta/JxtaUserService.class new file mode 100644 index 00000000..01aab33f Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaUserService.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaUsersSenderService$1.class b/out/production/classes/network/impl/jxta/JxtaUsersSenderService$1.class new file mode 100644 index 00000000..09c921e2 Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaUsersSenderService$1.class differ diff --git a/out/production/classes/network/impl/jxta/JxtaUsersSenderService.class b/out/production/classes/network/impl/jxta/JxtaUsersSenderService.class new file mode 100644 index 00000000..2a6a22fa Binary files /dev/null and b/out/production/classes/network/impl/jxta/JxtaUsersSenderService.class differ diff --git a/out/production/classes/network/impl/messages/EstablisherMessage.class b/out/production/classes/network/impl/messages/EstablisherMessage.class new file mode 100644 index 00000000..cc4b46f1 Binary files /dev/null and b/out/production/classes/network/impl/messages/EstablisherMessage.class differ diff --git a/out/production/classes/network/impl/messages/RequestItemMessage.class b/out/production/classes/network/impl/messages/RequestItemMessage.class new file mode 100644 index 00000000..9c8bff14 Binary files /dev/null and b/out/production/classes/network/impl/messages/RequestItemMessage.class differ diff --git a/out/production/classes/network/impl/messages/RequestMessageUserMessage.class b/out/production/classes/network/impl/messages/RequestMessageUserMessage.class new file mode 100644 index 00000000..8705cd7c Binary files /dev/null and b/out/production/classes/network/impl/messages/RequestMessageUserMessage.class differ diff --git a/out/production/classes/network/impl/messages/RequestUserMessage.class b/out/production/classes/network/impl/messages/RequestUserMessage.class new file mode 100644 index 00000000..b88d90d6 Binary files /dev/null and b/out/production/classes/network/impl/messages/RequestUserMessage.class differ diff --git a/out/production/classes/network/utils/IpChecker.class b/out/production/classes/network/utils/IpChecker.class new file mode 100644 index 00000000..d12e70f3 Binary files /dev/null and b/out/production/classes/network/utils/IpChecker.class differ diff --git a/out/production/classes/protocol/api/Establisher.class b/out/production/classes/protocol/api/Establisher.class new file mode 100644 index 00000000..021a6baf Binary files /dev/null and b/out/production/classes/protocol/api/Establisher.class differ diff --git a/out/production/classes/protocol/api/EstablisherContract.class b/out/production/classes/protocol/api/EstablisherContract.class new file mode 100644 index 00000000..774920cd Binary files /dev/null and b/out/production/classes/protocol/api/EstablisherContract.class differ diff --git a/out/production/classes/protocol/api/EstablisherListener.class b/out/production/classes/protocol/api/EstablisherListener.class new file mode 100644 index 00000000..7cd9d35d Binary files /dev/null and b/out/production/classes/protocol/api/EstablisherListener.class differ diff --git a/out/production/classes/protocol/impl/SigmaEstablisher$1.class b/out/production/classes/protocol/impl/SigmaEstablisher$1.class new file mode 100644 index 00000000..f234a2f5 Binary files /dev/null and b/out/production/classes/protocol/impl/SigmaEstablisher$1.class differ diff --git a/out/production/classes/protocol/impl/SigmaEstablisher.class b/out/production/classes/protocol/impl/SigmaEstablisher.class new file mode 100644 index 00000000..343b4da1 Binary files /dev/null and b/out/production/classes/protocol/impl/SigmaEstablisher.class differ diff --git a/out/production/classes/protocol/impl/sigma/ElGamal.class b/out/production/classes/protocol/impl/sigma/ElGamal.class new file mode 100644 index 00000000..e8864f9a Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/ElGamal.class differ diff --git a/out/production/classes/protocol/impl/sigma/ElGamalEncrypt.class b/out/production/classes/protocol/impl/sigma/ElGamalEncrypt.class new file mode 100644 index 00000000..bca7a9fc Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/ElGamalEncrypt.class differ diff --git a/out/production/classes/protocol/impl/sigma/Fabric.class b/out/production/classes/protocol/impl/sigma/Fabric.class new file mode 100644 index 00000000..a3395aba Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Fabric.class differ diff --git a/out/production/classes/protocol/impl/sigma/PCS.class b/out/production/classes/protocol/impl/sigma/PCS.class new file mode 100644 index 00000000..001da6b0 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/PCS.class differ diff --git a/out/production/classes/protocol/impl/sigma/Receiver.class b/out/production/classes/protocol/impl/sigma/Receiver.class new file mode 100644 index 00000000..59e72b58 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Receiver.class differ diff --git a/out/production/classes/protocol/impl/sigma/Sender.class b/out/production/classes/protocol/impl/sigma/Sender.class new file mode 100644 index 00000000..2c9f9506 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Sender.class differ diff --git a/out/production/classes/protocol/impl/sigma/SigmaClauses.class b/out/production/classes/protocol/impl/sigma/SigmaClauses.class new file mode 100644 index 00000000..455b13ac Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/SigmaClauses.class differ diff --git a/out/production/classes/protocol/impl/sigma/SigmaContract$1.class b/out/production/classes/protocol/impl/sigma/SigmaContract$1.class new file mode 100644 index 00000000..bec4fc76 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/SigmaContract$1.class differ diff --git a/out/production/classes/protocol/impl/sigma/SigmaContract$2.class b/out/production/classes/protocol/impl/sigma/SigmaContract$2.class new file mode 100644 index 00000000..4fd77611 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/SigmaContract$2.class differ diff --git a/out/production/classes/protocol/impl/sigma/SigmaContract.class b/out/production/classes/protocol/impl/sigma/SigmaContract.class new file mode 100644 index 00000000..5cdc241c Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/SigmaContract.class differ diff --git a/out/production/classes/protocol/impl/sigma/SigmaEstablisherData.class b/out/production/classes/protocol/impl/sigma/SigmaEstablisherData.class new file mode 100644 index 00000000..efd60037 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/SigmaEstablisherData.class differ diff --git a/out/production/classes/protocol/impl/sigma/Trent$1.class b/out/production/classes/protocol/impl/sigma/Trent$1.class new file mode 100644 index 00000000..03623097 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Trent$1.class differ diff --git a/out/production/classes/protocol/impl/sigma/Trent$2.class b/out/production/classes/protocol/impl/sigma/Trent$2.class new file mode 100644 index 00000000..5c9a93d2 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Trent$2.class differ diff --git a/out/production/classes/protocol/impl/sigma/Trent$3.class b/out/production/classes/protocol/impl/sigma/Trent$3.class new file mode 100644 index 00000000..8d59df7a Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Trent$3.class differ diff --git a/out/production/classes/protocol/impl/sigma/Trent$4.class b/out/production/classes/protocol/impl/sigma/Trent$4.class new file mode 100644 index 00000000..1af72e8d Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Trent$4.class differ diff --git a/out/production/classes/protocol/impl/sigma/Trent$5.class b/out/production/classes/protocol/impl/sigma/Trent$5.class new file mode 100644 index 00000000..276d64de Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Trent$5.class differ diff --git a/out/production/classes/protocol/impl/sigma/Trent$6.class b/out/production/classes/protocol/impl/sigma/Trent$6.class new file mode 100644 index 00000000..e717bc05 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Trent$6.class differ diff --git a/out/production/classes/protocol/impl/sigma/Trent$7.class b/out/production/classes/protocol/impl/sigma/Trent$7.class new file mode 100644 index 00000000..a672cc80 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Trent$7.class differ diff --git a/out/production/classes/protocol/impl/sigma/Trent$8.class b/out/production/classes/protocol/impl/sigma/Trent$8.class new file mode 100644 index 00000000..0d228497 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Trent$8.class differ diff --git a/out/production/classes/protocol/impl/sigma/Trent.class b/out/production/classes/protocol/impl/sigma/Trent.class new file mode 100644 index 00000000..f091a833 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Trent.class differ diff --git a/out/production/classes/protocol/impl/sigma/TrentSolver$1.class b/out/production/classes/protocol/impl/sigma/TrentSolver$1.class new file mode 100644 index 00000000..08996670 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/TrentSolver$1.class differ diff --git a/out/production/classes/protocol/impl/sigma/TrentSolver$2.class b/out/production/classes/protocol/impl/sigma/TrentSolver$2.class new file mode 100644 index 00000000..bf1c35b9 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/TrentSolver$2.class differ diff --git a/out/production/classes/protocol/impl/sigma/TrentSolver$3.class b/out/production/classes/protocol/impl/sigma/TrentSolver$3.class new file mode 100644 index 00000000..2a5e1903 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/TrentSolver$3.class differ diff --git a/out/production/classes/protocol/impl/sigma/TrentSolver$4.class b/out/production/classes/protocol/impl/sigma/TrentSolver$4.class new file mode 100644 index 00000000..85b35bcc Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/TrentSolver$4.class differ diff --git a/out/production/classes/protocol/impl/sigma/TrentSolver$5.class b/out/production/classes/protocol/impl/sigma/TrentSolver$5.class new file mode 100644 index 00000000..e9d30476 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/TrentSolver$5.class differ diff --git a/out/production/classes/protocol/impl/sigma/TrentSolver.class b/out/production/classes/protocol/impl/sigma/TrentSolver.class new file mode 100644 index 00000000..f2072a9d Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/TrentSolver.class differ diff --git a/out/production/classes/protocol/impl/sigma/Utils.class b/out/production/classes/protocol/impl/sigma/Utils.class new file mode 100644 index 00000000..73f93998 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/Utils.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$1.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$1.class new file mode 100644 index 00000000..e6225660 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$1.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$2.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$2.class new file mode 100644 index 00000000..b500960e Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$2.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$3$1.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$3$1.class new file mode 100644 index 00000000..6f16846c Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$3$1.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$3.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$3.class new file mode 100644 index 00000000..0da85c05 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent$3.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent.class new file mode 100644 index 00000000..0aa72b10 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolChooseTrent.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$1.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$1.class new file mode 100644 index 00000000..69f9cb5c Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$1.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$2.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$2.class new file mode 100644 index 00000000..0dd72c2d Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$2.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$3.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$3.class new file mode 100644 index 00000000..ed76c292 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$3.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$4.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$4.class new file mode 100644 index 00000000..3fc7c4f9 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$4.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$1.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$1.class new file mode 100644 index 00000000..dbdb5d7d Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$1.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$2.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$2.class new file mode 100644 index 00000000..5dedf214 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$2.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$3.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$3.class new file mode 100644 index 00000000..5aeec72d Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$3.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$4.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$4.class new file mode 100644 index 00000000..c6a0061a Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5$4.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5.class new file mode 100644 index 00000000..50028969 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve$5.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve.class new file mode 100644 index 00000000..536f579a Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolResolve.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$1.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$1.class new file mode 100644 index 00000000..33a69b5e Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$1.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$2.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$2.class new file mode 100644 index 00000000..12de021a Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$2.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$3.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$3.class new file mode 100644 index 00000000..6006c149 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$3.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$4.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$4.class new file mode 100644 index 00000000..9ffcd36b Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$4.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$5.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$5.class new file mode 100644 index 00000000..7c71b4d6 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$5.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$6.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$6.class new file mode 100644 index 00000000..156721a7 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$6.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$7.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$7.class new file mode 100644 index 00000000..c490bf08 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign$7.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolSign.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign.class new file mode 100644 index 00000000..00c6f9d4 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolSign.class differ diff --git a/out/production/classes/protocol/impl/sigma/steps/ProtocolStep.class b/out/production/classes/protocol/impl/sigma/steps/ProtocolStep.class new file mode 100644 index 00000000..a62c3902 Binary files /dev/null and b/out/production/classes/protocol/impl/sigma/steps/ProtocolStep.class differ diff --git a/out/production/classes/rest/api/Authentifier.class b/out/production/classes/rest/api/Authentifier.class new file mode 100644 index 00000000..082fee50 Binary files /dev/null and b/out/production/classes/rest/api/Authentifier.class differ diff --git a/out/production/classes/rest/api/RestServer.class b/out/production/classes/rest/api/RestServer.class new file mode 100644 index 00000000..af938468 Binary files /dev/null and b/out/production/classes/rest/api/RestServer.class differ diff --git a/out/production/classes/rest/api/ServletPath.class b/out/production/classes/rest/api/ServletPath.class new file mode 100644 index 00000000..f2f2a896 Binary files /dev/null and b/out/production/classes/rest/api/ServletPath.class differ diff --git a/out/production/classes/rest/factories/AuthentifierFactory.class b/out/production/classes/rest/factories/AuthentifierFactory.class new file mode 100644 index 00000000..96dc41ab Binary files /dev/null and b/out/production/classes/rest/factories/AuthentifierFactory.class differ diff --git a/out/production/classes/rest/factories/RestServerFactory$1.class b/out/production/classes/rest/factories/RestServerFactory$1.class new file mode 100644 index 00000000..78698db9 Binary files /dev/null and b/out/production/classes/rest/factories/RestServerFactory$1.class differ diff --git a/out/production/classes/rest/factories/RestServerFactory.class b/out/production/classes/rest/factories/RestServerFactory.class new file mode 100644 index 00000000..ebe4379a Binary files /dev/null and b/out/production/classes/rest/factories/RestServerFactory.class differ diff --git a/out/production/classes/rest/impl/JettyRestServer$1.class b/out/production/classes/rest/impl/JettyRestServer$1.class new file mode 100644 index 00000000..b3b7be22 Binary files /dev/null and b/out/production/classes/rest/impl/JettyRestServer$1.class differ diff --git a/out/production/classes/rest/impl/JettyRestServer.class b/out/production/classes/rest/impl/JettyRestServer.class new file mode 100644 index 00000000..36198c32 Binary files /dev/null and b/out/production/classes/rest/impl/JettyRestServer.class differ diff --git a/out/production/classes/rest/impl/SimpleAuthentifier$Logins.class b/out/production/classes/rest/impl/SimpleAuthentifier$Logins.class new file mode 100644 index 00000000..c5f27c31 Binary files /dev/null and b/out/production/classes/rest/impl/SimpleAuthentifier$Logins.class differ diff --git a/out/production/classes/rest/impl/SimpleAuthentifier.class b/out/production/classes/rest/impl/SimpleAuthentifier.class new file mode 100644 index 00000000..a41ccae1 Binary files /dev/null and b/out/production/classes/rest/impl/SimpleAuthentifier.class differ diff --git a/out/production/resources/META-INF/persistence.xml b/out/production/resources/META-INF/persistence.xml new file mode 100644 index 00000000..75b0c48d --- /dev/null +++ b/out/production/resources/META-INF/persistence.xml @@ -0,0 +1,25 @@ + + + + org.eclipse.persistence.jpa.PersistenceProvider + model.entity.Item + model.entity.User + model.entity.ContractEntity + model.entity.Message + + + + + + + + + + + + + + + diff --git a/out/production/resources/jetty-logging.properties b/out/production/resources/jetty-logging.properties new file mode 100644 index 00000000..af1c30db --- /dev/null +++ b/out/production/resources/jetty-logging.properties @@ -0,0 +1,5 @@ +# Setup logging implementation +org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog +org.eclipse.jetty.LEVEL=INFO +# Make websocket more verbose for testing +#org.eclipse.jetty.websocket.LEVEL=DEBUG diff --git a/out/production/resources/log4j2.xml b/out/production/resources/log4j2.xml new file mode 100644 index 00000000..3a363c87 --- /dev/null +++ b/out/production/resources/log4j2.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/out/test/classes/controller/ControllerTest$1.class b/out/test/classes/controller/ControllerTest$1.class new file mode 100644 index 00000000..a50d0992 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$1.class differ diff --git a/out/test/classes/controller/ControllerTest$10.class b/out/test/classes/controller/ControllerTest$10.class new file mode 100644 index 00000000..94cbf7f8 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$10.class differ diff --git a/out/test/classes/controller/ControllerTest$11.class b/out/test/classes/controller/ControllerTest$11.class new file mode 100644 index 00000000..9c820dd4 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$11.class differ diff --git a/out/test/classes/controller/ControllerTest$12.class b/out/test/classes/controller/ControllerTest$12.class new file mode 100644 index 00000000..0a4c7a2a Binary files /dev/null and b/out/test/classes/controller/ControllerTest$12.class differ diff --git a/out/test/classes/controller/ControllerTest$13.class b/out/test/classes/controller/ControllerTest$13.class new file mode 100644 index 00000000..5ef510e3 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$13.class differ diff --git a/out/test/classes/controller/ControllerTest$14.class b/out/test/classes/controller/ControllerTest$14.class new file mode 100644 index 00000000..9a2a4472 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$14.class differ diff --git a/out/test/classes/controller/ControllerTest$15.class b/out/test/classes/controller/ControllerTest$15.class new file mode 100644 index 00000000..3c3e3b86 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$15.class differ diff --git a/out/test/classes/controller/ControllerTest$16.class b/out/test/classes/controller/ControllerTest$16.class new file mode 100644 index 00000000..de1c1ae9 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$16.class differ diff --git a/out/test/classes/controller/ControllerTest$17.class b/out/test/classes/controller/ControllerTest$17.class new file mode 100644 index 00000000..d5879180 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$17.class differ diff --git a/out/test/classes/controller/ControllerTest$18.class b/out/test/classes/controller/ControllerTest$18.class new file mode 100644 index 00000000..0b1a00da Binary files /dev/null and b/out/test/classes/controller/ControllerTest$18.class differ diff --git a/out/test/classes/controller/ControllerTest$19.class b/out/test/classes/controller/ControllerTest$19.class new file mode 100644 index 00000000..1ea59c3a Binary files /dev/null and b/out/test/classes/controller/ControllerTest$19.class differ diff --git a/out/test/classes/controller/ControllerTest$2.class b/out/test/classes/controller/ControllerTest$2.class new file mode 100644 index 00000000..5de9cc75 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$2.class differ diff --git a/out/test/classes/controller/ControllerTest$20.class b/out/test/classes/controller/ControllerTest$20.class new file mode 100644 index 00000000..89151e28 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$20.class differ diff --git a/out/test/classes/controller/ControllerTest$21.class b/out/test/classes/controller/ControllerTest$21.class new file mode 100644 index 00000000..3c548ad6 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$21.class differ diff --git a/out/test/classes/controller/ControllerTest$22.class b/out/test/classes/controller/ControllerTest$22.class new file mode 100644 index 00000000..0887165c Binary files /dev/null and b/out/test/classes/controller/ControllerTest$22.class differ diff --git a/out/test/classes/controller/ControllerTest$23.class b/out/test/classes/controller/ControllerTest$23.class new file mode 100644 index 00000000..578c51e5 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$23.class differ diff --git a/out/test/classes/controller/ControllerTest$3.class b/out/test/classes/controller/ControllerTest$3.class new file mode 100644 index 00000000..530c24b4 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$3.class differ diff --git a/out/test/classes/controller/ControllerTest$4.class b/out/test/classes/controller/ControllerTest$4.class new file mode 100644 index 00000000..8e3137d2 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$4.class differ diff --git a/out/test/classes/controller/ControllerTest$5.class b/out/test/classes/controller/ControllerTest$5.class new file mode 100644 index 00000000..161563e7 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$5.class differ diff --git a/out/test/classes/controller/ControllerTest$6.class b/out/test/classes/controller/ControllerTest$6.class new file mode 100644 index 00000000..39493277 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$6.class differ diff --git a/out/test/classes/controller/ControllerTest$7.class b/out/test/classes/controller/ControllerTest$7.class new file mode 100644 index 00000000..0d9d3ef7 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$7.class differ diff --git a/out/test/classes/controller/ControllerTest$8.class b/out/test/classes/controller/ControllerTest$8.class new file mode 100644 index 00000000..6d5b34a0 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$8.class differ diff --git a/out/test/classes/controller/ControllerTest$9.class b/out/test/classes/controller/ControllerTest$9.class new file mode 100644 index 00000000..5f1d5b09 Binary files /dev/null and b/out/test/classes/controller/ControllerTest$9.class differ diff --git a/out/test/classes/controller/ControllerTest.class b/out/test/classes/controller/ControllerTest.class new file mode 100644 index 00000000..4ca78c2d Binary files /dev/null and b/out/test/classes/controller/ControllerTest.class differ diff --git a/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$1.class b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$1.class new file mode 100644 index 00000000..ab2a71ac Binary files /dev/null and b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$1.class differ diff --git a/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$2.class b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$2.class new file mode 100644 index 00000000..0b14e743 Binary files /dev/null and b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$2.class differ diff --git a/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$3.class b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$3.class new file mode 100644 index 00000000..eaa8fc03 Binary files /dev/null and b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$3.class differ diff --git a/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$4.class b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$4.class new file mode 100644 index 00000000..9ea82c54 Binary files /dev/null and b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$4.class differ diff --git a/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$5.class b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$5.class new file mode 100644 index 00000000..4c2bc22b Binary files /dev/null and b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$5.class differ diff --git a/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$6.class b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$6.class new file mode 100644 index 00000000..0a2875e4 Binary files /dev/null and b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest$6.class differ diff --git a/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest.class b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest.class new file mode 100644 index 00000000..404dc8d3 Binary files /dev/null and b/out/test/classes/controller/managers/CryptoItemManagerDecoratorTest.class differ diff --git a/out/test/classes/controller/managers/CryptoMessageManagerDecoratorTest$1.class b/out/test/classes/controller/managers/CryptoMessageManagerDecoratorTest$1.class new file mode 100644 index 00000000..a6104d39 Binary files /dev/null and b/out/test/classes/controller/managers/CryptoMessageManagerDecoratorTest$1.class differ diff --git a/out/test/classes/controller/managers/CryptoMessageManagerDecoratorTest.class b/out/test/classes/controller/managers/CryptoMessageManagerDecoratorTest.class new file mode 100644 index 00000000..f796ae56 Binary files /dev/null and b/out/test/classes/controller/managers/CryptoMessageManagerDecoratorTest.class differ diff --git a/out/test/classes/controller/managers/CryptoUserManagerDecoratorTest.class b/out/test/classes/controller/managers/CryptoUserManagerDecoratorTest.class new file mode 100644 index 00000000..768e4ef4 Binary files /dev/null and b/out/test/classes/controller/managers/CryptoUserManagerDecoratorTest.class differ diff --git a/out/test/classes/crypt/ElGamalEngineTestK.class b/out/test/classes/crypt/ElGamalEngineTestK.class new file mode 100644 index 00000000..40189de6 Binary files /dev/null and b/out/test/classes/crypt/ElGamalEngineTestK.class differ diff --git a/out/test/classes/crypt/api/hashs/HasherTest$ToyHashable.class b/out/test/classes/crypt/api/hashs/HasherTest$ToyHashable.class new file mode 100644 index 00000000..ae9b6cb3 Binary files /dev/null and b/out/test/classes/crypt/api/hashs/HasherTest$ToyHashable.class differ diff --git a/out/test/classes/crypt/api/hashs/HasherTest.class b/out/test/classes/crypt/api/hashs/HasherTest.class new file mode 100644 index 00000000..41fc96c2 Binary files /dev/null and b/out/test/classes/crypt/api/hashs/HasherTest.class differ diff --git a/out/test/classes/crypt/api/key/AsymKeyTest.class b/out/test/classes/crypt/api/key/AsymKeyTest.class new file mode 100644 index 00000000..bf7be5f8 Binary files /dev/null and b/out/test/classes/crypt/api/key/AsymKeyTest.class differ diff --git a/out/test/classes/crypt/base/BaseSignatureTest.class b/out/test/classes/crypt/base/BaseSignatureTest.class new file mode 100644 index 00000000..dfbcf169 Binary files /dev/null and b/out/test/classes/crypt/base/BaseSignatureTest.class differ diff --git a/out/test/classes/crypt/impl/TestCrypt.class b/out/test/classes/crypt/impl/TestCrypt.class new file mode 100644 index 00000000..924f6d82 Binary files /dev/null and b/out/test/classes/crypt/impl/TestCrypt.class differ diff --git a/out/test/classes/crypt/impl/certificate/X509V3GeneratorTest.class b/out/test/classes/crypt/impl/certificate/X509V3GeneratorTest.class new file mode 100644 index 00000000..8af32ce7 Binary files /dev/null and b/out/test/classes/crypt/impl/certificate/X509V3GeneratorTest.class differ diff --git a/out/test/classes/crypt/impl/encryption/ElGamalEncrypterTest.class b/out/test/classes/crypt/impl/encryption/ElGamalEncrypterTest.class new file mode 100644 index 00000000..87fc008b Binary files /dev/null and b/out/test/classes/crypt/impl/encryption/ElGamalEncrypterTest.class differ diff --git a/out/test/classes/crypt/impl/encryption/SerpentEncrypterTest.class b/out/test/classes/crypt/impl/encryption/SerpentEncrypterTest.class new file mode 100644 index 00000000..b7bc5297 Binary files /dev/null and b/out/test/classes/crypt/impl/encryption/SerpentEncrypterTest.class differ diff --git a/out/test/classes/crypt/impl/hashs/SHA256HasherTest.class b/out/test/classes/crypt/impl/hashs/SHA256HasherTest.class new file mode 100644 index 00000000..597feeff Binary files /dev/null and b/out/test/classes/crypt/impl/hashs/SHA256HasherTest.class differ diff --git a/out/test/classes/crypt/impl/key/ElGamalAsymKeyTest.class b/out/test/classes/crypt/impl/key/ElGamalAsymKeyTest.class new file mode 100644 index 00000000..77616b5e Binary files /dev/null and b/out/test/classes/crypt/impl/key/ElGamalAsymKeyTest.class differ diff --git a/out/test/classes/crypt/impl/signatures/ElGamalSignatureTest.class b/out/test/classes/crypt/impl/signatures/ElGamalSignatureTest.class new file mode 100644 index 00000000..60cc2b27 Binary files /dev/null and b/out/test/classes/crypt/impl/signatures/ElGamalSignatureTest.class differ diff --git a/out/test/classes/crypt/impl/signatures/ElGamalSignerTest.class b/out/test/classes/crypt/impl/signatures/ElGamalSignerTest.class new file mode 100644 index 00000000..28f5af7f Binary files /dev/null and b/out/test/classes/crypt/impl/signatures/ElGamalSignerTest.class differ diff --git a/out/test/classes/crypt/impl/signatures/SigmaSignatureTest$1.class b/out/test/classes/crypt/impl/signatures/SigmaSignatureTest$1.class new file mode 100644 index 00000000..5a9d4cec Binary files /dev/null and b/out/test/classes/crypt/impl/signatures/SigmaSignatureTest$1.class differ diff --git a/out/test/classes/crypt/impl/signatures/SigmaSignatureTest$2.class b/out/test/classes/crypt/impl/signatures/SigmaSignatureTest$2.class new file mode 100644 index 00000000..8badac10 Binary files /dev/null and b/out/test/classes/crypt/impl/signatures/SigmaSignatureTest$2.class differ diff --git a/out/test/classes/crypt/impl/signatures/SigmaSignatureTest$3.class b/out/test/classes/crypt/impl/signatures/SigmaSignatureTest$3.class new file mode 100644 index 00000000..59cfb17e Binary files /dev/null and b/out/test/classes/crypt/impl/signatures/SigmaSignatureTest$3.class differ diff --git a/out/test/classes/crypt/impl/signatures/SigmaSignatureTest.class b/out/test/classes/crypt/impl/signatures/SigmaSignatureTest.class new file mode 100644 index 00000000..8de8a0cd Binary files /dev/null and b/out/test/classes/crypt/impl/signatures/SigmaSignatureTest.class differ diff --git a/out/test/classes/crypt/impl/signatures/SigmaSignerTest.class b/out/test/classes/crypt/impl/signatures/SigmaSignerTest.class new file mode 100644 index 00000000..7ed7b42b Binary files /dev/null and b/out/test/classes/crypt/impl/signatures/SigmaSignerTest.class differ diff --git a/out/test/classes/crypt/utils/BigIntegerRandomTest.class b/out/test/classes/crypt/utils/BigIntegerRandomTest.class new file mode 100644 index 00000000..c63a3bc2 Binary files /dev/null and b/out/test/classes/crypt/utils/BigIntegerRandomTest.class differ diff --git a/out/test/classes/crypt/utils/CryptoParserTest.class b/out/test/classes/crypt/utils/CryptoParserTest.class new file mode 100644 index 00000000..896b8ce1 Binary files /dev/null and b/out/test/classes/crypt/utils/CryptoParserTest.class differ diff --git a/out/test/classes/model/entity/ElGamalKeyTest.class b/out/test/classes/model/entity/ElGamalKeyTest.class new file mode 100644 index 00000000..8ac2a9be Binary files /dev/null and b/out/test/classes/model/entity/ElGamalKeyTest.class differ diff --git a/out/test/classes/model/entity/ElGamalSignEntityTest.class b/out/test/classes/model/entity/ElGamalSignEntityTest.class new file mode 100644 index 00000000..6548242f Binary files /dev/null and b/out/test/classes/model/entity/ElGamalSignEntityTest.class differ diff --git a/out/test/classes/model/entity/ItemTest.class b/out/test/classes/model/entity/ItemTest.class new file mode 100644 index 00000000..49c34573 Binary files /dev/null and b/out/test/classes/model/entity/ItemTest.class differ diff --git a/out/test/classes/model/entity/LoginTokenTest.class b/out/test/classes/model/entity/LoginTokenTest.class new file mode 100644 index 00000000..2fb86e1f Binary files /dev/null and b/out/test/classes/model/entity/LoginTokenTest.class differ diff --git a/out/test/classes/model/entity/UserTest.class b/out/test/classes/model/entity/UserTest.class new file mode 100644 index 00000000..6d3d7b5f Binary files /dev/null and b/out/test/classes/model/entity/UserTest.class differ diff --git a/out/test/classes/model/entity/sigma/AndTest.class b/out/test/classes/model/entity/sigma/AndTest.class new file mode 100644 index 00000000..0176f3fc Binary files /dev/null and b/out/test/classes/model/entity/sigma/AndTest.class differ diff --git a/out/test/classes/model/entity/sigma/MasksTest.class b/out/test/classes/model/entity/sigma/MasksTest.class new file mode 100644 index 00000000..4847ab7c Binary files /dev/null and b/out/test/classes/model/entity/sigma/MasksTest.class differ diff --git a/out/test/classes/model/entity/sigma/OrTest.class b/out/test/classes/model/entity/sigma/OrTest.class new file mode 100644 index 00000000..7188121a Binary files /dev/null and b/out/test/classes/model/entity/sigma/OrTest.class differ diff --git a/out/test/classes/model/entity/sigma/ResEncryptTest.class b/out/test/classes/model/entity/sigma/ResEncryptTest.class new file mode 100644 index 00000000..e511f47b Binary files /dev/null and b/out/test/classes/model/entity/sigma/ResEncryptTest.class differ diff --git a/out/test/classes/model/entity/sigma/ResponsesCCDTest.class b/out/test/classes/model/entity/sigma/ResponsesCCDTest.class new file mode 100644 index 00000000..b3310065 Binary files /dev/null and b/out/test/classes/model/entity/sigma/ResponsesCCDTest.class differ diff --git a/out/test/classes/model/entity/sigma/ResponsesCCETest.class b/out/test/classes/model/entity/sigma/ResponsesCCETest.class new file mode 100644 index 00000000..7b7c90f4 Binary files /dev/null and b/out/test/classes/model/entity/sigma/ResponsesCCETest.class differ diff --git a/out/test/classes/model/entity/sigma/ResponsesSchnorrTest.class b/out/test/classes/model/entity/sigma/ResponsesSchnorrTest.class new file mode 100644 index 00000000..78c9dfcc Binary files /dev/null and b/out/test/classes/model/entity/sigma/ResponsesSchnorrTest.class differ diff --git a/out/test/classes/model/syncManager/ItemSyncManagerImplTest.class b/out/test/classes/model/syncManager/ItemSyncManagerImplTest.class new file mode 100644 index 00000000..ad395f2b Binary files /dev/null and b/out/test/classes/model/syncManager/ItemSyncManagerImplTest.class differ diff --git a/out/test/classes/model/syncManager/MessageSyncManagerImplTest.class b/out/test/classes/model/syncManager/MessageSyncManagerImplTest.class new file mode 100644 index 00000000..53f599dc Binary files /dev/null and b/out/test/classes/model/syncManager/MessageSyncManagerImplTest.class differ diff --git a/out/test/classes/model/syncManager/UserSyncManagerImplTest.class b/out/test/classes/model/syncManager/UserSyncManagerImplTest.class new file mode 100644 index 00000000..7b471b9c Binary files /dev/null and b/out/test/classes/model/syncManager/UserSyncManagerImplTest.class differ diff --git a/out/test/classes/model/validator/ItemValidatorTest.class b/out/test/classes/model/validator/ItemValidatorTest.class new file mode 100644 index 00000000..7a5a4be6 Binary files /dev/null and b/out/test/classes/model/validator/ItemValidatorTest.class differ diff --git a/out/test/classes/model/validator/UserValidatorTest.class b/out/test/classes/model/validator/UserValidatorTest.class new file mode 100644 index 00000000..638be40f Binary files /dev/null and b/out/test/classes/model/validator/UserValidatorTest.class differ diff --git a/out/test/classes/network/impl/EstablisherServiceTest$1.class b/out/test/classes/network/impl/EstablisherServiceTest$1.class new file mode 100644 index 00000000..9f8783d8 Binary files /dev/null and b/out/test/classes/network/impl/EstablisherServiceTest$1.class differ diff --git a/out/test/classes/network/impl/EstablisherServiceTest$Key.class b/out/test/classes/network/impl/EstablisherServiceTest$Key.class new file mode 100644 index 00000000..b531ba1c Binary files /dev/null and b/out/test/classes/network/impl/EstablisherServiceTest$Key.class differ diff --git a/out/test/classes/network/impl/EstablisherServiceTest.class b/out/test/classes/network/impl/EstablisherServiceTest.class new file mode 100644 index 00000000..cdf03930 Binary files /dev/null and b/out/test/classes/network/impl/EstablisherServiceTest.class differ diff --git a/out/test/classes/network/impl/MessagesGenericTest.class b/out/test/classes/network/impl/MessagesGenericTest.class new file mode 100644 index 00000000..2b88b149 Binary files /dev/null and b/out/test/classes/network/impl/MessagesGenericTest.class differ diff --git a/out/test/classes/network/impl/advertisement/ItemAdvertisementTest.class b/out/test/classes/network/impl/advertisement/ItemAdvertisementTest.class new file mode 100644 index 00000000..963fccdf Binary files /dev/null and b/out/test/classes/network/impl/advertisement/ItemAdvertisementTest.class differ diff --git a/out/test/classes/network/impl/advertisement/PeerAdvertisementTest.class b/out/test/classes/network/impl/advertisement/PeerAdvertisementTest.class new file mode 100644 index 00000000..611a6dd4 Binary files /dev/null and b/out/test/classes/network/impl/advertisement/PeerAdvertisementTest.class differ diff --git a/out/test/classes/network/impl/advertisement/UserAdvertisementTest.class b/out/test/classes/network/impl/advertisement/UserAdvertisementTest.class new file mode 100644 index 00000000..cfdab433 Binary files /dev/null and b/out/test/classes/network/impl/advertisement/UserAdvertisementTest.class differ diff --git a/out/test/classes/network/impl/jxta/AdvertisementInstaciatorTest.class b/out/test/classes/network/impl/jxta/AdvertisementInstaciatorTest.class new file mode 100644 index 00000000..430ad2a9 Binary files /dev/null and b/out/test/classes/network/impl/jxta/AdvertisementInstaciatorTest.class differ diff --git a/out/test/classes/network/impl/jxta/JxtaAdvertisementTest.class b/out/test/classes/network/impl/jxta/JxtaAdvertisementTest.class new file mode 100644 index 00000000..0ffc8679 Binary files /dev/null and b/out/test/classes/network/impl/jxta/JxtaAdvertisementTest.class differ diff --git a/out/test/classes/network/impl/jxta/JxtaItemServiceTest.class b/out/test/classes/network/impl/jxta/JxtaItemServiceTest.class new file mode 100644 index 00000000..d7e3c1f4 Binary files /dev/null and b/out/test/classes/network/impl/jxta/JxtaItemServiceTest.class differ diff --git a/out/test/classes/network/impl/jxta/JxtaNodeTest.class b/out/test/classes/network/impl/jxta/JxtaNodeTest.class new file mode 100644 index 00000000..aceb1927 Binary files /dev/null and b/out/test/classes/network/impl/jxta/JxtaNodeTest.class differ diff --git a/out/test/classes/network/impl/jxta/JxtaServiceTest.class b/out/test/classes/network/impl/jxta/JxtaServiceTest.class new file mode 100644 index 00000000..873ea4a6 Binary files /dev/null and b/out/test/classes/network/impl/jxta/JxtaServiceTest.class differ diff --git a/out/test/classes/network/impl/messages/RequestItemMessageTest.class b/out/test/classes/network/impl/messages/RequestItemMessageTest.class new file mode 100644 index 00000000..245ffeb0 Binary files /dev/null and b/out/test/classes/network/impl/messages/RequestItemMessageTest.class differ diff --git a/out/test/classes/network/utils/IpCheckerTest.class b/out/test/classes/network/utils/IpCheckerTest.class new file mode 100644 index 00000000..bbd70be5 Binary files /dev/null and b/out/test/classes/network/utils/IpCheckerTest.class differ diff --git a/out/test/classes/protocol/impl/SigmaEstablisherFailer.class b/out/test/classes/protocol/impl/SigmaEstablisherFailer.class new file mode 100644 index 00000000..a2ba1c4f Binary files /dev/null and b/out/test/classes/protocol/impl/SigmaEstablisherFailer.class differ diff --git a/out/test/classes/protocol/impl/SigmaEstablisherTest.class b/out/test/classes/protocol/impl/SigmaEstablisherTest.class new file mode 100644 index 00000000..279d1b9e Binary files /dev/null and b/out/test/classes/protocol/impl/SigmaEstablisherTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/ElGamalEncryptTest.class b/out/test/classes/protocol/impl/sigma/ElGamalEncryptTest.class new file mode 100644 index 00000000..52b6f531 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/ElGamalEncryptTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/ElGamalTest.class b/out/test/classes/protocol/impl/sigma/ElGamalTest.class new file mode 100644 index 00000000..563391c8 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/ElGamalTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/FabricTest.class b/out/test/classes/protocol/impl/sigma/FabricTest.class new file mode 100644 index 00000000..252df51d Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/FabricTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/PCSTest.class b/out/test/classes/protocol/impl/sigma/PCSTest.class new file mode 100644 index 00000000..1629482d Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/PCSTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/ReceiverTest.class b/out/test/classes/protocol/impl/sigma/ReceiverTest.class new file mode 100644 index 00000000..37ba51ae Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/ReceiverTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/SenderReceiverTest.class b/out/test/classes/protocol/impl/sigma/SenderReceiverTest.class new file mode 100644 index 00000000..910da320 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/SenderReceiverTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/SenderTest.class b/out/test/classes/protocol/impl/sigma/SenderTest.class new file mode 100644 index 00000000..7f808e3f Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/SenderTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/SigmaClausesTest.class b/out/test/classes/protocol/impl/sigma/SigmaClausesTest.class new file mode 100644 index 00000000..68f1703c Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/SigmaClausesTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/SigmaContractTest$1.class b/out/test/classes/protocol/impl/sigma/SigmaContractTest$1.class new file mode 100644 index 00000000..5f2d12a7 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/SigmaContractTest$1.class differ diff --git a/out/test/classes/protocol/impl/sigma/SigmaContractTest$Clauses.class b/out/test/classes/protocol/impl/sigma/SigmaContractTest$Clauses.class new file mode 100644 index 00000000..1c038e48 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/SigmaContractTest$Clauses.class differ diff --git a/out/test/classes/protocol/impl/sigma/SigmaContractTest.class b/out/test/classes/protocol/impl/sigma/SigmaContractTest.class new file mode 100644 index 00000000..24743947 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/SigmaContractTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/TrentTest.class b/out/test/classes/protocol/impl/sigma/TrentTest.class new file mode 100644 index 00000000..0cacc986 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/TrentTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/UtilsTest.class b/out/test/classes/protocol/impl/sigma/UtilsTest.class new file mode 100644 index 00000000..b82dec53 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/UtilsTest.class differ diff --git a/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$1.class b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$1.class new file mode 100644 index 00000000..d98b2b58 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$1.class differ diff --git a/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$2.class b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$2.class new file mode 100644 index 00000000..288427d6 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$2.class differ diff --git a/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$3.class b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$3.class new file mode 100644 index 00000000..5a587513 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$3.class differ diff --git a/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$4.class b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$4.class new file mode 100644 index 00000000..55e5bf81 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer$4.class differ diff --git a/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer.class b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer.class new file mode 100644 index 00000000..83163222 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/step/ProtocolResolveFailer.class differ diff --git a/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailer$1.class b/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailer$1.class new file mode 100644 index 00000000..0218c59a Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailer$1.class differ diff --git a/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailer.class b/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailer.class new file mode 100644 index 00000000..be000346 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailer.class differ diff --git a/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailerLiar$1.class b/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailerLiar$1.class new file mode 100644 index 00000000..4cb93d5e Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailerLiar$1.class differ diff --git a/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailerLiar.class b/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailerLiar.class new file mode 100644 index 00000000..513d8163 Binary files /dev/null and b/out/test/classes/protocol/impl/sigma/step/ProtocolSignFailerLiar.class differ diff --git a/out/test/classes/rest/impl/SimpleAuthentifierTest.class b/out/test/classes/rest/impl/SimpleAuthentifierTest.class new file mode 100644 index 00000000..29d0c9a4 Binary files /dev/null and b/out/test/classes/rest/impl/SimpleAuthentifierTest.class differ diff --git a/out/test/classes/util/TestInputGenerator.class b/out/test/classes/util/TestInputGenerator.class new file mode 100644 index 00000000..ee46a3e6 Binary files /dev/null and b/out/test/classes/util/TestInputGenerator.class differ diff --git a/out/test/classes/util/TestUtils.class b/out/test/classes/util/TestUtils.class new file mode 100644 index 00000000..b1d1b17b Binary files /dev/null and b/out/test/classes/util/TestUtils.class differ diff --git a/out/test/classes/util/TrustModifier$1.class b/out/test/classes/util/TrustModifier$1.class new file mode 100644 index 00000000..f1321338 Binary files /dev/null and b/out/test/classes/util/TrustModifier$1.class differ diff --git a/out/test/classes/util/TrustModifier$AlwaysTrustManager.class b/out/test/classes/util/TrustModifier$AlwaysTrustManager.class new file mode 100644 index 00000000..8d0e4b43 Binary files /dev/null and b/out/test/classes/util/TrustModifier$AlwaysTrustManager.class differ diff --git a/out/test/classes/util/TrustModifier$TrustingHostnameVerifier.class b/out/test/classes/util/TrustModifier$TrustingHostnameVerifier.class new file mode 100644 index 00000000..d9db779a Binary files /dev/null and b/out/test/classes/util/TrustModifier$TrustingHostnameVerifier.class differ diff --git a/out/test/classes/util/TrustModifier.class b/out/test/classes/util/TrustModifier.class new file mode 100644 index 00000000..da4390d9 Binary files /dev/null and b/out/test/classes/util/TrustModifier.class differ diff --git a/out/test/resources/resources.xml b/out/test/resources/resources.xml new file mode 100644 index 00000000..e69de29b diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 00000000..ac9d0726 Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 00000000..fa398650 Binary files /dev/null and b/src/main/.DS_Store differ diff --git a/src/main/java/controller/Application.java b/src/main/java/controller/Application.java index 11c50281..c71cd840 100644 --- a/src/main/java/controller/Application.java +++ b/src/main/java/controller/Application.java @@ -13,78 +13,77 @@ /** * Main class * {@link Application} is a singleton - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public class Application { - public final static int jxtaPort = 9800; - public final static int restPort = 8081; - public final static String[] rdvPeerIds = {"tcp://145.239.76.112:9800","tcp://localhost:9800"}; - - private static Application instance = null; - private static UserSyncManagerImpl umg; - private Peer peer; - private Authentifier auth; - - - - public Application() { - if(instance != null) { - throw new RuntimeException("Application can be instanciate only once !"); - } - instance = this; - } - - public static Application getInstance() { - return instance; - } - - public void run() { - setPeer(PeerFactory.createDefaultAndStartPeer()); - setAuth(AuthentifierFactory.createDefaultAuthentifier()); - RestServerFactory.createAndStartDefaultRestServer(restPort); //start the rest api - } - - public void runForTests(int restPort) { - Properties p = System.getProperties(); - p.put("derby.system.home", "./.db-" + restPort + "/"); - umg = new UserSyncManagerImpl(); //just init the db - umg.close(); - umg = null; - try { - setPeer(PeerFactory.createDefaultAndStartPeerForTest()); - setAuth(AuthentifierFactory.createDefaultAuthentifier()); - RestServerFactory.createAndStartDefaultRestServer(restPort); - } catch (Exception e) { - LoggerUtilities.logStackTrace(e); - } - } - - public static void main(String[] args) { - new Application(); - - Application.getInstance().runForTests(restPort); - - } - - public void stop(){ - peer.stop(); - instance = null; - } - - public Peer getPeer() { - return peer; - } - - public void setPeer(Peer peer) { - this.peer = peer; - } - - public Authentifier getAuth() { - return auth; - } - - public void setAuth(Authentifier auth) { - this.auth = auth; - } + public final static int jxtaPort = 9800; + public final static int restPort = 8081; + public final static String[] rdvPeerIds = {"tcp://145.239.76.112:9800", "tcp://localhost:9800"}; + + private static Application instance = null; + private static UserSyncManagerImpl umg; + private Peer peer; + private Authentifier auth; + + + public Application() { + if (instance != null) { + throw new RuntimeException("Application can be instanciate only once !"); + } + instance = this; + } + + public static Application getInstance() { + return instance; + } + + public static void main(String[] args) { + new Application(); + + Application.getInstance().runForTests(restPort); + + } + + public void run() { + setPeer(PeerFactory.createDefaultAndStartPeer()); + setAuth(AuthentifierFactory.createDefaultAuthentifier()); + RestServerFactory.createAndStartDefaultRestServer(restPort); //start the rest api + } + + public void runForTests(int restPort) { + Properties p = System.getProperties(); + p.put("derby.system.home", "./.db-" + restPort + "/"); + umg = new UserSyncManagerImpl(); //just init the db + umg.close(); + umg = null; + try { + setPeer(PeerFactory.createDefaultAndStartPeerForTest()); + setAuth(AuthentifierFactory.createDefaultAuthentifier()); + RestServerFactory.createAndStartDefaultRestServer(restPort); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } + } + + public void stop() { + peer.stop(); + instance = null; + } + + public Peer getPeer() { + return peer; + } + + public void setPeer(Peer peer) { + this.peer = peer; + } + + public Authentifier getAuth() { + return auth; + } + + public void setAuth(Authentifier auth) { + this.auth = auth; + } } diff --git a/src/main/java/controller/CASingingRequest.java b/src/main/java/controller/CASingingRequest.java index 68cb1c6e..d29a3cbd 100644 --- a/src/main/java/controller/CASingingRequest.java +++ b/src/main/java/controller/CASingingRequest.java @@ -11,19 +11,16 @@ @ServletPath("/.well-know/acme-challenge/*") @Path("/") -public class CASingingRequest { - @GET - @Path("/{input}") - public String hash(@PathParam("input") String input) throws Exception - { - //Send the file for the CA. (let's encrypt) - File file = new File("." + input); - if( file.exists() ) - { - String res = new String(Files.readAllBytes(file.toPath())); - return res; - } - else - return "404 not found"; +public class CASingingRequest { + @GET + @Path("/{input}") + public String hash(@PathParam("input") String input) throws Exception { + //Send the file for the CA. (let's encrypt) + File file = new File("." + input); + if (file.exists()) { + String res = new String(Files.readAllBytes(file.toPath())); + return res; + } else + return "404 not found"; } } diff --git a/src/main/java/controller/Contracts.java b/src/main/java/controller/Contracts.java index 3d21d52a..e2484761 100644 --- a/src/main/java/controller/Contracts.java +++ b/src/main/java/controller/Contracts.java @@ -74,7 +74,9 @@ public String add(ContractEntity contract, @HeaderParam(Authentifier.PARAM_NAME) c.setTitle(contract.getTitle()); c.setParties(parties); c.setPartiesNames(partiesNames); - c.setClauses( contract.getClauses()); + c.setTermination(contract.getTermination()); + c.setImplementing(contract.getImplementing()); + c.setExchange(contract.getExchange()); c.setCreatedAt(contract.getCreatedAt()); c.setUserid(parties.get(k)); c.setWish(Wish.NEUTRAL); @@ -148,7 +150,9 @@ public String edit(ContractEntity c, @HeaderParam(Authentifier.PARAM_NAME) Strin for (ContractEntity contract : contracts){ if (contract.getParties().contains(c.getUserid())){ if (contract.getWish().equals(Wish.NEUTRAL)){ - contract.setClauses(c.getClauses()); + c.setTermination(contract.getTermination()); + c.setImplementing(contract.getImplementing()); + c.setExchange(contract.getExchange()); contract.setParties(parties); contract.setTitle(c.getTitle()); contract.setPartiesNames(partiesNames); diff --git a/src/main/java/controller/CryptCommander.java b/src/main/java/controller/CryptCommander.java index 1ca07a97..7d521fd7 100644 --- a/src/main/java/controller/CryptCommander.java +++ b/src/main/java/controller/CryptCommander.java @@ -10,7 +10,7 @@ @ServletPath("/command/hash/*") //url path. PREFIX WITH COMMAND/ !!! @Path("/") -public class CryptCommander { +public class CryptCommander { @GET @Path("/{input}") //a way to name the pieces of the query public String hash(@PathParam("input") String input) { //this argument will be initialized with the piece of the query diff --git a/src/main/java/controller/Items.java b/src/main/java/controller/Items.java index d6a12dbe..a616b3af 100644 --- a/src/main/java/controller/Items.java +++ b/src/main/java/controller/Items.java @@ -87,11 +87,29 @@ public String get(@HeaderParam(Authentifier.PARAM_NAME) String token) { ItemSyncManager em = SyncManagerFactory.createItemSyncManager(); JsonTools> json = new JsonTools<>(new TypeReference>(){}); String ret = json.toJson(em.findAllByAttribute("userid", currentUser.getId())); + System.err.println("USER="+currentUser.getId()); users.close(); em.close(); return ret; } + + @GET + @Path("/all") + @Produces(MediaType.APPLICATION_JSON) + public String getAll(@HeaderParam(Authentifier.PARAM_NAME) String token) { + + Authentifier auth = Application.getInstance().getAuth(); + UserSyncManager users = SyncManagerFactory.createUserSyncManager(); + User currentUser = users.getUser(auth.getLogin(token), auth.getPassword(token)); + ItemSyncManager em = SyncManagerFactory.createItemSyncManager(); + JsonTools> json = new JsonTools<>(new TypeReference>(){}); + String ret = json.toJson(em.findAll()); + System.err.println("USER="+currentUser.getId()); + users.close(); + em.close(); + return ret; + } @PUT @Path("/{id}") @Consumes(MediaType.APPLICATION_JSON) diff --git a/src/main/java/controller/Messages.java b/src/main/java/controller/Messages.java index 2272bab9..655e2324 100644 --- a/src/main/java/controller/Messages.java +++ b/src/main/java/controller/Messages.java @@ -2,11 +2,7 @@ import java.io.IOException; import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.Hashtable; -import java.util.Iterator; +import java.util.*; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -51,191 +47,208 @@ @ServletPath("/api/messages/*") @Path("/") public class Messages { - private final static Logger log = LogManager.getLogger(Message.class); - @POST - @Path("/") - @Consumes(MediaType.APPLICATION_JSON) - @Produces(MediaType.APPLICATION_JSON) - public ChunkedOutput add(final Message message, @HeaderParam(Authentifier.PARAM_NAME) final String token) { - - Authentifier auth = Application.getInstance().getAuth(); - UserSyncManager users = SyncManagerFactory.createUserSyncManager(); - final User sender = users.getUser(auth.getLogin(token), auth.getPassword(token)); - - final ChunkedOutput output = new ChunkedOutput(String.class); - new Thread(new Runnable() { - - @Override - public void run() { - - final ArrayList asyncResult = new ArrayList<>(); - - Manager usem = ManagerFactory.createNetworkResilianceUserManager(Application.getInstance().getPeer(), token); - - usem.findAllByAttribute("nick",message.getReceiverName(), new ManagerListener() { - @Override - public void notify(Collection results) { - - for (Iterator iterator = results.iterator(); iterator.hasNext();) { - User user = (User) iterator.next(); - asyncResult.add(user); - break; - } - } - }); - - try { - Thread.sleep(3000); - usem.close(); - } catch (InterruptedException e) { - LoggerUtilities.logStackTrace(e); - } - - User reciever = asyncResult.size()>0? asyncResult.get(0):null; - - if (reciever != null && !(reciever.getId().equals(sender.getId())) ){ - - message.setSendingDate(new Date()); - message.setSender(sender.getId(), sender.getNick()); - message.setPbkey(sender.getKey().getPublicKey()); - message.setReceiver(reciever.getId(), reciever.getNick()); - Manager em = ManagerFactory.createNetworkResilianceMessageManager(Application.getInstance().getPeer(), token,reciever,sender); - - boolean pushDbOk = em.begin(); - pushDbOk &= em.persist(message); - pushDbOk &= em.end(); - pushDbOk &= em.close(); - if (!pushDbOk){ - log.warn("Message might not have been sent."); - try { - output.write("{\"error\": \"Message might not have been sent.\"}"); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - } - } - - em.close(); - - JsonTools json = new JsonTools<>(new TypeReference(){}); - try { - output.write(json.toJson(message)); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - } - - }else{ - - try { - output.write("{\"error\": \"No receiver specified.\"}"); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - } - - } - - try { - output.write("[]"); - output.close(); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - } - - } - }).start(); - - return output; - } - - @GET - @Path("/") - @Produces(MediaType.APPLICATION_JSON) - public ChunkedOutput get(@HeaderParam(Authentifier.PARAM_NAME) final String token) { - - Authentifier auth = Application.getInstance().getAuth(); - UserSyncManager users = SyncManagerFactory.createUserSyncManager(); - final User currentUser = users.getUser(auth.getLogin(token), auth.getPassword(token)); - users.close(); - - final ChunkedOutput output = new ChunkedOutput(String.class); - - new Thread(new Runnable() { - - @Override - public void run() { - - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - - Manager em = ManagerFactory.createNetworkResilianceMessageManager(Application.getInstance().getPeer(), token, currentUser,null); - - final Hashtable hashtableMessage = new Hashtable<>(); - - em.findAllByAttribute("receiverId", currentUser.getId(), new ManagerListener() { - @Override - public void notify(Collection results) { - - for (Iterator iterator = results.iterator(); iterator.hasNext();) { - Message message = (Message) iterator.next(); - if(hashtableMessage.get(message.getId())==null){ - hashtableMessage.put(message.getId(), message); - } - } - } - }); - - em.findAllByAttribute("senderId", currentUser.getId(), new ManagerListener() { - @Override - public void notify(Collection results) { - for (Iterator iterator = results.iterator(); iterator.hasNext();) { - Message message = (Message) iterator.next(); - if(hashtableMessage.get(message.getId())==null){ - hashtableMessage.put(message.getId(), message); - } - } - } - }); - - try { - - Thread.sleep(3000); - - output.write(json.toJson(hashtableMessage.values())); - - } catch (InterruptedException e) { - LoggerUtilities.logStackTrace(e); - } catch (IOException e) { - e.printStackTrace(); - } - finally { - try { - output.write("[]"); - output.close(); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - } - } - em.close(); - } - }).start(); - - return output; - } - - @PUT - @Path("/{id}") - @Consumes(MediaType.APPLICATION_JSON) - @Produces(MediaType.APPLICATION_JSON) - public String edit(Message message) { - return null; - } - - @DELETE - @Path("/{id}") - @Produces(MediaType.APPLICATION_JSON) - public String delete( - @PathParam("id") long id) { - return null; - } - - - + private final static Logger log = LogManager.getLogger(Message.class); + + @POST + @Path("/") + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public ChunkedOutput add(final Message message, @HeaderParam(Authentifier.PARAM_NAME) final String token) { + + Authentifier auth = Application.getInstance().getAuth(); + UserSyncManager users = SyncManagerFactory.createUserSyncManager(); + final User sender = users.getUser(auth.getLogin(token), auth.getPassword(token)); + + final ChunkedOutput output = new ChunkedOutput(String.class); + new Thread(new Runnable() { + + @Override + public void run() { + + final ArrayList usernames = new ArrayList<>(); + + final Manager usem = ManagerFactory.createNetworkResilianceUserManager(Application.getInstance().getPeer(), token); + + + usem.findAllById(message.getReceivers(), new ManagerListener() { + @Override + public void notify(Collection results) { + for (Iterator iterator = results.iterator(); iterator.hasNext(); ) { + User user = (User) iterator.next(); + usernames.add(user); + } + } + }); + try { + Thread.sleep(3000); + usem.close(); + } catch (InterruptedException e) { + LoggerUtilities.logStackTrace(e); + } + + + if (usernames != null) { + Date sendDate = new Date(); + String uuid ; + if(message.getChatID()==null){ + uuid = UUID.randomUUID().toString(); + }else{ + uuid = message.getChatID(); + } + + for(User user : usernames){ + if(!Objects.equals(user.getId(), sender.getId())){ + Message aMessage = new Message(); + aMessage.setSendingDate(sendDate); + aMessage.setSender(sender.getId(), sender.getNick()); + aMessage.setPbkey(sender.getKey().getPublicKey()); + aMessage.setReceivers(message.getReceivers()); + aMessage.setMessageContent(message.getMessageContent()); + aMessage.setReceiver(user.getId(),user.getNick()); + aMessage.setChatGroup(message.getChatGroup()); + aMessage.setChatID(uuid); + aMessage.setReceiversNicks(message.getReceiversNicks()); + Manager em = ManagerFactory.createNetworkResilianceMessageManager(Application.getInstance().getPeer(), token, user, sender); + boolean pushDbOk = em.begin(); + pushDbOk &= em.persist(aMessage); + pushDbOk &= em.end(); + pushDbOk &= em.close(); + + + if (!pushDbOk) { + log.warn("Message might not have been sent."); + try { + output.write("{\"error\": \"Message might not have been sent.\"}"); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + } + } + + em.close(); + + JsonTools json = new JsonTools<>(new TypeReference() { + }); + try { + output.write(json.toJson(message)); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + } + } + + } + + } else { + + try { + output.write("{\"error\": \"No receiver specified.\"}"); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + } + + } + + try { + output.write("[]"); + output.close(); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + } + + } + }).start(); + + return output; + } + + @GET + @Path("/") + @Produces(MediaType.APPLICATION_JSON) + public ChunkedOutput get(@HeaderParam(Authentifier.PARAM_NAME) final String token) { + + Authentifier auth = Application.getInstance().getAuth(); + UserSyncManager users = SyncManagerFactory.createUserSyncManager(); + final User currentUser = users.getUser(auth.getLogin(token), auth.getPassword(token)); + users.close(); + + final ChunkedOutput output = new ChunkedOutput(String.class); + + new Thread(new Runnable() { + + @Override + public void run() { + + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + + Manager em = ManagerFactory.createNetworkResilianceMessageManager(Application.getInstance().getPeer(), token, currentUser, null); + + final Hashtable hashtableMessage = new Hashtable<>(); + + em.findAllByAttribute("receiverId", currentUser.getId(), new ManagerListener() { + @Override + public void notify(Collection results) { + + for (Iterator iterator = results.iterator(); iterator.hasNext(); ) { + Message message = (Message) iterator.next(); + if (hashtableMessage.get(message.getId()) == null) { + hashtableMessage.put(message.getId(), message); + } + } + } + }); + + em.findAllByAttribute("senderId", currentUser.getId(), new ManagerListener() { + @Override + public void notify(Collection results) { + for (Iterator iterator = results.iterator(); iterator.hasNext(); ) { + Message message = (Message) iterator.next(); + if (hashtableMessage.get(message.getChatID()) == null) { + hashtableMessage.put(message.getChatID(), message); + } + } + } + }); + + try { + + Thread.sleep(3000); + + output.write(json.toJson(hashtableMessage.values())); + + } catch (InterruptedException e) { + LoggerUtilities.logStackTrace(e); + } catch (IOException e) { + e.printStackTrace(); + } finally { + try { + output.write("[]"); + output.close(); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + } + } + em.close(); + } + }).start(); + + return output; + } + + @PUT + @Path("/{id}") + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public String edit(Message message) { + return null; + } + + @DELETE + @Path("/{id}") + @Produces(MediaType.APPLICATION_JSON) + public String delete( + @PathParam("id") long id) { + return null; + } + + } diff --git a/src/main/java/controller/Search.java b/src/main/java/controller/Search.java index 0a44a017..fe5a76b6 100644 --- a/src/main/java/controller/Search.java +++ b/src/main/java/controller/Search.java @@ -127,5 +127,10 @@ public void notify(Collection results) { }).start(); return output; + } + + + + } diff --git a/src/main/java/controller/Users.java b/src/main/java/controller/Users.java index 464df2c7..98ec90b6 100644 --- a/src/main/java/controller/Users.java +++ b/src/main/java/controller/Users.java @@ -1,231 +1,219 @@ package controller; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; - import com.fasterxml.jackson.core.type.TypeReference; - -import controller.managers.CryptoUserManagerDecorator; import controller.tools.JsonTools; import crypt.api.hashs.Hasher; import crypt.factories.ElGamalAsymKeyFactory; import crypt.factories.HasherFactory; import model.api.Manager; -import model.api.SyncManager; import model.api.UserSyncManager; import model.entity.ElGamalSignEntity; import model.entity.LoginToken; import model.entity.User; import model.factory.ManagerFactory; import model.factory.SyncManagerFactory; -import model.manager.ManagerAdapter; -import model.syncManager.UserSyncManagerImpl; -import network.api.advertisement.UserAdvertisementInterface; -import network.factories.AdvertisementFactory; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; import rest.api.Authentifier; import rest.api.ServletPath; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import java.util.Collection; +import java.util.Date; + @ServletPath("/api/users/*") @Path("/") public class Users { - private final static Logger log = LogManager.getLogger(Users.class); - - //@GET - @POST - @Path("/login") - @Produces(MediaType.APPLICATION_JSON) - public String login(String jsonCredentials) { - - String[] credentials = jsonCredentials.split("&"); - - String login = credentials[0].split("=")[1]; - String password = credentials[1].split("=")[1]; - - Authentifier auth = Application.getInstance().getAuth(); - - UserSyncManager em = SyncManagerFactory.createUserSyncManager(); - - User u = em.getUser(login, password); - - log.info(login + " - " + password); - if(u != null) { - LoginToken token = new LoginToken(); - token.setToken(auth.getToken(login, password)); - token.setUserid(u.getId()); - JsonTools json = new JsonTools<>(new TypeReference(){}); - em.close(); - return json.toJson(token); - } - em.close(); - return "{\"error\": \"true\"}"; - } - - @GET - @Path("/logout") - public String logout(@HeaderParam(Authentifier.PARAM_NAME) String token) { - Authentifier auth = Application.getInstance().getAuth(); - auth.deleteToken(token); - return null; - } - - //@GET - @POST - @Path("/subscribe") - @Produces(MediaType.APPLICATION_JSON) - public String subscribe(String jsonCredentials) { - String[] credentials = jsonCredentials.split("&"); - String login = credentials[0].split("=")[1]; - String password = credentials[1].split("=")[1]; - - User u = new User(); - u.setNick(login); - u.setSalt(HasherFactory.generateSalt()); - u.setPasswordHash(password.getBytes()); - u.setCreatedAt(new Date()); - u.setKey(ElGamalAsymKeyFactory.create(false)); - u.setSignature(new ElGamalSignEntity()); - - Manager hasherDecoratorManager = ManagerFactory.createCryptoNetworkUserManager(Application.getInstance().getPeer(), null, u); - - hasherDecoratorManager.begin(); - hasherDecoratorManager.persist(u); - hasherDecoratorManager.end(); - hasherDecoratorManager.close(); - - Authentifier auth = Application.getInstance().getAuth(); - LoginToken token = new LoginToken(); - token.setToken(auth.getToken(login, password)); - token.setUserid(u.getId()); - - JsonTools json = new JsonTools<>(new TypeReference(){}); - return json.toJson(token); - } - - @POST - @Path("/") - @Consumes(MediaType.APPLICATION_JSON) - @Produces(MediaType.APPLICATION_JSON) - public String add(User user) { - - return null; - } - - @GET - @Path("/{id}") - @Produces(MediaType.APPLICATION_JSON) - public String get( - @PathParam("id") String id) { - - UserSyncManager em = SyncManagerFactory.createUserSyncManager(); - - JsonTools json = new JsonTools<>(new TypeReference(){}); - return json.toJson(em.findOneById(id)); - } - - @GET - @Path("/") - @Produces(MediaType.APPLICATION_JSON) - public String get() { - - UserSyncManager em = SyncManagerFactory.createUserSyncManager(); - - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - return json.toJson(em.findAll()); - //return JsonUtils.collectionStringify(em.findAll()); - } - - @PUT - @Path("/{id}") - @Consumes(MediaType.APPLICATION_JSON) - @Produces(MediaType.APPLICATION_JSON) - public String edit(User user) { - - return null; - } - - @POST - @Path("/password") - @Produces(MediaType.APPLICATION_JSON) - public String changePassword(@HeaderParam(Authentifier.PARAM_NAME) String token, String jsonCredentials) { - - String[] credentials = jsonCredentials.split("&"); - String passwordOld = credentials[0].split("=")[1]; - String passwordNew = credentials[1].split("=")[1]; - String passwordNewConfirm = credentials[2].split("=")[1]; - - if(!passwordNew.equals(passwordNewConfirm)){ - return "{\"error\": \"true\"}"; - } - - Authentifier auth = Application.getInstance().getAuth(); - - UserSyncManager em = SyncManagerFactory.createUserSyncManager(); - - User u = em.getUser(auth.getLogin(token), passwordOld); //search in local - - Manager decoratorUserMg = ManagerFactory.createCryptoUserManager(em,u); // encapsulation of UserSyncManager to hash the new password using decorator pattern - - if(u != null) { - - decoratorUserMg.begin(); - - LoginToken newToken = new LoginToken(); - newToken.setToken(auth.getToken(u.getNick(), passwordNew)); - newToken.setUserid(u.getId()); - - Hasher hasher = HasherFactory.createDefaultHasher(); - u.setSalt(HasherFactory.generateSalt()); - u.setPasswordHash(passwordNew.getBytes()); - - if (decoratorUserMg.end()){ - decoratorUserMg.close(); - JsonTools json = new JsonTools<>(new TypeReference(){}); - return json.toJson(newToken); - } - } - - decoratorUserMg.close(); - return null; - } - - /** - * This only deletes users from local base. - * TO DO : connect to jxta - * @param id - * @param token - * @return - */ - @DELETE - @Path("/{id}") - @Produces(MediaType.APPLICATION_JSON) - public String delete(@PathParam("id") String id, @HeaderParam(Authentifier.PARAM_NAME) String token) { - Authentifier auth = Application.getInstance().getAuth(); - - UserSyncManager users = SyncManagerFactory.createUserSyncManager(); - - User currentUser = users.getUser(auth.getLogin(token), auth.getPassword(token)); - if (currentUser == null){ - users.close(); - return "{\"deleted\": \"false\"}"; - } - Boolean ret = users.begin(); - User us = users.findOneById(id); - return "{\"deleted\": \"" + (ret && users.remove(us) && users.end() && users.close()) + "\"}"; - } - + private final static Logger log = LogManager.getLogger(Users.class); + + //@GET + @POST + @Path("/login") + @Produces(MediaType.APPLICATION_JSON) + public String login(String jsonCredentials) { + + String[] credentials = jsonCredentials.split("&"); + + String login = credentials[0].split("=")[1]; + String password = credentials[1].split("=")[1]; + + Authentifier auth = Application.getInstance().getAuth(); + + UserSyncManager em = SyncManagerFactory.createUserSyncManager(); + + User u = em.getUser(login, password); + + log.info(login + " - " + password); + if (u != null) { + LoginToken token = new LoginToken(); + token.setToken(auth.getToken(login, password)); + token.setUserid(u.getId()); + JsonTools json = new JsonTools<>(new TypeReference() { + }); + em.close(); + return json.toJson(token); + } + em.close(); + return "{\"error\": \"true\"}"; + } + + @GET + @Path("/logout") + public String logout(@HeaderParam(Authentifier.PARAM_NAME) String token) { + Authentifier auth = Application.getInstance().getAuth(); + auth.deleteToken(token); + return null; + } + + //@GET + @POST + @Path("/subscribe") + @Produces(MediaType.APPLICATION_JSON) + public String subscribe(String jsonCredentials) { + String[] credentials = jsonCredentials.split("&"); + String login = credentials[0].split("=")[1]; + String password = credentials[1].split("=")[1]; + + User u = new User(); + u.setNick(login); + u.setSalt(HasherFactory.generateSalt()); + u.setPasswordHash(password.getBytes()); + u.setCreatedAt(new Date()); + u.setKey(ElGamalAsymKeyFactory.create(false)); + u.setSignature(new ElGamalSignEntity()); + + Manager hasherDecoratorManager = ManagerFactory.createCryptoNetworkUserManager(Application.getInstance().getPeer(), null, u); + + hasherDecoratorManager.begin(); + hasherDecoratorManager.persist(u); + hasherDecoratorManager.end(); + hasherDecoratorManager.close(); + + Authentifier auth = Application.getInstance().getAuth(); + LoginToken token = new LoginToken(); + token.setToken(auth.getToken(login, password)); + token.setUserid(u.getId()); + + JsonTools json = new JsonTools<>(new TypeReference() { + }); + return json.toJson(token); + } + + @POST + @Path("/") + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public String add(User user) { + + return null; + } + + @GET + @Path("/{id}") + @Produces(MediaType.APPLICATION_JSON) + public String get( + @PathParam("id") String id) { + + UserSyncManager em = SyncManagerFactory.createUserSyncManager(); + + JsonTools json = new JsonTools<>(new TypeReference() { + }); + return json.toJson(em.findOneById(id)); + } + + @GET + @Path("/") + @Produces(MediaType.APPLICATION_JSON) + public String get() { + + UserSyncManager em = SyncManagerFactory.createUserSyncManager(); + + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + return json.toJson(em.findAll()); + //return JsonUtils.collectionStringify(em.findAll()); + } + + @PUT + @Path("/{id}") + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public String edit(User user) { + + return null; + } + + @POST + @Path("/password") + @Produces(MediaType.APPLICATION_JSON) + public String changePassword(@HeaderParam(Authentifier.PARAM_NAME) String token, String jsonCredentials) { + + String[] credentials = jsonCredentials.split("&"); + String passwordOld = credentials[0].split("=")[1]; + String passwordNew = credentials[1].split("=")[1]; + String passwordNewConfirm = credentials[2].split("=")[1]; + + if (!passwordNew.equals(passwordNewConfirm)) { + return "{\"error\": \"true\"}"; + } + + Authentifier auth = Application.getInstance().getAuth(); + + UserSyncManager em = SyncManagerFactory.createUserSyncManager(); + + User u = em.getUser(auth.getLogin(token), passwordOld); //search in local + + Manager decoratorUserMg = ManagerFactory.createCryptoUserManager(em, u); // encapsulation of UserSyncManager to hash the new password using decorator pattern + + if (u != null) { + + decoratorUserMg.begin(); + + LoginToken newToken = new LoginToken(); + newToken.setToken(auth.getToken(u.getNick(), passwordNew)); + newToken.setUserid(u.getId()); + + Hasher hasher = HasherFactory.createDefaultHasher(); + u.setSalt(HasherFactory.generateSalt()); + u.setPasswordHash(passwordNew.getBytes()); + + if (decoratorUserMg.end()) { + decoratorUserMg.close(); + JsonTools json = new JsonTools<>(new TypeReference() { + }); + return json.toJson(newToken); + } + } + + decoratorUserMg.close(); + return null; + } + + /** + * This only deletes users from local base. + * TO DO : connect to jxta + * + * @param id + * @param token + * @return + */ + @DELETE + @Path("/{id}") + @Produces(MediaType.APPLICATION_JSON) + public String delete(@PathParam("id") String id, @HeaderParam(Authentifier.PARAM_NAME) String token) { + Authentifier auth = Application.getInstance().getAuth(); + + UserSyncManager users = SyncManagerFactory.createUserSyncManager(); + + User currentUser = users.getUser(auth.getLogin(token), auth.getPassword(token)); + if (currentUser == null) { + users.close(); + return "{\"deleted\": \"false\"}"; + } + Boolean ret = users.begin(); + User us = users.findOneById(id); + return "{\"deleted\": \"" + (ret && users.remove(us) && users.end() && users.close()) + "\"}"; + } + } diff --git a/src/main/java/controller/managers/CryptoItemManagerDecorator.java b/src/main/java/controller/managers/CryptoItemManagerDecorator.java index 437ed9bf..b3716064 100644 --- a/src/main/java/controller/managers/CryptoItemManagerDecorator.java +++ b/src/main/java/controller/managers/CryptoItemManagerDecorator.java @@ -1,141 +1,138 @@ package controller.managers; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - import crypt.api.annotation.ParserAction; import crypt.api.annotation.ParserAnnotation; import crypt.factories.ParserFactory; import model.api.Manager; import model.api.ManagerDecorator; import model.api.ManagerListener; -import model.entity.ElGamalSignEntity; import model.entity.Item; import model.entity.User; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + /** - * * @author Radoua Abderrahim - * */ -public class CryptoItemManagerDecorator extends ManagerDecorator{ - - private User user; - - public CryptoItemManagerDecorator(Manager em,User user) { - super(em); - this.user = user; - } - - @Override - public boolean persist(Item entity) { - return super.persist(entity); - } - - @Override - public void findOneById(String id, final ManagerListener l) { - - super.findOneById(id,new ManagerListener() { - - @Override - public void notify(Collection results) { - - ArrayList rest = new ArrayList<>(); - - Item item = results.iterator().next(); - - if(item != null){ - - ParserAnnotation parser = ParserFactory.createDefaultParser(item, null); - - item = (Item) parser.parseAnnotation(ParserAction.CheckAction); - - if(item != null){ - rest.add(item); - } - } - - l.notify(rest); - } - }); - } - - @Override - public void findAllByAttribute(String attribute, String value, final ManagerListener l) { - - super.findAllByAttribute(attribute, value, new ManagerListener() { - - @Override - public void notify(Collection results) { - - ArrayList rest = new ArrayList<>(); - - for (Iterator iterator = results.iterator(); iterator.hasNext();) { - - Item item = (Item) iterator.next(); - - ParserAnnotation parser = ParserFactory.createDefaultParser(item, null); - - item = (Item) parser.parseAnnotation(ParserAction.CheckAction); - - if(item != null){ - rest.add(item); - } - } - - l.notify(rest); - } - }); - - } - - @Override - public void findOneByAttribute(String attribute, String value, final ManagerListener l) { - - super.findOneByAttribute(attribute, value, new ManagerListener() { - - @Override - public void notify(Collection results) { - - ArrayList rest = new ArrayList<>(); - - Item item = results.iterator().next(); - - if(item != null){ - - ParserAnnotation parser = ParserFactory.createDefaultParser(item, null); - - item = (Item) parser.parseAnnotation(ParserAction.CheckAction); - - if(item != null){ - rest.add(item); - } - } - - l.notify(rest); - } - }); - } - - - @Override - public boolean end() { - - Collection collection = this.changesInWatchlist(); - - for (Item item : collection) { - - if(item.getUserid() == user.getId()){ - - ParserAnnotation parser = ParserFactory.createDefaultParser(item, user.getKey()); - - item = (Item) parser.parseAnnotation(ParserAction.SigneAction); - } - } - - return super.end(); - } - - +public class CryptoItemManagerDecorator extends ManagerDecorator { + + private User user; + + public CryptoItemManagerDecorator(Manager em, User user) { + super(em); + this.user = user; + } + + @Override + public boolean persist(Item entity) { + return super.persist(entity); + } + + @Override + public void findOneById(String id, final ManagerListener l) { + + super.findOneById(id, new ManagerListener() { + + @Override + public void notify(Collection results) { + + ArrayList rest = new ArrayList<>(); + + Item item = results.iterator().next(); + + if (item != null) { + + ParserAnnotation parser = ParserFactory.createDefaultParser(item, null); + + item = (Item) parser.parseAnnotation(ParserAction.CheckAction); + + if (item != null) { + rest.add(item); + } + } + + l.notify(rest); + } + }); + } + + @Override + public void findAllByAttribute(String attribute, String value, final ManagerListener l) { + + super.findAllByAttribute(attribute, value, new ManagerListener() { + + @Override + public void notify(Collection results) { + + ArrayList rest = new ArrayList<>(); + + for (Iterator iterator = results.iterator(); iterator.hasNext(); ) { + + Item item = (Item) iterator.next(); + + ParserAnnotation parser = ParserFactory.createDefaultParser(item, null); + + item = (Item) parser.parseAnnotation(ParserAction.CheckAction); + + if (item != null) { + rest.add(item); + } + } + + l.notify(rest); + } + }); + + } + + @Override + public void findOneByAttribute(String attribute, String value, final ManagerListener l) { + + super.findOneByAttribute(attribute, value, new ManagerListener() { + + @Override + public void notify(Collection results) { + + ArrayList rest = new ArrayList<>(); + + Item item = results.iterator().next(); + + if (item != null) { + + ParserAnnotation parser = ParserFactory.createDefaultParser(item, null); + + item = (Item) parser.parseAnnotation(ParserAction.CheckAction); + + if (item != null) { + rest.add(item); + } + } + + l.notify(rest); + } + }); + } + + + @Override + public boolean end() { + + Collection collection = this.changesInWatchlist(); + + for (Item item : collection) { + + if (item.getUserid() == user.getId()) { + + ParserAnnotation parser = ParserFactory.createDefaultParser(item, user.getKey()); + + item = (Item) parser.parseAnnotation(ParserAction.SigneAction); + } + } + + return super.end(); + } + + } diff --git a/src/main/java/controller/managers/CryptoMessageManagerDecorator.java b/src/main/java/controller/managers/CryptoMessageManagerDecorator.java index 0d24cfaa..7f2f8448 100644 --- a/src/main/java/controller/managers/CryptoMessageManagerDecorator.java +++ b/src/main/java/controller/managers/CryptoMessageManagerDecorator.java @@ -1,97 +1,83 @@ package controller.managers; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Hashtable; -import java.util.Iterator; - -import javax.persistence.Entity; - -import org.eclipse.persistence.internal.jpa.metadata.structures.ArrayAccessor; - -import controller.Application; import crypt.api.annotation.ParserAction; import crypt.api.annotation.ParserAnnotation; import crypt.factories.ParserFactory; import model.api.Manager; import model.api.ManagerDecorator; import model.api.ManagerListener; -import model.api.UserSyncManager; -import model.entity.User; -import model.factory.ManagerFactory; -import model.syncManager.UserSyncManagerImpl; -import network.api.Peer; -import model.entity.ElGamalSignEntity; -import model.entity.Item; import model.entity.Message; +import model.entity.User; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; /** - * * @author Radoua Abderrahim - * */ -public class CryptoMessageManagerDecorator extends ManagerDecorator{ - - private User user,userSender; - private String who; - - public CryptoMessageManagerDecorator(Manager em,String who,User reciever,User sender) { - super(em); - this.user = reciever; - this.userSender = sender; - this.who = who; - } - - @Override - public boolean persist(Message entity) { - - ParserAnnotation parser = ParserFactory.createDefaultParser(entity, userSender.getKey()); - - entity = (Message) parser.parseAnnotation(ParserAction.SigneAction); - - parser.setKey(user.getKey()); - - entity = (Message) parser.parseAnnotation(ParserAction.CryptAction); - - return super.persist(entity); - } - - @Override - public void findAllByAttribute(String attribute, String value, final ManagerListener l) { - - super.findAllByAttribute(attribute, value, new ManagerListener() { - @Override - public void notify(Collection results) { - - ArrayList res = new ArrayList<>(); - - for (Iterator iterator = results.iterator(); iterator.hasNext();) { - - Message message = (Message) iterator.next(); - - ParserAnnotation parser; - - parser = ParserFactory.createDefaultParser(message, user.getKey()); - - message = (Message) parser.parseAnnotation(ParserAction.DecryptAction); - - parser.setKey(null); - - message = (Message) parser.parseAnnotation(ParserAction.CheckAction); - - - if(message != null){ - res.add(message); - } - } - - l.notify(res); - } - }); - } - - @Override - public boolean end() { - return super.end(); - } +public class CryptoMessageManagerDecorator extends ManagerDecorator { + + private User user, userSender; + private String who; + + public CryptoMessageManagerDecorator(Manager em, String who, User reciever, User sender) { + super(em); + this.user = reciever; + this.userSender = sender; + this.who = who; + } + + @Override + public boolean persist(Message entity) { + + ParserAnnotation parser = ParserFactory.createDefaultParser(entity, userSender.getKey()); + + entity = (Message) parser.parseAnnotation(ParserAction.SigneAction); + + parser.setKey(user.getKey()); + + entity = (Message) parser.parseAnnotation(ParserAction.CryptAction); + + return super.persist(entity); + } + + @Override + public void findAllByAttribute(String attribute, String value, final ManagerListener l) { + + super.findAllByAttribute(attribute, value, new ManagerListener() { + @Override + public void notify(Collection results) { + + ArrayList res = new ArrayList<>(); + + for (Iterator iterator = results.iterator(); iterator.hasNext(); ) { + + Message message = (Message) iterator.next(); + + ParserAnnotation parser; + + parser = ParserFactory.createDefaultParser(message, user.getKey()); + + message = (Message) parser.parseAnnotation(ParserAction.DecryptAction); + + parser.setKey(null); + + message = (Message) parser.parseAnnotation(ParserAction.CheckAction); + + + if (message != null) { + res.add(message); + } + } + + l.notify(res); + } + }); + } + + @Override + public boolean end() { + return super.end(); + } } diff --git a/src/main/java/controller/managers/CryptoUserManagerDecorator.java b/src/main/java/controller/managers/CryptoUserManagerDecorator.java index 961ace53..a06423e4 100644 --- a/src/main/java/controller/managers/CryptoUserManagerDecorator.java +++ b/src/main/java/controller/managers/CryptoUserManagerDecorator.java @@ -1,57 +1,48 @@ package controller.managers; -import java.util.Collection; - -import javax.persistence.Entity; - import crypt.api.annotation.ParserAction; import crypt.api.annotation.ParserAnnotation; import crypt.factories.ParserFactory; import model.api.Manager; import model.api.ManagerDecorator; -import model.api.ManagerListener; -import model.entity.ElGamalSignEntity; -import model.entity.Item; import model.entity.User; -import network.api.advertisement.UserAdvertisementInterface; -import network.factories.AdvertisementFactory; + +import java.util.Collection; /** - * * @author Radoua Abderrahim - * */ -public class CryptoUserManagerDecorator extends ManagerDecorator{ - - private User user; - - public CryptoUserManagerDecorator(Manager em,User user) { - super(em); - this.user = user; - } - - @Override - public boolean persist(User entity) { - return super.persist(entity); - } - - @Override - public boolean end() { - - Collection collection = this.changesInWatchlist(); - - for (User u : collection) { - - if(u.getId() == user.getId()){ - - ParserAnnotation parser = ParserFactory.createDefaultParser(u, user.getKey()); - - u =(User) parser.parseAnnotation(ParserAction.HasherAction,ParserAction.SigneAction); - - } - } - - return super.end(); - } - +public class CryptoUserManagerDecorator extends ManagerDecorator { + + private User user; + + public CryptoUserManagerDecorator(Manager em, User user) { + super(em); + this.user = user; + } + + @Override + public boolean persist(User entity) { + return super.persist(entity); + } + + @Override + public boolean end() { + + Collection collection = this.changesInWatchlist(); + + for (User u : collection) { + + if (u.getId() == user.getId()) { + + ParserAnnotation parser = ParserFactory.createDefaultParser(u, user.getKey()); + + u = (User) parser.parseAnnotation(ParserAction.HasherAction, ParserAction.SigneAction); + + } + } + + return super.end(); + } + } diff --git a/src/main/java/controller/managers/NetworkContractManagerDecorator.java b/src/main/java/controller/managers/NetworkContractManagerDecorator.java index a9f1c412..3d2ea08d 100644 --- a/src/main/java/controller/managers/NetworkContractManagerDecorator.java +++ b/src/main/java/controller/managers/NetworkContractManagerDecorator.java @@ -1,125 +1,120 @@ package controller.managers; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import model.api.Manager; import model.api.ManagerDecorator; import model.api.ManagerListener; import model.entity.ContractEntity; -import model.entity.Item; import model.syncManager.ContractSyncManagerImpl; -import network.api.EstablisherService; -import network.api.Messages; -import network.api.Peer; -import network.api.SearchListener; -import network.api.ServiceListener; +import network.api.*; import network.api.advertisement.EstablisherAdvertisementInterface; import network.api.service.Service; import network.factories.AdvertisementFactory; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + public class NetworkContractManagerDecorator extends ManagerDecorator { - private Peer peer; - private String who; - - /** - * - * @param em Contract async manager - * @param peer Peer instance, started - * @param who who own this instance - */ - public NetworkContractManagerDecorator(Manager em, Peer peer, String who) { - super(em); - this.peer = peer; - this.who = who; - } - - @Override - public void findOneById(final String id, final ManagerListener l) { - super.findOneById(id, l); - //TODO - } - - @Override - public void findAllByAttribute(String attribute, final String value, final ManagerListener l) { - super.findAllByAttribute(attribute, value, l); - final EstablisherService establisher = (EstablisherService) peer.getService(EstablisherService.NAME); - Service service = peer.getService(EstablisherService.NAME); - - establisher.removeListener(who); - establisher.addListener(new ServiceListener() { - - @Override - public void notify(Messages messages) { - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - ArrayList contracts = json.toEntity(messages.getMessage("contract")); - System.out.println("contract found !"); - System.out.println(messages.getMessage("contract")); - for(ContractEntity c : contracts) { - System.out.println(c.getId()); - } - l.notify(json.toEntity(messages.getMessage("contract"))); - } - - }, who == null ? "test":who); - - service.search(attribute, value, new SearchListener() { - @Override - public void notify(Collection result) { - ArrayList uids = new ArrayList<>(); - for(EstablisherAdvertisementInterface i: result) { - uids.add(i.getSourceURI()); - } - ContractSyncManagerImpl co = new ContractSyncManagerImpl(); - Collection c = co.findAllByAttribute("id", value); - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - establisher.sendContract(value, who == null ? "test":who, "",json.toJson(c) , uids.toArray(new String[1])); - } - - }); - } - - @Override - public void findOneByAttribute(String attribute, String value, ManagerListener l) { - super.findOneByAttribute(attribute, value, l); - //TODO - } - - @Override - public boolean persist(ContractEntity entity) { - return super.persist(entity); - } - - @Override - public boolean begin() { - return super.begin(); - } - - @Override - public boolean end() { - - if(super.end()){ - - Collection collection = this.watchlist(); - - for (Iterator iterator = collection.iterator(); iterator.hasNext();) { - - ContractEntity contractEntity = (ContractEntity) iterator.next(); - - EstablisherAdvertisementInterface iadv = AdvertisementFactory.createEstablisherAdvertisement(); - - iadv.setTitle(contractEntity.getId()); - - iadv.publish(peer); - } - - return true; - } - - return false; - } + private Peer peer; + private String who; + + /** + * @param em Contract async manager + * @param peer Peer instance, started + * @param who who own this instance + */ + public NetworkContractManagerDecorator(Manager em, Peer peer, String who) { + super(em); + this.peer = peer; + this.who = who; + } + + @Override + public void findOneById(final String id, final ManagerListener l) { + super.findOneById(id, l); + //TODO + } + + @Override + public void findAllByAttribute(String attribute, final String value, final ManagerListener l) { + super.findAllByAttribute(attribute, value, l); + final EstablisherService establisher = (EstablisherService) peer.getService(EstablisherService.NAME); + Service service = peer.getService(EstablisherService.NAME); + + establisher.removeListener(who); + establisher.addListener(new ServiceListener() { + + @Override + public void notify(Messages messages) { + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + ArrayList contracts = json.toEntity(messages.getMessage("contract")); + System.out.println("contract found !"); + System.out.println(messages.getMessage("contract")); + for (ContractEntity c : contracts) { + System.out.println(c.getId()); + } + l.notify(json.toEntity(messages.getMessage("contract"))); + } + + }, who == null ? "test" : who); + + service.search(attribute, value, new SearchListener() { + @Override + public void notify(Collection result) { + ArrayList uids = new ArrayList<>(); + for (EstablisherAdvertisementInterface i : result) { + uids.add(i.getSourceURI()); + } + ContractSyncManagerImpl co = new ContractSyncManagerImpl(); + Collection c = co.findAllByAttribute("id", value); + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + establisher.sendContract(value, who == null ? "test" : who, "", json.toJson(c), uids.toArray(new String[1])); + } + + }); + } + + @Override + public void findOneByAttribute(String attribute, String value, ManagerListener l) { + super.findOneByAttribute(attribute, value, l); + //TODO + } + + @Override + public boolean persist(ContractEntity entity) { + return super.persist(entity); + } + + @Override + public boolean begin() { + return super.begin(); + } + + @Override + public boolean end() { + + if (super.end()) { + + Collection collection = this.watchlist(); + + for (Iterator iterator = collection.iterator(); iterator.hasNext(); ) { + + ContractEntity contractEntity = (ContractEntity) iterator.next(); + + EstablisherAdvertisementInterface iadv = AdvertisementFactory.createEstablisherAdvertisement(); + + iadv.setTitle(contractEntity.getId()); + + iadv.publish(peer); + } + + return true; + } + + return false; + } } diff --git a/src/main/java/controller/managers/NetworkItemManagerDecorator.java b/src/main/java/controller/managers/NetworkItemManagerDecorator.java index 3c7904d6..f1aef457 100644 --- a/src/main/java/controller/managers/NetworkItemManagerDecorator.java +++ b/src/main/java/controller/managers/NetworkItemManagerDecorator.java @@ -1,50 +1,40 @@ package controller.managers; -import java.util.ArrayList; -import java.util.Collection; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; -import crypt.api.annotation.ParserAction; -import crypt.api.annotation.ParserAnnotation; -import crypt.factories.ParserFactory; import model.api.Manager; import model.api.ManagerDecorator; import model.api.ManagerListener; import model.entity.Item; -import network.api.ItemRequestService; -import network.api.ItemService; -import network.api.Messages; -import network.api.Peer; -import network.api.SearchListener; -import network.api.ServiceListener; +import network.api.*; import network.api.advertisement.ItemAdvertisementInterface; import network.api.service.Service; import network.factories.AdvertisementFactory; -public class NetworkItemManagerDecorator extends ManagerDecorator{ - - private Peer peer; - private String who; - - /** - * - * @param em Item async manager - * @param peer Peer instance, started - * @param who who own this instance - */ - public NetworkItemManagerDecorator(Manager em, Peer peer, String who) { - super(em); - this.peer = peer; - this.who = who; - } - - @Override - public void findOneById(final String id, final ManagerListener l) { - super.findOneById(id, l); - //TODO - /*final ItemRequestService itemSender = (ItemRequestService) Application.getInstance().getPeer().getService(JxtaItemsSenderService.NAME); +import java.util.ArrayList; +import java.util.Collection; + +public class NetworkItemManagerDecorator extends ManagerDecorator { + + private Peer peer; + private String who; + + /** + * @param em Item async manager + * @param peer Peer instance, started + * @param who who own this instance + */ + public NetworkItemManagerDecorator(Manager em, Peer peer, String who) { + super(em); + this.peer = peer; + this.who = who; + } + + @Override + public void findOneById(final String id, final ManagerListener l) { + super.findOneById(id, l); + //TODO + /*final ItemRequestService itemSender = (ItemRequestService) Application.getInstance().getPeer().getService(JxtaItemsSenderService.NAME); Service items = Application.getInstance().getPeer().getService(JxtaItemService.NAME); itemSender.addListener(new ServiceListener() { @@ -69,95 +59,95 @@ public void notify(Collection result) { } });*/ - - } - @Override - public void findAllByAttribute(String attribute, final String value, final ManagerListener l) { - super.findAllByAttribute(attribute, value, l); - final ItemRequestService itemSender = (ItemRequestService) peer.getService(ItemRequestService.NAME); - Service items = peer.getService(ItemService.NAME); - - itemSender.removeListener(who); - itemSender.addListener(new ServiceListener() { - - @Override - public void notify(Messages messages) { - JsonTools> json = new JsonTools<>(new TypeReference>(){}); + } + + @Override + public void findAllByAttribute(String attribute, final String value, final ManagerListener l) { + super.findAllByAttribute(attribute, value, l); + final ItemRequestService itemSender = (ItemRequestService) peer.getService(ItemRequestService.NAME); + Service items = peer.getService(ItemService.NAME); + + itemSender.removeListener(who); + itemSender.addListener(new ServiceListener() { + + @Override + public void notify(Messages messages) { + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); // ArrayList items = json.toEntity(messages.getMessage("items")); // System.out.println("items found !"); // System.out.println(messages.getMessage("items")); // for(Item i : items) { // System.out.println(i.getTitle()); // } - l.notify(json.toEntity(messages.getMessage("items"))); - } - - }, who == null ? "test":who); - - items.search(attribute, value, new SearchListener() { - @Override - public void notify(Collection result) { - ArrayList uids = new ArrayList<>(); - for(ItemAdvertisementInterface i: result) { - uids.add(i.getSourceURI()); - } - itemSender.sendRequest(value, who == null ? "test":who, uids.toArray(new String[1])); - } - - }); - } - - @Override - public void findOneByAttribute(String attribute, String value, ManagerListener l) { - super.findOneByAttribute(attribute, value, l); - //TODO - } - - @Override - public boolean persist(Item entity) { - if (super.persist(entity)){ - //ItemAdvertisementInterface iadv = AdvertisementFactory.createItemAdvertisement(); - //iadv.setTitle(entity.getTitle()); - //iadv.publish(peer); - return true; - } - return false; - } - - @Override - public boolean begin() { - return super.begin(); - } - - @Override - public boolean end() { - - Collection collection = this.changesInWatchlist(); - - for (Item item : collection) { - - ItemAdvertisementInterface iadv = AdvertisementFactory.createItemAdvertisement(); - - iadv.setTitle(item.getTitle()); - - iadv.publish(peer); - - } - - return super.end(); - } - - @Override - public boolean check(){ - return super.check(); - } - - @Override - public boolean close(){ - return super.close(); - } - - - + l.notify(json.toEntity(messages.getMessage("items"))); + } + + }, who == null ? "test" : who); + + items.search(attribute, value, new SearchListener() { + @Override + public void notify(Collection result) { + ArrayList uids = new ArrayList<>(); + for (ItemAdvertisementInterface i : result) { + uids.add(i.getSourceURI()); + } + itemSender.sendRequest(value, who == null ? "test" : who, uids.toArray(new String[1])); + } + + }); + } + + @Override + public void findOneByAttribute(String attribute, String value, ManagerListener l) { + super.findOneByAttribute(attribute, value, l); + //TODO + } + + @Override + public boolean persist(Item entity) { + if (super.persist(entity)) { + //ItemAdvertisementInterface iadv = AdvertisementFactory.createItemAdvertisement(); + //iadv.setTitle(entity.getTitle()); + //iadv.publish(peer); + return true; + } + return false; + } + + @Override + public boolean begin() { + return super.begin(); + } + + @Override + public boolean end() { + + Collection collection = this.changesInWatchlist(); + + for (Item item : collection) { + + ItemAdvertisementInterface iadv = AdvertisementFactory.createItemAdvertisement(); + + iadv.setTitle(item.getTitle()); + + iadv.publish(peer); + + } + + return super.end(); + } + + @Override + public boolean check() { + return super.check(); + } + + @Override + public boolean close() { + return super.close(); + } + + } diff --git a/src/main/java/controller/managers/NetworkMessageManagerDecorator.java b/src/main/java/controller/managers/NetworkMessageManagerDecorator.java index 07659dd3..9b71948a 100644 --- a/src/main/java/controller/managers/NetworkMessageManagerDecorator.java +++ b/src/main/java/controller/managers/NetworkMessageManagerDecorator.java @@ -1,99 +1,89 @@ package controller.managers; -import java.util.ArrayList; -import java.util.Collection; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import model.api.Manager; import model.api.ManagerDecorator; import model.api.ManagerListener; import model.entity.Message; -import model.entity.User; -import network.api.MessageRequestService; -import network.api.MessageService; -import network.api.Messages; -import network.api.Peer; -import network.api.SearchListener; -import network.api.ServiceListener; -import network.api.UserRequestService; -import network.api.UserService; +import network.api.*; import network.api.advertisement.MessageAdvertisementInterface; -import network.api.advertisement.UserAdvertisementInterface; import network.api.service.Service; import network.factories.AdvertisementFactory; -public class NetworkMessageManagerDecorator extends ManagerDecorator{ - - private Peer peer; - private String who; - - /** - * - * @param em Message async manager - * @param peer Peer instance, started - * @param who who own this instance - */ - public NetworkMessageManagerDecorator(Manager em, Peer peer, String who) { - super(em); - this.peer = peer; - this.who = who; - } - - - @Override - public void findAllByAttribute(String attribute, final String value, final ManagerListener l) { - - super.findAllByAttribute(attribute, value, l); - - final MessageRequestService messagesSender = (MessageRequestService) peer.getService(MessageRequestService.NAME); - Service messages = peer.getService(MessageService.NAME); - - messagesSender.removeListener(who); - messagesSender.addListener(new ServiceListener() { - @Override - public void notify(Messages messages) { - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - - Collection collections = json.toEntity(messages.getMessage("messages")); - - l.notify(collections); - } - }, who); - - messages.search(attribute, value, new SearchListener() { - @Override - public void notify(Collection result) { - ArrayList uids = new ArrayList<>(); - for(MessageAdvertisementInterface i: result) { - uids.add(i.getSourceURI()); - } - - messagesSender.sendRequest(value,value, who, uids.toArray(new String[1])); - } - }); - } - - - @Override - public boolean end() { - - Collection collection = this.changesInWatchlist(); - - for (Message m : collection) { - - MessageAdvertisementInterface madv = AdvertisementFactory.createMessageAdvertisement(); - - madv.setSenderId(m.getSenderId()); - - madv.setReceiverId(m.getReceiverId()); - - madv.publish(peer); - System.out.println("message publish"); - } - - return super.end(); - } - +import java.util.ArrayList; +import java.util.Collection; + +public class NetworkMessageManagerDecorator extends ManagerDecorator { + + private Peer peer; + private String who; + + /** + * @param em Message async manager + * @param peer Peer instance, started + * @param who who own this instance + */ + public NetworkMessageManagerDecorator(Manager em, Peer peer, String who) { + super(em); + this.peer = peer; + this.who = who; + } + + + @Override + public void findAllByAttribute(String attribute, final String value, final ManagerListener l) { + + super.findAllByAttribute(attribute, value, l); + + final MessageRequestService messagesSender = (MessageRequestService) peer.getService(MessageRequestService.NAME); + Service messages = peer.getService(MessageService.NAME); + + messagesSender.removeListener(who); + messagesSender.addListener(new ServiceListener() { + @Override + public void notify(Messages messages) { + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + + Collection collections = json.toEntity(messages.getMessage("messages")); + + l.notify(collections); + } + }, who); + + messages.search(attribute, value, new SearchListener() { + @Override + public void notify(Collection result) { + ArrayList uids = new ArrayList<>(); + for (MessageAdvertisementInterface i : result) { + uids.add(i.getSourceURI()); + } + + messagesSender.sendRequest(value, value, who, uids.toArray(new String[1])); + } + }); + } + + + @Override + public boolean end() { + + Collection collection = this.changesInWatchlist(); + + for (Message m : collection) { + + MessageAdvertisementInterface madv = AdvertisementFactory.createMessageAdvertisement(); + + madv.setSenderId(m.getSenderId()); + + //madv.setReceiverId(m.getReceiverId()); + + madv.publish(peer); + System.out.println("message publish"); + } + + return super.end(); + } + } diff --git a/src/main/java/controller/managers/NetworkUserManagerDecorator.java b/src/main/java/controller/managers/NetworkUserManagerDecorator.java index 2c3b1a63..c3da295b 100644 --- a/src/main/java/controller/managers/NetworkUserManagerDecorator.java +++ b/src/main/java/controller/managers/NetworkUserManagerDecorator.java @@ -1,122 +1,121 @@ package controller.managers; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Hashtable; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import model.api.Manager; import model.api.ManagerDecorator; import model.api.ManagerListener; import model.entity.User; -import network.api.Messages; -import network.api.Peer; -import network.api.SearchListener; -import network.api.ServiceListener; -import network.api.UserRequestService; -import network.api.UserService; +import network.api.*; import network.api.advertisement.UserAdvertisementInterface; import network.api.service.Service; import network.factories.AdvertisementFactory; -public class NetworkUserManagerDecorator extends ManagerDecorator{ - - private Peer peer; - private String who; - - /** - * - * @param em User async manager - * @param peer Peer instance, started - * @param who who own this instance - */ - public NetworkUserManagerDecorator(Manager em, Peer peer, String who) { - super(em); - this.peer = peer; - this.who = who; - } - - @Override - public void findOneByAttribute(String attribute, final String value, final ManagerListener l) { - - super.findOneByAttribute(attribute, value, l); - - final UserRequestService usersSender = (UserRequestService) peer.getService(UserRequestService.NAME); - Service users = peer.getService(UserService.NAME); - - usersSender.removeListener(who); - usersSender.addListener(new ServiceListener() { - @Override - public void notify(Messages messages) { - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - Collection collections = json.toEntity(messages.getMessage("users")); - l.notify(collections); - } - }, who == null ? "test":who); - - users.search(attribute, value, new SearchListener() { - @Override - public void notify(Collection result) { - ArrayList uids = new ArrayList<>(); - for(UserAdvertisementInterface i: result) { - uids.add(i.getSourceURI()); - } - usersSender.sendRequest(value, who == null ? "test":who, uids.toArray(new String[1])); - } - }); - } - - @Override - public void findAllByAttribute(String attribute, final String value, final ManagerListener l) { - - super.findAllByAttribute(attribute, value, l); - - final UserRequestService usersSender = (UserRequestService) peer.getService(UserRequestService.NAME); - Service users = peer.getService(UserService.NAME); - - usersSender.removeListener(who); - usersSender.addListener(new ServiceListener() { - @Override - public void notify(Messages messages) { - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - Collection collections = json.toEntity(messages.getMessage("users")); - l.notify(collections); - } - }, who == null ? "test":who); - - users.search(attribute, value, new SearchListener() { - @Override - public void notify(Collection result) { - ArrayList uids = new ArrayList<>(); - for(UserAdvertisementInterface i: result) { - uids.add(i.getSourceURI()); - } - usersSender.sendRequest(value, who == null ? "test":who, uids.toArray(new String[1])); - } - }); - } - - @Override - public boolean end() { - - Collection collection = this.changesInWatchlist(); - - for (User u : collection) { - - UserAdvertisementInterface uadv = AdvertisementFactory.createUserAdvertisement(); - - uadv.setNick(u.getNick()); - - uadv.setPbkey(String.valueOf(u.getKey().getPublicKey())); - - uadv.publish(peer); - - } - - return super.end(); - } - +import java.util.ArrayList; +import java.util.Collection; + +public class NetworkUserManagerDecorator extends ManagerDecorator { + + private Peer peer; + private String who; + + /** + * @param em User async manager + * @param peer Peer instance, started + * @param who who own this instance + */ + public NetworkUserManagerDecorator(Manager em, Peer peer, String who) { + super(em); + this.peer = peer; + this.who = who; + } + + @Override + public void findOneByAttribute(String attribute, final String value, final ManagerListener l) { + + super.findOneByAttribute(attribute, value, l); + + final UserRequestService usersSender = (UserRequestService) peer.getService(UserRequestService.NAME); + Service users = peer.getService(UserService.NAME); + + usersSender.removeListener(who); + usersSender.addListener(new ServiceListener() { + @Override + public void notify(Messages messages) { + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + Collection collections = json.toEntity(messages.getMessage("users")); + l.notify(collections); + } + }, who == null ? "test" : who); + + users.search(attribute, value, new SearchListener() { + @Override + public void notify(Collection result) { + ArrayList uids = new ArrayList<>(); + for (UserAdvertisementInterface i : result) { + uids.add(i.getSourceURI()); + } + usersSender.sendRequest(value, who == null ? "test" : who, uids.toArray(new String[1])); + } + }); + } + + + @Override + public void findAll(final ManagerListener l){ + super.findAll(l); + } + + @Override + public void findAllByAttribute(String attribute, final String value, final ManagerListener l) { + + super.findAllByAttribute(attribute, value, l); + + final UserRequestService usersSender = (UserRequestService) peer.getService(UserRequestService.NAME); + Service users = peer.getService(UserService.NAME); + + usersSender.removeListener(who); + usersSender.addListener(new ServiceListener() { + @Override + public void notify(Messages messages) { + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + Collection collections = json.toEntity(messages.getMessage("users")); + l.notify(collections); + } + }, who == null ? "test" : who); + + users.search(attribute, value, new SearchListener() { + @Override + public void notify(Collection result) { + ArrayList uids = new ArrayList<>(); + for (UserAdvertisementInterface i : result) { + uids.add(i.getSourceURI()); + } + usersSender.sendRequest(value, who == null ? "test" : who, uids.toArray(new String[1])); + } + }); + } + + @Override + public boolean end() { + + Collection collection = this.changesInWatchlist(); + + for (User u : collection) { + + UserAdvertisementInterface uadv = AdvertisementFactory.createUserAdvertisement(); + + uadv.setNick(u.getNick()); + + uadv.setPbkey(String.valueOf(u.getKey().getPublicKey())); + + uadv.publish(peer); + + } + + return super.end(); + } + } diff --git a/src/main/java/controller/managers/ResilienceContractManagerDecorator.java b/src/main/java/controller/managers/ResilienceContractManagerDecorator.java index 7e538a70..bb3c8ad4 100644 --- a/src/main/java/controller/managers/ResilienceContractManagerDecorator.java +++ b/src/main/java/controller/managers/ResilienceContractManagerDecorator.java @@ -7,7 +7,7 @@ public class ResilienceContractManagerDecorator extends ManagerDecorator { - public ResilienceContractManagerDecorator(Manager em, Peer peer) { - super(em); - } + public ResilienceContractManagerDecorator(Manager em, Peer peer) { + super(em); + } } diff --git a/src/main/java/controller/managers/ResilienceItemManagerDecorator.java b/src/main/java/controller/managers/ResilienceItemManagerDecorator.java index 3b0fe6c3..1a555adf 100644 --- a/src/main/java/controller/managers/ResilienceItemManagerDecorator.java +++ b/src/main/java/controller/managers/ResilienceItemManagerDecorator.java @@ -5,10 +5,10 @@ import model.entity.Item; import network.api.Peer; -public class ResilienceItemManagerDecorator extends ManagerDecorator{ +public class ResilienceItemManagerDecorator extends ManagerDecorator { - public ResilienceItemManagerDecorator(Manager em, Peer peer) { - super(em); - } + public ResilienceItemManagerDecorator(Manager em, Peer peer) { + super(em); + } } diff --git a/src/main/java/controller/tools/BigIntegerDeserializer.java b/src/main/java/controller/tools/BigIntegerDeserializer.java index 14138141..8274c9b0 100644 --- a/src/main/java/controller/tools/BigIntegerDeserializer.java +++ b/src/main/java/controller/tools/BigIntegerDeserializer.java @@ -1,20 +1,20 @@ package controller.tools; -import java.io.IOException; -import java.math.BigInteger; - import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -public class BigIntegerDeserializer extends JsonDeserializer{ +import java.io.IOException; +import java.math.BigInteger; + +public class BigIntegerDeserializer extends JsonDeserializer { - @Override - public BigInteger deserialize(JsonParser p, DeserializationContext ctxt) - throws IOException, JsonProcessingException { - // TODO Auto-generated method stub - return new BigInteger(p.getValueAsString(), 16); - } + @Override + public BigInteger deserialize(JsonParser p, DeserializationContext ctxt) + throws IOException, JsonProcessingException { + // TODO Auto-generated method stub + return new BigInteger(p.getValueAsString(), 16); + } } diff --git a/src/main/java/controller/tools/BigIntegerSerializer.java b/src/main/java/controller/tools/BigIntegerSerializer.java index 05b99fda..692b51dc 100644 --- a/src/main/java/controller/tools/BigIntegerSerializer.java +++ b/src/main/java/controller/tools/BigIntegerSerializer.java @@ -1,19 +1,19 @@ package controller.tools; -import java.io.IOException; -import java.math.BigInteger; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -public class BigIntegerSerializer extends JsonSerializer{ +import java.io.IOException; +import java.math.BigInteger; + +public class BigIntegerSerializer extends JsonSerializer { - @Override - public void serialize(BigInteger value, JsonGenerator gen, SerializerProvider serializers) - throws IOException, JsonProcessingException { - gen.writeString(value.toString(16)); - } + @Override + public void serialize(BigInteger value, JsonGenerator gen, SerializerProvider serializers) + throws IOException, JsonProcessingException { + gen.writeString(value.toString(16)); + } } diff --git a/src/main/java/controller/tools/JsonTools.java b/src/main/java/controller/tools/JsonTools.java index 2dfcccc0..610c5a17 100644 --- a/src/main/java/controller/tools/JsonTools.java +++ b/src/main/java/controller/tools/JsonTools.java @@ -1,8 +1,5 @@ package controller.tools; -import java.io.IOException; -import java.util.Map; - import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -10,102 +7,100 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; -import model.entity.ElGamalKey; -import model.entity.ElGamalSignEntity; +import java.io.IOException; +import java.util.Map; //TODO : check class with sigma.Responses and without //import protocol.impl.sigma.Responses; public class JsonTools { - - private TypeReference type; - - - public JsonTools(final TypeReference type) { - this.type = type; - } - - public String toJson(Entity entity) { - ObjectMapper mapper = new ObjectMapper(); - try { - return mapper.writeValueAsString(entity); - } catch (JsonProcessingException e) { - LoggerUtilities.logStackTrace(e); - } - return "error"; - } - - @SuppressWarnings("unchecked") - public Entity toEntity(String json) { - ObjectMapper mapper = new ObjectMapper(); - try { - return (Entity) mapper.readValue(json, type); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - return null; - } - } - - - /** - * return a correct json string even if java objects contains Map<> - * @param entity - * java entity to transform in json - * @param containsMap - * differentiate from former method (true or false will do the same thing) - * @return - */ - public String toJson(Entity entity, boolean containsMap) { - if (!containsMap) - return toJson(entity); - - ObjectMapper mapper = new ObjectMapper(); - SimpleModule simpleModule = new SimpleModule("SimpleModule"); - - //TODO: check next ligne. - //simpleModule.addSerializer(new MapSerializer()); - - //simpleModule.addSerializer(new MapSerializer()); - - simpleModule.addSerializer(new MapSerializer<>()); - - mapper.registerModule(simpleModule); - try { - return mapper.writeValueAsString(entity); - } catch (JsonProcessingException e) { - e.printStackTrace(); - } - return "error"; - } - - /** - * return a correct java object even if it contains a Map - * @param json - * json String to put into java - * @param containsMap - * differentiate from former method - * @return Entity - */ - @SuppressWarnings("unchecked") - public Entity toEntity(String json, boolean containsMap) { - if (!containsMap) - return toEntity(json); - - ObjectMapper mapper = new ObjectMapper(); - SimpleModule simpleModule = new SimpleModule("SimpleModule"); - simpleModule.addDeserializer(Map.class, new MapResponseKeyDeserializer()); - //simpleModule.addDeserializer(Map.class, new MapResponseSignatureDeserializer()); - mapper.registerModule(simpleModule); - try { - return (Entity) mapper.readValue(json, type); - } catch (JsonParseException ex) { - return null; - } catch (JsonMappingException ex){ - System.out.println(ex); - return null; - }catch (IOException e){ - e.printStackTrace(); - return null; - } - } + + private TypeReference type; + + + public JsonTools(final TypeReference type) { + this.type = type; + } + + public String toJson(Entity entity) { + ObjectMapper mapper = new ObjectMapper(); + try { + return mapper.writeValueAsString(entity); + } catch (JsonProcessingException e) { + LoggerUtilities.logStackTrace(e); + } + return "error"; + } + + @SuppressWarnings("unchecked") + public Entity toEntity(String json) { + ObjectMapper mapper = new ObjectMapper(); + try { + return (Entity) mapper.readValue(json, type); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + return null; + } + } + + + /** + * return a correct json string even if java objects contains Map<> + * + * @param entity java entity to transform in json + * @param containsMap differentiate from former method (true or false will do the same thing) + * @return + */ + public String toJson(Entity entity, boolean containsMap) { + if (!containsMap) + return toJson(entity); + + ObjectMapper mapper = new ObjectMapper(); + SimpleModule simpleModule = new SimpleModule("SimpleModule"); + + //TODO: check next ligne. + //simpleModule.addSerializer(new MapSerializer()); + + //simpleModule.addSerializer(new MapSerializer()); + + simpleModule.addSerializer(new MapSerializer<>()); + + mapper.registerModule(simpleModule); + try { + return mapper.writeValueAsString(entity); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + return "error"; + } + + /** + * return a correct java object even if it contains a Map + * + * @param json json String to put into java + * @param containsMap differentiate from former method + * @return Entity + */ + @SuppressWarnings("unchecked") + public Entity toEntity(String json, boolean containsMap) { + if (!containsMap) + return toEntity(json); + + ObjectMapper mapper = new ObjectMapper(); + SimpleModule simpleModule = new SimpleModule("SimpleModule"); + simpleModule.addDeserializer(Map.class, new MapResponseKeyDeserializer()); + //simpleModule.addDeserializer(Map.class, new MapResponseSignatureDeserializer()); + mapper.registerModule(simpleModule); + try { + return (Entity) mapper.readValue(json, type); + } catch (JsonParseException ex) { + return null; + } catch (JsonMappingException ex) { + System.out.println(ex); + return null; + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } } diff --git a/src/main/java/controller/tools/LoggerUtilities.java b/src/main/java/controller/tools/LoggerUtilities.java index 5ffe96ce..836e41db 100644 --- a/src/main/java/controller/tools/LoggerUtilities.java +++ b/src/main/java/controller/tools/LoggerUtilities.java @@ -3,24 +3,25 @@ import org.apache.log4j.LogManager; public class LoggerUtilities { - - /** - * Log the stacktrace if it exists and return it in a string. - * @param e input exception - * @return String containing the stacktrace - */ - static public String logStackTrace(Exception e){ - if (e == null) - return ""; - StackTraceElement[] stackTrace = e.getStackTrace(); - StringBuffer buff = new StringBuffer(); - buff.append(e.toString() + '\n' + e.getMessage() + '\n'); - for(StackTraceElement el : stackTrace){ - buff.append(el.toString() + '\n'); - } - String ret = buff.toString(); - LogManager.getLogger(stackTrace[0].getClassName()).error(ret); - return ret; - } + + /** + * Log the stacktrace if it exists and return it in a string. + * + * @param e input exception + * @return String containing the stacktrace + */ + static public String logStackTrace(Exception e) { + if (e == null) + return ""; + StackTraceElement[] stackTrace = e.getStackTrace(); + StringBuffer buff = new StringBuffer(); + buff.append(e.toString() + '\n' + e.getMessage() + '\n'); + for (StackTraceElement el : stackTrace) { + buff.append(el.toString() + '\n'); + } + String ret = buff.toString(); + LogManager.getLogger(stackTrace[0].getClassName()).error(ret); + return ret; + } } diff --git a/src/main/java/controller/tools/MapKeyStringDeserializer.java b/src/main/java/controller/tools/MapKeyStringDeserializer.java index 58057887..011b1d19 100644 --- a/src/main/java/controller/tools/MapKeyStringDeserializer.java +++ b/src/main/java/controller/tools/MapKeyStringDeserializer.java @@ -1,29 +1,28 @@ package controller.tools; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; - import model.entity.ElGamalKey; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + public class MapKeyStringDeserializer extends StdDeserializer> { /** - * - */ - private static final long serialVersionUID = 1L; + * + */ + private static final long serialVersionUID = 1L; - protected MapKeyStringDeserializer() { + protected MapKeyStringDeserializer() { super(Map.class); } @Override public Map deserialize(JsonParser jsonParser, - DeserializationContext deserializationContext) throws IOException { + DeserializationContext deserializationContext) throws IOException { Map result = new HashMap<>(); JsonNode node = jsonParser.getCodec().readTree(jsonParser); diff --git a/src/main/java/controller/tools/MapResponseKeyDeserializer.java b/src/main/java/controller/tools/MapResponseKeyDeserializer.java index 17d5de22..08481cc3 100644 --- a/src/main/java/controller/tools/MapResponseKeyDeserializer.java +++ b/src/main/java/controller/tools/MapResponseKeyDeserializer.java @@ -1,30 +1,29 @@ package controller.tools; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; - import model.entity.ElGamalKey; import model.entity.sigma.Responses; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + public class MapResponseKeyDeserializer extends StdDeserializer> { /** - * - */ - private static final long serialVersionUID = 1L; + * + */ + private static final long serialVersionUID = 1L; - protected MapResponseKeyDeserializer() { + protected MapResponseKeyDeserializer() { super(Map.class); } @Override public Map deserialize(JsonParser jsonParser, - DeserializationContext deserializationContext) throws IOException { + DeserializationContext deserializationContext) throws IOException { Map result = new HashMap<>(); JsonNode node = jsonParser.getCodec().readTree(jsonParser); for (JsonNode element : node) { diff --git a/src/main/java/controller/tools/MapSerializer.java b/src/main/java/controller/tools/MapSerializer.java index af0a9be3..48c5380b 100644 --- a/src/main/java/controller/tools/MapSerializer.java +++ b/src/main/java/controller/tools/MapSerializer.java @@ -1,30 +1,30 @@ package controller.tools; -import java.io.IOException; -import java.util.Map; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -public class MapSerializer extends StdSerializer> { +import java.io.IOException; +import java.util.Map; + +public class MapSerializer extends StdSerializer> { /** - * - */ - private static final long serialVersionUID = 1L; + * + */ + private static final long serialVersionUID = 1L; - protected MapSerializer() { + protected MapSerializer() { super(Map.class, true); } @Override public void serialize(Map map, JsonGenerator jsonGenerator, - SerializerProvider serializerProvider) throws IOException{ + SerializerProvider serializerProvider) throws IOException { jsonGenerator.writeStartArray(); - for (Map.Entry element: map.entrySet()) { + for (Map.Entry element : map.entrySet()) { jsonGenerator.writeStartObject(); jsonGenerator.writeObjectField("key", element.getKey()); jsonGenerator.writeObjectField("value", element.getValue()); diff --git a/src/main/java/controller/tools/MapStringDeserializer.java b/src/main/java/controller/tools/MapStringDeserializer.java index 4a5248ff..a746d64c 100644 --- a/src/main/java/controller/tools/MapStringDeserializer.java +++ b/src/main/java/controller/tools/MapStringDeserializer.java @@ -1,25 +1,25 @@ package controller.tools; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + public class MapStringDeserializer extends StdDeserializer> { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - protected MapStringDeserializer() { + protected MapStringDeserializer() { super(Map.class); } @Override public Map deserialize(JsonParser jsonParser, - DeserializationContext deserializationContext) throws IOException { + DeserializationContext deserializationContext) throws IOException { Map result = new HashMap<>(); JsonNode node = jsonParser.getCodec().readTree(jsonParser); for (JsonNode element : node) { diff --git a/src/main/java/crypt/CryptCommander.java b/src/main/java/crypt/CryptCommander.java index 907ff11d..8a6ff75b 100644 --- a/src/main/java/crypt/CryptCommander.java +++ b/src/main/java/crypt/CryptCommander.java @@ -1,27 +1,27 @@ package crypt; -import javax.ws.rs.GET; // REST-related dependencies -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - -import crypt.api.hashs.Hasher; // module to test dependencies +import crypt.api.hashs.Hasher; import crypt.factories.HasherFactory; import rest.api.ServletPath; import rest.factories.RestServerFactory; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; + @ServletPath("/command/hash/*") // url path. PREFIX WITH COMMAND/ !!! @Path("/") public class CryptCommander { - @GET - @Path("/{input}") // a way to name the pieces of the query - public String hash(@PathParam("input") String input) { // this argument will be initialized with - // the piece of the query - Hasher hasher = HasherFactory.createDefaultHasher(); - return new String(hasher.getHash(input.getBytes())); - } + public static void main(String[] args) { - public static void main(String[] args) { + RestServerFactory.createAndStartRestServer("jetty", 8080, "crypt"); + } - RestServerFactory.createAndStartRestServer("jetty", 8080, "crypt"); - } + @GET + @Path("/{input}") // a way to name the pieces of the query + public String hash(@PathParam("input") String input) { // this argument will be initialized with + // the piece of the query + Hasher hasher = HasherFactory.createDefaultHasher(); + return new String(hasher.getHash(input.getBytes())); + } } diff --git a/src/main/java/crypt/ElGamalEngineK.java b/src/main/java/crypt/ElGamalEngineK.java index f0f1a35f..daa674f1 100644 --- a/src/main/java/crypt/ElGamalEngineK.java +++ b/src/main/java/crypt/ElGamalEngineK.java @@ -1,8 +1,5 @@ package crypt; -import java.math.BigInteger; -import java.security.SecureRandom; - import org.bouncycastle.crypto.AsymmetricBlockCipher; import org.bouncycastle.crypto.CipherParameters; import org.bouncycastle.crypto.DataLengthException; @@ -12,50 +9,46 @@ import org.bouncycastle.crypto.params.ParametersWithRandom; import org.bouncycastle.util.BigIntegers; +import java.math.BigInteger; +import java.security.SecureRandom; + /** * this does your basic ElGamal algorithm. * This class is based on org.bouncycastle.crypto.engines.ElGamalEngine * TO DO : find a way to use the original class and so to calculate k out of the processBlock method. */ public class ElGamalEngineK - implements AsymmetricBlockCipher -{ - private ElGamalKeyParameters key; - private SecureRandom random; - private boolean forEncryption; - private int bitSize; - private BigInteger k; - + implements AsymmetricBlockCipher { private static final BigInteger ZERO = BigInteger.valueOf(0); private static final BigInteger ONE = BigInteger.valueOf(1); private static final BigInteger TWO = BigInteger.valueOf(2); - - + private ElGamalKeyParameters key; + private SecureRandom random; + private boolean forEncryption; + private int bitSize; + private BigInteger k; + public BigInteger getK() { - return k; + return k; } - + /** * initialise the ElGamal engine. * * @param forEncryption true if we are encrypting, false otherwise. - * @param param the necessary ElGamal key parameters. + * @param param the necessary ElGamal key parameters. */ @Override - public void init( - boolean forEncryption, - CipherParameters param) - { - if (param instanceof ParametersWithRandom) - { - ParametersWithRandom p = (ParametersWithRandom)param; + public void init( + boolean forEncryption, + CipherParameters param) { + if (param instanceof ParametersWithRandom) { + ParametersWithRandom p = (ParametersWithRandom) param; - this.key = (ElGamalKeyParameters)p.getParameters(); + this.key = (ElGamalKeyParameters) p.getParameters(); this.random = p.getRandom(); - } - else - { - this.key = (ElGamalKeyParameters)param; + } else { + this.key = (ElGamalKeyParameters) param; this.random = new SecureRandom(); } @@ -65,17 +58,12 @@ public void init( bitSize = p.bitLength(); - if (forEncryption) - { - if (!(key instanceof ElGamalPublicKeyParameters)) - { + if (forEncryption) { + if (!(key instanceof ElGamalPublicKeyParameters)) { throw new IllegalArgumentException("ElGamalPublicKeyParameters are required for encryption."); } - } - else - { - if (!(key instanceof ElGamalPrivateKeyParameters)) - { + } else { + if (!(key instanceof ElGamalPrivateKeyParameters)) { throw new IllegalArgumentException("ElGamalPrivateKeyParameters are required for decryption."); } } @@ -89,10 +77,8 @@ public void init( * @return maximum size for an input block. */ @Override - public int getInputBlockSize() - { - if (forEncryption) - { + public int getInputBlockSize() { + if (forEncryption) { return (bitSize - 1) / 8; } @@ -107,10 +93,8 @@ public int getInputBlockSize() * @return maximum size for an output block. */ @Override - public int getOutputBlockSize() - { - if (forEncryption) - { + public int getOutputBlockSize() { + if (forEncryption) { return 2 * ((bitSize + 7) / 8); } @@ -120,108 +104,93 @@ public int getOutputBlockSize() /** * Process a single block using the basic ElGamal algorithm. * - * @param in the input array. + * @param in the input array. * @param inOff the offset into the input buffer where the data starts. * @param inLen the length of the data to be processed. * @return the result of the ElGamal process. - * @exception DataLengthException the input block is too large. + * @throws DataLengthException the input block is too large. */ @Override - public byte[] processBlock( - byte[] in, - int inOff, - int inLen) - { - if (key == null) - { + public byte[] processBlock( + byte[] in, + int inOff, + int inLen) { + if (key == null) { throw new IllegalStateException("ElGamal engine not initialised"); } BigInteger p = key.getParameters().getP(); bitSize = p.bitLength(); - + int maxLength = forEncryption - ? (bitSize - 1 + 7) / 8 - : getInputBlockSize(); - - if (inLen > maxLength) - { - throw new DataLengthException("input too large for ElGamal cipher with " + inLen + " characters instead of "+ maxLength +" total.\n"); + ? (bitSize - 1 + 7) / 8 + : getInputBlockSize(); + + if (inLen > maxLength) { + throw new DataLengthException("input too large for ElGamal cipher with " + inLen + " characters instead of " + maxLength + " total.\n"); } - + if (key instanceof ElGamalPrivateKeyParameters) // decryption { - byte[] in1 = new byte[inLen / 2]; - byte[] in2 = new byte[inLen / 2]; + byte[] in1 = new byte[inLen / 2]; + byte[] in2 = new byte[inLen / 2]; System.arraycopy(in, inOff, in1, 0, in1.length); System.arraycopy(in, inOff + in1.length, in2, 0, in2.length); - BigInteger gamma = new BigInteger(1, in1); - BigInteger phi = new BigInteger(1, in2); + BigInteger gamma = new BigInteger(1, in1); + BigInteger phi = new BigInteger(1, in2); - ElGamalPrivateKeyParameters priv = (ElGamalPrivateKeyParameters)key; + ElGamalPrivateKeyParameters priv = (ElGamalPrivateKeyParameters) key; // a shortcut, which generally relies on p being prime amongst other things. // if a problem with this shows up, check the p and g values! - BigInteger m = gamma.modPow(p.subtract(ONE).subtract(priv.getX()), p).multiply(phi).mod(p); + BigInteger m = gamma.modPow(p.subtract(ONE).subtract(priv.getX()), p).multiply(phi).mod(p); return BigIntegers.asUnsignedByteArray(m); - } - else // encryption + } else // encryption { byte[] block; - if (inOff != 0 || inLen != in.length) - { + if (inOff != 0 || inLen != in.length) { block = new byte[inLen]; System.arraycopy(in, inOff, block, 0, inLen); - } - else - { + } else { block = in; } BigInteger input = new BigInteger(1, block); - if (input.compareTo(p) >= 0) - { - + if (input.compareTo(p) >= 0) { + throw new DataLengthException("input too large for ElGamal cipher.\n"); } - ElGamalPublicKeyParameters pub = (ElGamalPublicKeyParameters)key; + ElGamalPublicKeyParameters pub = (ElGamalPublicKeyParameters) key; - int pBitLength = p.bitLength(); - BigInteger k = new BigInteger(pBitLength, random); + int pBitLength = p.bitLength(); + BigInteger k = new BigInteger(pBitLength, random); - while (k.equals(ZERO) || (k.compareTo(p.subtract(TWO)) > 0)) - { + while (k.equals(ZERO) || (k.compareTo(p.subtract(TWO)) > 0)) { k = new BigInteger(pBitLength, random); } - BigInteger g = key.getParameters().getG(); - BigInteger gamma = g.modPow(k, p); - BigInteger phi = input.multiply(pub.getY().modPow(k, p)).mod(p); + BigInteger g = key.getParameters().getG(); + BigInteger gamma = g.modPow(k, p); + BigInteger phi = input.multiply(pub.getY().modPow(k, p)).mod(p); - byte[] out1 = gamma.toByteArray(); - byte[] out2 = phi.toByteArray(); - byte[] output = new byte[this.getOutputBlockSize()]; + byte[] out1 = gamma.toByteArray(); + byte[] out2 = phi.toByteArray(); + byte[] output = new byte[this.getOutputBlockSize()]; - if (out1.length > output.length / 2) - { + if (out1.length > output.length / 2) { System.arraycopy(out1, 1, output, output.length / 2 - (out1.length - 1), out1.length - 1); - } - else - { + } else { System.arraycopy(out1, 0, output, output.length / 2 - out1.length, out1.length); } - if (out2.length > output.length / 2) - { + if (out2.length > output.length / 2) { System.arraycopy(out2, 1, output, output.length - (out2.length - 1), out2.length - 1); - } - else - { + } else { System.arraycopy(out2, 0, output, output.length - out2.length, out2.length); } this.k = k; diff --git a/src/main/java/crypt/annotations/CryptCryptAnnotation.java b/src/main/java/crypt/annotations/CryptCryptAnnotation.java index 928e532b..88853a93 100644 --- a/src/main/java/crypt/annotations/CryptCryptAnnotation.java +++ b/src/main/java/crypt/annotations/CryptCryptAnnotation.java @@ -7,35 +7,36 @@ /** * Object that use annotation CryptCryptAnnotation on fields can be crypted by the Parser. + * * @author radoua abderrahim */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface CryptCryptAnnotation { - - /** - * - */ - public boolean isEncryptKeyPublic() default true; - + + /** + * + */ + public boolean isEncryptKeyPublic() default true; + /* * specify that the decrypt key is public or private key * @return Boolean */ - //public boolean isDecryptKeyPublic() default true; - - - /** - * get the field name that contain the key to encrypt data - * @return String name of field - */ - public String secondKey() default "pbkey"; - - /** - * - * @return Boolean - */ - public boolean isCryptBySecondKey() default false; - + //public boolean isDecryptKeyPublic() default true; + + + /** + * get the field name that contain the key to encrypt data + * + * @return String name of field + */ + public String secondKey() default "pbkey"; + + /** + * @return Boolean + */ + public boolean isCryptBySecondKey() default false; + } diff --git a/src/main/java/crypt/annotations/CryptHashAnnotation.java b/src/main/java/crypt/annotations/CryptHashAnnotation.java index d2ae8ab2..d7fe8a54 100644 --- a/src/main/java/crypt/annotations/CryptHashAnnotation.java +++ b/src/main/java/crypt/annotations/CryptHashAnnotation.java @@ -7,18 +7,17 @@ /** * Object that use annotation CryptHashAnnotation on fields can be hashed by the Parser. - * Example : + * Example : *

- * @CryptHashAnnotation - * FieldType fieldname; - *

- * - * fieldname will be hashed by parser. - * + * * @author radoua abderrahim + * @CryptHashAnnotation FieldType fieldname; + *

+ *

+ * fieldname will be hashed by parser. */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface CryptHashAnnotation { - + } diff --git a/src/main/java/crypt/annotations/CryptSigneAnnotation.java b/src/main/java/crypt/annotations/CryptSigneAnnotation.java index 0aef5556..d267b3f2 100644 --- a/src/main/java/crypt/annotations/CryptSigneAnnotation.java +++ b/src/main/java/crypt/annotations/CryptSigneAnnotation.java @@ -7,34 +7,36 @@ /** * Using annotation CryptSigneAnnotation on field to generate signature, also to check the signature for that object. + * * @author radoua abderrahim */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface CryptSigneAnnotation { - + /* * return the name of attribute that contain the Id of user that own the Object. * @return String : name of attribute */ - //public String ownerAttribute(); - - /** - * The name of field that has the key. - * @return String - */ - public String checkByKey() default "keys"; - - /** - * Generating a signature from fields - * Example: - *

- * of using signeWithField in Entity : - * @CryptSigneAnnotation(signeWithFields={"field1","field2"}) - * FieldType signatureField; - * - *

- * @return - */ - public String [] signeWithFields(); + //public String ownerAttribute(); + + /** + * The name of field that has the key. + * + * @return String + */ + public String checkByKey() default "keys"; + + /** + * Generating a signature from fields + * Example: + *

+ * of using signeWithField in Entity : + * + * @return + * @CryptSigneAnnotation(signeWithFields={"field1","field2"}) FieldType signatureField; + *

+ *

+ */ + public String[] signeWithFields(); } diff --git a/src/main/java/crypt/api/annotation/ParserAction.java b/src/main/java/crypt/api/annotation/ParserAction.java index d80e0066..d3a1d6ea 100644 --- a/src/main/java/crypt/api/annotation/ParserAction.java +++ b/src/main/java/crypt/api/annotation/ParserAction.java @@ -2,14 +2,15 @@ /** - * Enumeration of Actions. + * Enumeration of Actions. + * * @author RADOUA Abderrahim */ public enum ParserAction { - HasherAction, - CryptAction, - DecryptAction, - SigneAction, - CheckAction, - Resilience + HasherAction, + CryptAction, + DecryptAction, + SigneAction, + CheckAction, + Resilience } diff --git a/src/main/java/crypt/api/annotation/ParserAnnotation.java b/src/main/java/crypt/api/annotation/ParserAnnotation.java index 4c1d2077..727e5d3e 100644 --- a/src/main/java/crypt/api/annotation/ParserAnnotation.java +++ b/src/main/java/crypt/api/annotation/ParserAnnotation.java @@ -5,24 +5,26 @@ import crypt.api.key.AsymKey; /** - * Instances of objects that implements ParserAnnotation can parse object with CryptAnnotation. + * Instances of objects that implements ParserAnnotation can parse object with CryptAnnotation. + * + * @param Type of Entity (object). * @author Radoua Abderrahim - * - * @param Type of Entity (object). */ public interface ParserAnnotation { - - /** - * this method perform some actions on Entity like Crypt, Hash, Sign ... actions, and return the Entity itself. - * @param actions : Enumeration of ParserAction to specify witch action can be performed on Entity, it can be an array of actions. - * @return Entity : return the same object passed in Parser constructor - */ - public Entity parseAnnotation(ParserAction ...actions); - - - /** - * set key as ElGamalKey, this key contains a pair of public and private key, they will be used in Crypt, Hash, Sign ... actions - * @param key - */ - public void setKey(AsymKey key); + + /** + * this method perform some actions on Entity like Crypt, Hash, Sign ... actions, and return the Entity itself. + * + * @param actions : Enumeration of ParserAction to specify witch action can be performed on Entity, it can be an array of actions. + * @return Entity : return the same object passed in Parser constructor + */ + public Entity parseAnnotation(ParserAction... actions); + + + /** + * set key as ElGamalKey, this key contains a pair of public and private key, they will be used in Crypt, Hash, Sign ... actions + * + * @param key + */ + public void setKey(AsymKey key); } diff --git a/src/main/java/crypt/api/certificate/CertificateGenerator.java b/src/main/java/crypt/api/certificate/CertificateGenerator.java index 1797135c..7a31d38c 100644 --- a/src/main/java/crypt/api/certificate/CertificateGenerator.java +++ b/src/main/java/crypt/api/certificate/CertificateGenerator.java @@ -5,56 +5,62 @@ /** * Use to create Certificate (objet and file (jks) - * @author Sébastien Pelletier * + * @author Sébastien Pelletier */ -public interface CertificateGenerator -{ - /** - * Get the keyPair used for the certificate. - * @author Sébastien Pelletier - */ - public KeyPair getKeysPair() throws Exception; - - /** - * Get the Keystore password - * @author Sébastien Pelletier - */ - public String getKsPassword() throws Exception; - - /** - * Set the configuration file. (containing certificate information). - * @param file Path to the configuration file. - * @author Sébastien Pelletier - */ - public void setConfigFile(String file) throws Exception; - - /** - * Initalization of datas from file. - * @author Sébastien Pelletier - */ - public void initDatas() throws Exception; - - /** - * Create the certificate and keys for it. - * @param Signature specifie what signature you want. - * @return Return the newly created certificate. - * @author Sébastien Pelletier, Antoine Boudermine - */ - public Certificate CreateCertificate(String signature) throws Exception; - - /** - * Create a certificate chain of one certificate. - * @author Sébastien Pelletier - */ - public Certificate[] CreateChainCertificate() throws Exception; - - /** - * Store the created certificate in the specified file (keystore). - * @param file_name The keystore file. - * #Author Pelletier Sébastien - */ - public void StoreInKeystore(String file_name) throws Exception; +public interface CertificateGenerator { + /** + * Get the keyPair used for the certificate. + * + * @author Sébastien Pelletier + */ + public KeyPair getKeysPair() throws Exception; + + /** + * Get the Keystore password + * + * @author Sébastien Pelletier + */ + public String getKsPassword() throws Exception; + + /** + * Set the configuration file. (containing certificate information). + * + * @param file Path to the configuration file. + * @author Sébastien Pelletier + */ + public void setConfigFile(String file) throws Exception; + + /** + * Initalization of datas from file. + * + * @author Sébastien Pelletier + */ + public void initDatas() throws Exception; + + /** + * Create the certificate and keys for it. + * + * @param Signature specifie what signature you want. + * @return Return the newly created certificate. + * @author Sébastien Pelletier, Antoine Boudermine + */ + public Certificate CreateCertificate(String signature) throws Exception; + + /** + * Create a certificate chain of one certificate. + * + * @author Sébastien Pelletier + */ + public Certificate[] CreateChainCertificate() throws Exception; + + /** + * Store the created certificate in the specified file (keystore). + * + * @param file_name The keystore file. + * #Author Pelletier Sébastien + */ + public void StoreInKeystore(String file_name) throws Exception; } diff --git a/src/main/java/crypt/api/encryption/Encryptable.java b/src/main/java/crypt/api/encryption/Encryptable.java index a2fb665e..25f01b20 100644 --- a/src/main/java/crypt/api/encryption/Encryptable.java +++ b/src/main/java/crypt/api/encryption/Encryptable.java @@ -1,29 +1,32 @@ package crypt.api.encryption; /** - * Instances of objects that implements Cryptable can be crypted. + * Instances of objects that implements Cryptable can be crypted. * The encrypted data are stored in this instance. - * @author Prudhomme Julien * + * @author Prudhomme Julien */ public interface Encryptable { - - /** - * Encrypt instance's data. - * @param c the encrypter used for encrypting - */ - public void encrypt(Encrypter c); - - /** - * Decrypt instance's data. - * @param c the encrypter used for encrypting - * @return {@code false} if decrypting fail. - */ - public boolean decrypt(Encrypter c); - - /** - * This method can tell if object's data (typically attributes) are encrypted or not. - * @return True if object is encrypted, otherwise false. - */ - public boolean isEncrypted(); + + /** + * Encrypt instance's data. + * + * @param c the encrypter used for encrypting + */ + public void encrypt(Encrypter c); + + /** + * Decrypt instance's data. + * + * @param c the encrypter used for encrypting + * @return {@code false} if decrypting fail. + */ + public boolean decrypt(Encrypter c); + + /** + * This method can tell if object's data (typically attributes) are encrypted or not. + * + * @return True if object is encrypted, otherwise false. + */ + public boolean isEncrypted(); } diff --git a/src/main/java/crypt/api/encryption/Encrypter.java b/src/main/java/crypt/api/encryption/Encrypter.java index ddcab13e..dab09324 100644 --- a/src/main/java/crypt/api/encryption/Encrypter.java +++ b/src/main/java/crypt/api/encryption/Encrypter.java @@ -2,30 +2,33 @@ /** * Encrypt or decrypt data according to a {@code Key} - * @author Prudhomme Julien * * @param Type of the key + * @author Prudhomme Julien */ public interface Encrypter { - /** - * Set the key that will be used for encrypt or decrypt data. - * Note that the key could be different to encrypt or decrypt data. - * @param key The key. - */ - public void setKey(Key key); - - /** - * Encrypt the {@code plaintText} according to previously settled {@code Key} - * @param plainText Clear data to encrypt - * @return encrypted {@code plainText} - */ - public byte[] encrypt(byte[] plainText); - - /** - * Decrypt the {@code cypher} according to the previously settled {@code Key} - * If can determine decrypting fail, return null - * @param cypher The encrypted data - * @return The decrypted data or null if fail. - */ - public byte[] decrypt(byte[] cypher); + /** + * Set the key that will be used for encrypt or decrypt data. + * Note that the key could be different to encrypt or decrypt data. + * + * @param key The key. + */ + public void setKey(Key key); + + /** + * Encrypt the {@code plaintText} according to previously settled {@code Key} + * + * @param plainText Clear data to encrypt + * @return encrypted {@code plainText} + */ + public byte[] encrypt(byte[] plainText); + + /** + * Decrypt the {@code cypher} according to the previously settled {@code Key} + * If can determine decrypting fail, return null + * + * @param cypher The encrypted data + * @return The decrypted data or null if fail. + */ + public byte[] decrypt(byte[] cypher); } diff --git a/src/main/java/crypt/api/hashs/Hashable.java b/src/main/java/crypt/api/hashs/Hashable.java index 0b9768d9..f97635be 100644 --- a/src/main/java/crypt/api/hashs/Hashable.java +++ b/src/main/java/crypt/api/hashs/Hashable.java @@ -2,18 +2,19 @@ /** * Object that can provide an unique hash from his data can implement the Hashable interface. - * @author Prudhomme Julien * + * @author Prudhomme Julien */ public interface Hashable { - - /** - * Provide an unique byte array representing the object data. Equals object should - * provide the same byte array. - * For example if o1.equals(o2) is true, o1.getHashableData should be equal to o2.getHashableData. - * You can for example concatenate string value of all object attributes (always in the same order) and extract - * the bytes. - * @return byte[] An array representing object's data. - */ - public byte[] getHashableData(); + + /** + * Provide an unique byte array representing the object data. Equals object should + * provide the same byte array. + * For example if o1.equals(o2) is true, o1.getHashableData should be equal to o2.getHashableData. + * You can for example concatenate string value of all object attributes (always in the same order) and extract + * the bytes. + * + * @return byte[] An array representing object's data. + */ + public byte[] getHashableData(); } diff --git a/src/main/java/crypt/api/hashs/Hasher.java b/src/main/java/crypt/api/hashs/Hasher.java index 77eaa35e..deb9cb8b 100644 --- a/src/main/java/crypt/api/hashs/Hasher.java +++ b/src/main/java/crypt/api/hashs/Hasher.java @@ -2,30 +2,34 @@ /** * Hasher is an interface for creating a hash from {@code byte[]}, or an object that implement {@link Hashable}. + * * @author Prudhomme Julien * @see Hashable */ public interface Hasher { - - /** - * Set a salt that will be added while hashing. - * If the salt is not set, the {@link Hasher} will hash without any salt. - * @param salt A byte array that will be used during hashs. - */ - public void setSalt(byte[] salt); - - /** - * Hash the message. Hash with a salt if set. - * @param message - The content to be hashed - * @return a byte array, hash of the {@code message}. - */ - public byte[] getHash(byte[] message); - - /** - * Produce a hash from an object that implement the {@link Hashable} interface. - * Use salt if set. - * @param object - An object that implement {@link Hashable} - * @return the object's hash - */ - public byte[] getHash(Hashable object); + + /** + * Set a salt that will be added while hashing. + * If the salt is not set, the {@link Hasher} will hash without any salt. + * + * @param salt A byte array that will be used during hashs. + */ + public void setSalt(byte[] salt); + + /** + * Hash the message. Hash with a salt if set. + * + * @param message - The content to be hashed + * @return a byte array, hash of the {@code message}. + */ + public byte[] getHash(byte[] message); + + /** + * Produce a hash from an object that implement the {@link Hashable} interface. + * Use salt if set. + * + * @param object - An object that implement {@link Hashable} + * @return the object's hash + */ + public byte[] getHash(Hashable object); } diff --git a/src/main/java/crypt/api/key/AsymKey.java b/src/main/java/crypt/api/key/AsymKey.java index a70bf483..dbccd4cd 100644 --- a/src/main/java/crypt/api/key/AsymKey.java +++ b/src/main/java/crypt/api/key/AsymKey.java @@ -2,39 +2,44 @@ /** * Key for asymmetric encryption. Contain a public and a private key, and if needed some paramaters. - * @author Prudhomme Julien * * @param Type of a key. + * @author Prudhomme Julien */ public interface AsymKey { - /** - * Get the public key. - * @return a public key - */ - public T getPublicKey(); - - /** - * Get the private key if defined. - * @return a private key or null - */ - public T getPrivateKey(); - - /** - * Return a parameter - * @param p the parameter name - * @return the parameter of name p, or null - */ - public T getParam(String p); - - /** - * Set the public key - * @param pbk the public key - */ - public void setPublicKey(T pbk); - - /** - * Set the private key - * @param pk the private key - */ - public void setPrivateKey(T pk); + /** + * Get the public key. + * + * @return a public key + */ + public T getPublicKey(); + + /** + * Set the public key + * + * @param pbk the public key + */ + public void setPublicKey(T pbk); + + /** + * Get the private key if defined. + * + * @return a private key or null + */ + public T getPrivateKey(); + + /** + * Set the private key + * + * @param pk the private key + */ + public void setPrivateKey(T pk); + + /** + * Return a parameter + * + * @param p the parameter name + * @return the parameter of name p, or null + */ + public T getParam(String p); } diff --git a/src/main/java/crypt/api/signatures/ParamName.java b/src/main/java/crypt/api/signatures/ParamName.java index ddb5e5d6..34e99a87 100644 --- a/src/main/java/crypt/api/signatures/ParamName.java +++ b/src/main/java/crypt/api/signatures/ParamName.java @@ -1,5 +1,5 @@ package crypt.api.signatures; public @interface ParamName { - public String value(); + public String value(); } diff --git a/src/main/java/crypt/api/signatures/Signable.java b/src/main/java/crypt/api/signatures/Signable.java index 61200d8b..9511c969 100644 --- a/src/main/java/crypt/api/signatures/Signable.java +++ b/src/main/java/crypt/api/signatures/Signable.java @@ -7,20 +7,23 @@ * and the public key of owner signature * The signature can be obtained with a Signer that will use the {@link Hashable#getHashableData() getHashableData} * method to hash the object and produce a signature. - * @author Prudhomme Julien + * * @param The type of the signature + * @author Prudhomme Julien */ -public interface Signable extends Hashable{ - - /** - * Simple signature setter. You should'nt call this method directly and use a {@link Signer} - * @param s the signature - */ - public void setSign(Sign s); - - /** - * Get the stored signature - * @return The signature or null if the object isn't signed. - */ - public Sign getSign(); +public interface Signable extends Hashable { + + /** + * Get the stored signature + * + * @return The signature or null if the object isn't signed. + */ + public Sign getSign(); + + /** + * Simple signature setter. You should'nt call this method directly and use a {@link Signer} + * + * @param s the signature + */ + public void setSign(Sign s); } diff --git a/src/main/java/crypt/api/signatures/Signature.java b/src/main/java/crypt/api/signatures/Signature.java index b455359f..9402adc0 100644 --- a/src/main/java/crypt/api/signatures/Signature.java +++ b/src/main/java/crypt/api/signatures/Signature.java @@ -2,15 +2,16 @@ /** * Signature API - * @author Julien Prudhomme * * @param type of signature params + * @author Julien Prudhomme */ public interface Signature { - /** - * Get the param p - * @param p - * @return - */ - public T getParam(String p); + /** + * Get the param p + * + * @param p + * @return + */ + public T getParam(String p); } diff --git a/src/main/java/crypt/api/signatures/Signer.java b/src/main/java/crypt/api/signatures/Signer.java index aaa92951..8b442d02 100644 --- a/src/main/java/crypt/api/signatures/Signer.java +++ b/src/main/java/crypt/api/signatures/Signer.java @@ -2,51 +2,57 @@ /** * The signer can sign or verify signature on a byte array or object that implements signable. - * @author Prudhomme Julien - * @param The type of the signature. - * @param The type of the Key used to sign or verify signature. * + * @param The type of the signature. + * @param The type of the Key used to sign or verify signature. + * @author Prudhomme Julien */ public interface Signer { - - /** - * Set the key used to sign messages or verify signatures - * @param key A key that will be used to sign or verify. - */ - public void setKey(Key key); - - /** - * Retrieve the settled key - * @return the key used to sign - */ - public Key getKey(); - - /** - * Sign the message according to previously settled {@code Key} - * @param message data to sign - * @return the message's signature - */ - public Sign sign(byte[] message); - - /** - * Sign an object that implement Signable. The signature is stored inside the object. - * @param signable the object to sign. - * @return The same signature that is stored in the object. - */ - public Sign sign(Signable signable); - - /** - * Verify if the signature is valid, according to the previously settled key and the message. - * @param message The message - * @param sign the signature to verify - * @return True if signature is valid and correspond to the message. - */ - public boolean verify(byte[] message, Sign sign); - - /** - * Verify if the signature is valid, according to the previously settled key and the message. - * @param signable the object to verify - * @return True if the object signature correspond to the object and the settled key. - */ - public boolean verify(Signable signable); + + /** + * Retrieve the settled key + * + * @return the key used to sign + */ + public Key getKey(); + + /** + * Set the key used to sign messages or verify signatures + * + * @param key A key that will be used to sign or verify. + */ + public void setKey(Key key); + + /** + * Sign the message according to previously settled {@code Key} + * + * @param message data to sign + * @return the message's signature + */ + public Sign sign(byte[] message); + + /** + * Sign an object that implement Signable. The signature is stored inside the object. + * + * @param signable the object to sign. + * @return The same signature that is stored in the object. + */ + public Sign sign(Signable signable); + + /** + * Verify if the signature is valid, according to the previously settled key and the message. + * + * @param message The message + * @param sign the signature to verify + * @return True if signature is valid and correspond to the message. + */ + public boolean verify(byte[] message, Sign sign); + + /** + * Verify if the signature is valid, according to the previously settled key and the message. + * + * @param signable the object to verify + * @return True if the object signature correspond to the object and the settled key. + */ + public boolean verify(Signable signable); } diff --git a/src/main/java/crypt/base/AbstractAsymKey.java b/src/main/java/crypt/base/AbstractAsymKey.java index 5ffe754a..e625de51 100644 --- a/src/main/java/crypt/base/AbstractAsymKey.java +++ b/src/main/java/crypt/base/AbstractAsymKey.java @@ -1,38 +1,38 @@ package crypt.base; +import crypt.api.key.AsymKey; + import java.util.HashMap; -import crypt.api.key.AsymKey; +public abstract class AbstractAsymKey implements AsymKey { + + protected T publicKey = null; + protected T privateKey = null; + protected HashMap params = new HashMap<>(); + + @Override + public T getPublicKey() { + return publicKey; + } + + @Override + public void setPublicKey(T pbk) { + this.publicKey = pbk; + } + + @Override + public T getPrivateKey() { + return privateKey; + } + + @Override + public void setPrivateKey(T pk) { + this.privateKey = pk; + } -public abstract class AbstractAsymKey implements AsymKey{ - - protected T publicKey = null; - protected T privateKey = null; - protected HashMap params = new HashMap<>(); - - @Override - public T getPublicKey() { - return publicKey; - } - - @Override - public T getPrivateKey() { - return privateKey; - } - - @Override - public T getParam(String p) { - return params.get(p); - } - - @Override - public void setPublicKey(T pbk) { - this.publicKey = pbk; - } - - @Override - public void setPrivateKey(T pk) { - this.privateKey = pk; - } + @Override + public T getParam(String p) { + return params.get(p); + } } diff --git a/src/main/java/crypt/base/AbstractHasher.java b/src/main/java/crypt/base/AbstractHasher.java index 38539ec2..d6d72312 100644 --- a/src/main/java/crypt/base/AbstractHasher.java +++ b/src/main/java/crypt/base/AbstractHasher.java @@ -5,34 +5,33 @@ /** * An abstract class that implement {@link Hasher} - * + * + * @author Prudhomme Julien * @see Hasher * @see Hashable - * @author Prudhomme Julien - * */ public abstract class AbstractHasher implements Hasher { - protected byte[] salt; - - /** - * Create a new {@link Hasher} without setting any salt. - */ - public AbstractHasher() { - salt = null; - } - - @Override - public void setSalt(byte[] salt) { - this.salt = salt; - } - - @Override - public abstract byte[] getHash(byte[] message); - - @Override - public byte[] getHash(Hashable object) { - return getHash(object.getHashableData()); - } + protected byte[] salt; + + /** + * Create a new {@link Hasher} without setting any salt. + */ + public AbstractHasher() { + salt = null; + } + + @Override + public void setSalt(byte[] salt) { + this.salt = salt; + } + + @Override + public abstract byte[] getHash(byte[] message); + + @Override + public byte[] getHash(Hashable object) { + return getHash(object.getHashableData()); + } } diff --git a/src/main/java/crypt/base/AbstractSigner.java b/src/main/java/crypt/base/AbstractSigner.java index 9063de9e..87bec480 100644 --- a/src/main/java/crypt/base/AbstractSigner.java +++ b/src/main/java/crypt/base/AbstractSigner.java @@ -5,30 +5,30 @@ /** * Abstract signer - * @author Prudhomme Julien * * @param type of signature * @param type of key + * @author Prudhomme Julien */ -public abstract class AbstractSigner implements Signer{ +public abstract class AbstractSigner implements Signer { + + protected K key; - protected K key; - - @Override - public void setKey(K key) { - this.key = key; - } + @Override + public void setKey(K key) { + this.key = key; + } - @Override - public S sign(Signable signable) { - S sign = this.sign(signable.getHashableData()); - signable.setSign(sign); - return sign; - } + @Override + public S sign(Signable signable) { + S sign = this.sign(signable.getHashableData()); + signable.setSign(sign); + return sign; + } - @Override - public boolean verify(Signable signable) { - return verify(signable.getHashableData(), signable.getSign()); - } + @Override + public boolean verify(Signable signable) { + return verify(signable.getHashableData(), signable.getSign()); + } } diff --git a/src/main/java/crypt/base/BaseSignature.java b/src/main/java/crypt/base/BaseSignature.java index b0192022..e2489bc7 100644 --- a/src/main/java/crypt/base/BaseSignature.java +++ b/src/main/java/crypt/base/BaseSignature.java @@ -1,26 +1,26 @@ package crypt.base; -import java.lang.reflect.Field; - import crypt.api.signatures.ParamName; import crypt.api.signatures.Signature; -public class BaseSignature implements Signature{ +import java.lang.reflect.Field; + +public class BaseSignature implements Signature { + + @SuppressWarnings("unchecked") + @Override + public T getParam(String p) { + for (Field f : getClass().getDeclaredFields()) { + ParamName pn = f.getAnnotation(ParamName.class); + if (pn != null && pn.value().equals(p)) { + try { + return (T) f.get(this); + } catch (IllegalArgumentException | IllegalAccessException e) { - @SuppressWarnings("unchecked") - @Override - public T getParam(String p) { - for(Field f : getClass().getDeclaredFields()) { - ParamName pn = f.getAnnotation(ParamName.class); - if(pn != null && pn.value().equals(p)) { - try { - return (T) f.get(this); - } catch (IllegalArgumentException | IllegalAccessException e) { - - } - } - } - throw new RuntimeException("Undefined param : " + p); - } + } + } + } + throw new RuntimeException("Undefined param : " + p); + } } diff --git a/src/main/java/crypt/factories/AsymKeyFactory.java b/src/main/java/crypt/factories/AsymKeyFactory.java index 86f2cd84..49715e8a 100644 --- a/src/main/java/crypt/factories/AsymKeyFactory.java +++ b/src/main/java/crypt/factories/AsymKeyFactory.java @@ -1,41 +1,43 @@ package crypt.factories; -import org.bouncycastle.crypto.params.ElGamalParameters; - import crypt.api.key.AsymKey; import crypt.impl.key.ElGamalAsymKey; import model.entity.ElGamalKey; +import org.bouncycastle.crypto.params.ElGamalParameters; /** * {@link AsymKey} factory - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public class AsymKeyFactory { - /** - * Create the default implemented {@link AsymKey} - * @return an {@link AsymKey} - */ - public static AsymKey createDefaultAsymKey() { - return ElGamalAsymKeyFactory.create(false); - } - - /** - * Create an {@link ElGamalAsymKey} - * @param generateParams true if the implementation should generate new parameters or false for default parameters - * @return an {@link ElGamalAsymKey} - */ - public static ElGamalKey createElGamalAsymKey(boolean generateParams) { - return ElGamalAsymKeyFactory.create(generateParams); - } - - /** - * Create an ElGamalAsymKey from existing {@link ElGamalParameters} - * @param params The parameters used for creating the keys - * @return an {@link ElGamalAsymKey} - */ - public static ElGamalKey createElGamalAsymKey(ElGamalParameters params) { - return ElGamalAsymKeyFactory.createFromParameters(params); - } + /** + * Create the default implemented {@link AsymKey} + * + * @return an {@link AsymKey} + */ + public static AsymKey createDefaultAsymKey() { + return ElGamalAsymKeyFactory.create(false); + } + + /** + * Create an {@link ElGamalAsymKey} + * + * @param generateParams true if the implementation should generate new parameters or false for default parameters + * @return an {@link ElGamalAsymKey} + */ + public static ElGamalKey createElGamalAsymKey(boolean generateParams) { + return ElGamalAsymKeyFactory.create(generateParams); + } + + /** + * Create an ElGamalAsymKey from existing {@link ElGamalParameters} + * + * @param params The parameters used for creating the keys + * @return an {@link ElGamalAsymKey} + */ + public static ElGamalKey createElGamalAsymKey(ElGamalParameters params) { + return ElGamalAsymKeyFactory.createFromParameters(params); + } } diff --git a/src/main/java/crypt/factories/ElGamalAsymKeyFactory.java b/src/main/java/crypt/factories/ElGamalAsymKeyFactory.java index a48613ee..ab3a903a 100644 --- a/src/main/java/crypt/factories/ElGamalAsymKeyFactory.java +++ b/src/main/java/crypt/factories/ElGamalAsymKeyFactory.java @@ -1,8 +1,6 @@ package crypt.factories; -import java.math.BigInteger; -import java.security.SecureRandom; - +import model.entity.ElGamalKey; import org.bouncycastle.crypto.AsymmetricCipherKeyPair; import org.bouncycastle.crypto.generators.ElGamalKeyPairGenerator; import org.bouncycastle.crypto.generators.ElGamalParametersGenerator; @@ -11,70 +9,74 @@ import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters; import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters; -import model.entity.ElGamalKey; +import java.math.BigInteger; +import java.security.SecureRandom; /** * Factory to create ElGamal keys with given or random parameters. * Contain default pre-calculated parameters {@link ElGamalAsymKeyFactory#P} and {@link ElGamalAsymKeyFactory#G} - * @author Prudhomme Julien * + * @author Prudhomme Julien */ public class ElGamalAsymKeyFactory { - - - private static SecureRandom R = new SecureRandom(); - - //Defaults parameters - public static final BigInteger P = new BigInteger ("124233341635855292420681698148845681014844866056212176632655173602444135581779341928584451946831820357622587249219477577145009300106828967466602146104562163160400103396735672041344557638270362523343149686623705761738910044071399582025053147811261321814632661084042311141045136246602979886564584763268994320823"); - public static final BigInteger G = new BigInteger ("57879985263161130068016239981615161174385902716647642452899971198439084259551250230041086427537114453738884538337956090286524329552098304591825815816298805245947460536391128315522193556464285417135160058086869161063941463490748168352401178939129440934609861888674726565294073773971086710395310743717916632171"); - - /** - * Randomly generate El Gamal parameters - * @return ElGamalParameters instance containing P & G - */ - private static ElGamalParameters generatePG() { - ElGamalParameters params; - ElGamalParametersGenerator apg; - apg = new ElGamalParametersGenerator(); - apg.init(1024, 20, R); - params = apg.generateParameters(); - return params; - } - - /** - * Generate and set El Gamal public & private key according to parameters. - * @param k the ElGamalAsymKey instance to set - * @param params Params used for public and private key generation - */ - private static void generateElGamalKey(ElGamalKey k, ElGamalParameters params) { - ElGamalKeyGenerationParameters elGP = new ElGamalKeyGenerationParameters(R,params); - ElGamalKeyPairGenerator KeyPair = new ElGamalKeyPairGenerator(); - KeyPair.init(elGP); - AsymmetricCipherKeyPair cipher1 = KeyPair.generateKeyPair(); - k.setPublicKey(((ElGamalPublicKeyParameters) cipher1.getPublic()).getY()); - k.setPrivateKey(((ElGamalPrivateKeyParameters)cipher1.getPrivate()).getX()); - } - - /** - * Create a new ElGamalAsymKey with a random public/private key according to p and g parameters - * @param param ElGamal parameters containing p/g - * @return a new ElGamalAsymKey instance - */ - public static ElGamalKey createFromParameters(ElGamalParameters params) { - ElGamalKey k = new ElGamalKey(); - generateElGamalKey(k, params); - k.setG(params.getG()); - k.setP(params.getP()); - return k; - } - - /** - * Create a new ElGamalAsymKey with a random public/private key according to default or random parameters - * @param generateParams True - Generate random parameters. It can take several minutes. - * False - Take default parameters {@link ElGamalAsymKeyFactory#P} and {@link ElGamalAsymKeyFactory#G} - * @return - */ - public static ElGamalKey create(boolean generateParams) { - return createFromParameters(generateParams?(generatePG()):(new ElGamalParameters(P, G))); - } + + + //Defaults parameters + public static final BigInteger P = new BigInteger("124233341635855292420681698148845681014844866056212176632655173602444135581779341928584451946831820357622587249219477577145009300106828967466602146104562163160400103396735672041344557638270362523343149686623705761738910044071399582025053147811261321814632661084042311141045136246602979886564584763268994320823"); + public static final BigInteger G = new BigInteger("57879985263161130068016239981615161174385902716647642452899971198439084259551250230041086427537114453738884538337956090286524329552098304591825815816298805245947460536391128315522193556464285417135160058086869161063941463490748168352401178939129440934609861888674726565294073773971086710395310743717916632171"); + private static SecureRandom R = new SecureRandom(); + + /** + * Randomly generate El Gamal parameters + * + * @return ElGamalParameters instance containing P & G + */ + private static ElGamalParameters generatePG() { + ElGamalParameters params; + ElGamalParametersGenerator apg; + apg = new ElGamalParametersGenerator(); + apg.init(1024, 20, R); + params = apg.generateParameters(); + return params; + } + + /** + * Generate and set El Gamal public & private key according to parameters. + * + * @param k the ElGamalAsymKey instance to set + * @param params Params used for public and private key generation + */ + private static void generateElGamalKey(ElGamalKey k, ElGamalParameters params) { + ElGamalKeyGenerationParameters elGP = new ElGamalKeyGenerationParameters(R, params); + ElGamalKeyPairGenerator KeyPair = new ElGamalKeyPairGenerator(); + KeyPair.init(elGP); + AsymmetricCipherKeyPair cipher1 = KeyPair.generateKeyPair(); + k.setPublicKey(((ElGamalPublicKeyParameters) cipher1.getPublic()).getY()); + k.setPrivateKey(((ElGamalPrivateKeyParameters) cipher1.getPrivate()).getX()); + } + + /** + * Create a new ElGamalAsymKey with a random public/private key according to p and g parameters + * + * @param param ElGamal parameters containing p/g + * @return a new ElGamalAsymKey instance + */ + public static ElGamalKey createFromParameters(ElGamalParameters params) { + ElGamalKey k = new ElGamalKey(); + generateElGamalKey(k, params); + k.setG(params.getG()); + k.setP(params.getP()); + return k; + } + + /** + * Create a new ElGamalAsymKey with a random public/private key according to default or random parameters + * + * @param generateParams True - Generate random parameters. It can take several minutes. + * False - Take default parameters {@link ElGamalAsymKeyFactory#P} and {@link ElGamalAsymKeyFactory#G} + * @return + */ + public static ElGamalKey create(boolean generateParams) { + return createFromParameters(generateParams ? (generatePG()) : (new ElGamalParameters(P, G))); + } } diff --git a/src/main/java/crypt/factories/EncrypterFactory.java b/src/main/java/crypt/factories/EncrypterFactory.java index eea6666a..684714e8 100644 --- a/src/main/java/crypt/factories/EncrypterFactory.java +++ b/src/main/java/crypt/factories/EncrypterFactory.java @@ -7,48 +7,53 @@ /** * {@link Encrypter} factory - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public class EncrypterFactory { - - /** - * Create the default implementation of a symetric {@link Encrypter} - * @return an {@link Encrypter} - */ - public static Encrypter createDefaultSymetricEncrypter() { - return createSerpentEncrypter(); - } - - /** - * Create the default implementation of an asymetric {@link Encrypter} - * @return an {@link Encrypter} - */ - public static Encrypter createDefaultAsymetricEncrypter() { - return createElGamalEncrypter(); - } - - /** - * Create a Serpent implementation of {@link Encrypter} - * @return a {@link SerpentEncrypter} - */ - public static SerpentEncrypter createSerpentEncrypter() { - return new SerpentEncrypter(); - } - - /** - * Create an ElGamal implementation of {@link Encrypter} - * @return an {@link ElGamalEncrypter} - */ - public static ElGamalEncrypter createElGamalEncrypter() { - return new ElGamalEncrypter(); - } - - /** - * Create an ElGamalSerpent implementation of {@link Encrypter} - * @return an {@link ElGamalSerpentEncrypter} - */ - public static ElGamalSerpentEncrypter createElGamalSerpentEncrypter() { - return new ElGamalSerpentEncrypter(); - } + + /** + * Create the default implementation of a symetric {@link Encrypter} + * + * @return an {@link Encrypter} + */ + public static Encrypter createDefaultSymetricEncrypter() { + return createSerpentEncrypter(); + } + + /** + * Create the default implementation of an asymetric {@link Encrypter} + * + * @return an {@link Encrypter} + */ + public static Encrypter createDefaultAsymetricEncrypter() { + return createElGamalEncrypter(); + } + + /** + * Create a Serpent implementation of {@link Encrypter} + * + * @return a {@link SerpentEncrypter} + */ + public static SerpentEncrypter createSerpentEncrypter() { + return new SerpentEncrypter(); + } + + /** + * Create an ElGamal implementation of {@link Encrypter} + * + * @return an {@link ElGamalEncrypter} + */ + public static ElGamalEncrypter createElGamalEncrypter() { + return new ElGamalEncrypter(); + } + + /** + * Create an ElGamalSerpent implementation of {@link Encrypter} + * + * @return an {@link ElGamalSerpentEncrypter} + */ + public static ElGamalSerpentEncrypter createElGamalSerpentEncrypter() { + return new ElGamalSerpentEncrypter(); + } } diff --git a/src/main/java/crypt/factories/HasherFactory.java b/src/main/java/crypt/factories/HasherFactory.java index ea582cf9..aeba21a6 100644 --- a/src/main/java/crypt/factories/HasherFactory.java +++ b/src/main/java/crypt/factories/HasherFactory.java @@ -1,36 +1,38 @@ package crypt.factories; -import java.math.BigInteger; -import java.security.SecureRandom; - import crypt.api.hashs.Hasher; import crypt.impl.hashs.SHA256Hasher; +import java.math.BigInteger; +import java.security.SecureRandom; + /** * {@link Hasher} factory - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public class HasherFactory { - - /** - * Create the default implementation of {@link Hasher} - * @return a {@link Hasher} - */ - public static Hasher createDefaultHasher() { - return createSHA256Hasher(); - } - - /** - * Create a SHA256 implementation of {@link Hasher} - * @return a {@link SHA256Hasher} - */ - public static SHA256Hasher createSHA256Hasher() { - return new SHA256Hasher(); - } - - public static byte[] generateSalt() { - SecureRandom r = new SecureRandom(); - return new BigInteger(130, r).toByteArray(); - } + + /** + * Create the default implementation of {@link Hasher} + * + * @return a {@link Hasher} + */ + public static Hasher createDefaultHasher() { + return createSHA256Hasher(); + } + + /** + * Create a SHA256 implementation of {@link Hasher} + * + * @return a {@link SHA256Hasher} + */ + public static SHA256Hasher createSHA256Hasher() { + return new SHA256Hasher(); + } + + public static byte[] generateSalt() { + SecureRandom r = new SecureRandom(); + return new BigInteger(130, r).toByteArray(); + } } diff --git a/src/main/java/crypt/factories/ParserFactory.java b/src/main/java/crypt/factories/ParserFactory.java index 0c04b442..a5838846 100644 --- a/src/main/java/crypt/factories/ParserFactory.java +++ b/src/main/java/crypt/factories/ParserFactory.java @@ -1,23 +1,23 @@ package crypt.factories; -import java.math.BigInteger; import crypt.api.annotation.ParserAnnotation; import crypt.api.key.AsymKey; import crypt.utils.CryptoParser; +import java.math.BigInteger; + /** - * * @author Radoua Abderrahim - * */ public class ParserFactory { - - /** - * Create the default implementation of {@link ParserAnnotation} - * @return a {@link ParserAnnotation} - */ - public static ParserAnnotation createDefaultParser(Object entity,AsymKey key){ - return new CryptoParser(entity,key); - } + + /** + * Create the default implementation of {@link ParserAnnotation} + * + * @return a {@link ParserAnnotation} + */ + public static ParserAnnotation createDefaultParser(Object entity, AsymKey key) { + return new CryptoParser(entity, key); + } } diff --git a/src/main/java/crypt/factories/SignerFactory.java b/src/main/java/crypt/factories/SignerFactory.java index 6ca23fbb..f2c5f462 100644 --- a/src/main/java/crypt/factories/SignerFactory.java +++ b/src/main/java/crypt/factories/SignerFactory.java @@ -6,20 +6,20 @@ /** * {@linkplain Signer} factory - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public class SignerFactory { - - public static Signer createDefaultSigner() { - return createElGamalSigner(); - } - - public static ElGamalSigner createElGamalSigner() { - return new ElGamalSigner(); - } - - public static SigmaSigner createSigmaSigner() { - return new SigmaSigner(); - } + + public static Signer createDefaultSigner() { + return createElGamalSigner(); + } + + public static ElGamalSigner createElGamalSigner() { + return new ElGamalSigner(); + } + + public static SigmaSigner createSigmaSigner() { + return new SigmaSigner(); + } } diff --git a/src/main/java/crypt/impl/certificate/X509V3Generator.java b/src/main/java/crypt/impl/certificate/X509V3Generator.java index e9e56110..eba5103d 100644 --- a/src/main/java/crypt/impl/certificate/X509V3Generator.java +++ b/src/main/java/crypt/impl/certificate/X509V3Generator.java @@ -1,12 +1,10 @@ package crypt.impl.certificate; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; +import crypt.api.certificate.CertificateGenerator; +import org.bouncycastle.x509.X509V3CertificateGenerator; + +import javax.security.auth.x500.X500Principal; +import java.io.*; import java.math.BigInteger; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -16,320 +14,292 @@ import java.security.cert.X509Certificate; import java.util.Date; -import javax.security.auth.x500.X500Principal; - -import org.bouncycastle.x509.X509V3CertificateGenerator; - -import crypt.api.certificate.CertificateGenerator; - -public class X509V3Generator implements CertificateGenerator -{ - /** - * Use this methode to create an instance of X509V3Genertor. - * @param config_file Name of the file that will be used by the instance. - */ - static public X509V3Generator getInstance(String config_file) throws Exception - { - X509V3Generator cert_gen = new X509V3Generator(); - cert_gen.setConfigFile(config_file); - cert_gen.initDatas(); - return cert_gen; - } - ///////////////////////////// private ////////////////////////////////// - - private String config_file; //Configuration file (certificate datas). - private boolean flag = false; //To kown if a certifictae has already been created. - - private String keystore_password; //Password for the keystore. can use toCharArray() - private String ks_alias; - private Certificate cert; //The certificate. - private KeyPair key_pair; //Generated keys for the certificate. - - //Certificate datas. - private BigInteger serial_number; - private String domain_name; //Server's IP. - //private Date begin; //Start validity date. - //private Date end; //End validity date. - private String sign_alg; //Algorithm used to sign. - - - ////////////////////////////// Public //////////////////////////////// - - //// Geters&Seters //// - - - /** - * {@inheritDoc} - */ - @Override - public KeyPair getKeysPair() throws RuntimeException - { - if( !this.flag ) - { - throw new RuntimeException("getKeyPair() used wihout certificate genererated"); - } - return key_pair; - } - - /** - * {@inheritDoc} - */ - @Override - public String getKsPassword() throws Exception - { - return keystore_password; - } - - /** - * {@inheritDoc} - */ - @Override - public void setConfigFile(String file) throws Exception - { - this.config_file = file; - } - - ///// Methodes ///// - - /** - * {@inheritDoc} - * file pattern : - * data=value - * data1=value1 - */ - @Override - public void initDatas() throws Exception - { - try - { - File file = new File(this.config_file); - - //Create file if it does not exists. - if( !file.exists() ) - { - createDefaultConfigFile(); - } - - InputStream input_stream = new FileInputStream(file); - InputStreamReader input_stream_reader = new InputStreamReader(input_stream); - BufferedReader buffered_reader = new BufferedReader(input_stream_reader); - String line; - - String name; //Configuration name. - String value; //Value to this name. - String[] temp; - - - while( (line = buffered_reader.readLine()) != null ) - { - if( !line.isEmpty() && !line.startsWith("#") && !line.startsWith(" ") ) //if not a comment or newline. - { - line = line.split("#")[0]; //Delete comments. - line = line.split(" ")[0]; //Delete useless spaces. - line = line.split("\t")[0]; //Delete useless tabs. - temp = line.split("="); - name = temp[0]; - value = temp[1]; - switch(name) - { - case "kspassword" : - this.keystore_password = value; - break; - case "ksalias": - this.ks_alias = value; - break; - case "serialnumber" : - this.serial_number = new BigInteger(value); - break; - case "signalgorithm": - this.sign_alg = value; - break; - case "domainname": - this.domain_name = value; - break; - default: - throw new RuntimeException("Bad configuration file : " + line); - } - //System.out.println(name + " = " + value); - } - } - - buffered_reader.close(); - } - catch( Exception e ) - { - throw e; - } - - } - - /** - * Create the default certificate configuration file. - * @param file_name Name of the file that will be created. - */ - public void createDefaultConfigFile() throws Exception - { - String content = ""; - content += "# This configuration file contains values for the certificate\n"; - content += "# used by this application. The certificate will be stored in\n"; - content += "# keystore.jks .\n\n"; - content += "kspassword=123456 #Password for the keystore.\n"; - content += "ksalias=SXP #Alias for the certificate in the keystore.\n"; - content += "serialnumber=0123456789 #Serial Number.\n"; - content += "signalgorithm=MD5WithRSA #Algorithm used for siging the certificate. (SHA256withRSA)\n"; - content += "domainname=localhost #IP / domain name of the serveur.\n"; - - File file = new File(this.config_file); - try - { - FileWriter file_writer = new FileWriter(file); - file_writer.write (content); - file_writer.close(); - } - catch (IOException exception) - { - throw new IOException("Error while creation of default configuration file : " - + this.config_file + "\n", exception); - } - } - - /** - * {@inheritDoc} - * Implemented Signature : "self-signed" - * "CA-signed" - */ - @Override - public Certificate CreateCertificate(String signature) throws Exception - { - if( signature == "self-signed" ) - { - if( !this.flag ) - { - //Provider custom - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); - - //Keys (priv & public) generation. - KeyPairGenerator key_gen = KeyPairGenerator.getInstance("RSA"); - key_gen.initialize(1024); - KeyPair keys = key_gen.genKeyPair(); - this.key_pair = keys; - - //Création du certificat. - X509V3CertificateGenerator cert_gen = new X509V3CertificateGenerator(); - - X500Principal cn = new X500Principal("CN=" + domain_name ); - cert_gen.setSerialNumber(this.serial_number); - cert_gen.setIssuerDN(cn); - cert_gen.setNotBefore(new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000)); - cert_gen.setNotAfter(new Date(System.currentTimeMillis() + 365 * 24 * 60 * 60 * 1000)); - cert_gen.setSubjectDN(cn); - cert_gen.setPublicKey(keys.getPublic()); - cert_gen.setSignatureAlgorithm(this.sign_alg); - - //this.cert = cert_gen.generateX509Certificate(keys.getPrivate(), "BC"); //CA private key (autosigned) - this.cert = cert_gen.generate(keys.getPrivate(), "BC"); //CA private key (autosigned) - this.flag = true; - } - } - // else if( signature == "CA-signed" ) - // { - // //Provider custom - // - // Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); - // - // //Keys (priv & public) generation. - // - // KeyPairGenerator key_gen = KeyPairGenerator.getInstance("RSA"); - // key_gen.initialize(2048); - // KeyPair keys = key_gen.genKeyPair(); - // this.key_pair = keys; - // - // // Create a session for Let's Encrypt - // - // Session session = new Session("acme://letsencrypt.org/staging", this.key_pair); - // - // // Register a new user - // - // Registration reg = null; - // try - // { - // reg = new RegistrationBuilder().create(session); - // } - // catch (AcmeConflictException ex) - // { - // reg = Registration.bind(session, ex.getLocation()); - // System.out.println("Let's Encrypt account does already exist"); - // } - // - // URI agreement = reg.getAgreement(); - // reg.modify().setAgreement(agreement).commit(); - // - // Authorization auth = null; - // try - // { - // auth = reg.authorizeDomain(domain_name); - // } - // catch (AcmeUnauthorizedException ex) - // { - // // Maybe there are new T&C to accept? - // reg.modify().setAgreement(agreement).commit(); - // // Then try again... - // auth = reg.authorizeDomain(domain_name); - // } - // - // Challenge challenge = httpChallenge(auth, domain_name); - // if (challenge == null) - // { - // System.exit(0); - // } - // System.out.println("challenge created"); - // challenge.trigger(); - // - // int attempts = 10; - // while (challenge.getStatus() != Status.VALID && attempts-- > 0) - // { - // System.out.println(attempts); - // if (challenge.getStatus() == Status.INVALID) - // { - // System.out.println("Challenge failed... Giving up."); - // System.exit(0); - // } - // try - // { - // Thread.sleep(3000L); - // } - // catch (InterruptedException ex) - // { - // System.out.println("interrupted"); - // } - // challenge.update(); - // } - // if (challenge.getStatus() != Status.VALID) - // { - // System.out.println("Failed to pass the challenge... Giving up."); - // System.exit(0); - // } - // System.out.println("challenge acepté"); - // // Generate a CSR for the domain - // CSRBuilder csrb = new CSRBuilder(); - // csrb.addDomains(domain_name);//peut etre une collection de string - // csrb.sign(key_pair); - // - // // Request a signed certificate - // org.shredzone.acme4j.Certificate certificate = reg.requestCertificate(csrb.getEncoded()); - // - // // Download the certificate chain - // X509Certificate[] chain = certificate.downloadChain(); - // this.cert = chain[0]; - // } - else - { - throw new RuntimeException("Unknown Signature process : " + signature); - } - - return this.cert; - } +public class X509V3Generator implements CertificateGenerator { + private String config_file; //Configuration file (certificate datas). + ///////////////////////////// private ////////////////////////////////// + private boolean flag = false; //To kown if a certifictae has already been created. + private String keystore_password; //Password for the keystore. can use toCharArray() + private String ks_alias; + private Certificate cert; //The certificate. + private KeyPair key_pair; //Generated keys for the certificate. + //Certificate datas. + private BigInteger serial_number; + private String domain_name; //Server's IP. + //private Date begin; //Start validity date. + //private Date end; //End validity date. + private String sign_alg; //Algorithm used to sign. + + /** + * Use this methode to create an instance of X509V3Genertor. + * + * @param config_file Name of the file that will be used by the instance. + */ + static public X509V3Generator getInstance(String config_file) throws Exception { + X509V3Generator cert_gen = new X509V3Generator(); + cert_gen.setConfigFile(config_file); + cert_gen.initDatas(); + return cert_gen; + } + + + ////////////////////////////// Public //////////////////////////////// + + //// Geters&Seters //// + + /** + * {@inheritDoc} + */ + @Override + public KeyPair getKeysPair() throws RuntimeException { + if (!this.flag) { + throw new RuntimeException("getKeyPair() used wihout certificate genererated"); + } + return key_pair; + } + + /** + * {@inheritDoc} + */ + @Override + public String getKsPassword() throws Exception { + return keystore_password; + } + + /** + * {@inheritDoc} + */ + @Override + public void setConfigFile(String file) throws Exception { + this.config_file = file; + } + + ///// Methodes ///// + + /** + * {@inheritDoc} + * file pattern : + * data=value + * data1=value1 + */ + @Override + public void initDatas() throws Exception { + try { + File file = new File(this.config_file); + + //Create file if it does not exists. + if (!file.exists()) { + createDefaultConfigFile(); + } + + InputStream input_stream = new FileInputStream(file); + InputStreamReader input_stream_reader = new InputStreamReader(input_stream); + BufferedReader buffered_reader = new BufferedReader(input_stream_reader); + String line; + + String name; //Configuration name. + String value; //Value to this name. + String[] temp; + + + while ((line = buffered_reader.readLine()) != null) { + if (!line.isEmpty() && !line.startsWith("#") && !line.startsWith(" ")) //if not a comment or newline. + { + line = line.split("#")[0]; //Delete comments. + line = line.split(" ")[0]; //Delete useless spaces. + line = line.split("\t")[0]; //Delete useless tabs. + temp = line.split("="); + name = temp[0]; + value = temp[1]; + switch (name) { + case "kspassword": + this.keystore_password = value; + break; + case "ksalias": + this.ks_alias = value; + break; + case "serialnumber": + this.serial_number = new BigInteger(value); + break; + case "signalgorithm": + this.sign_alg = value; + break; + case "domainname": + this.domain_name = value; + break; + default: + throw new RuntimeException("Bad configuration file : " + line); + } + //System.out.println(name + " = " + value); + } + } + + buffered_reader.close(); + } catch (Exception e) { + throw e; + } + + } + + /** + * Create the default certificate configuration file. + * + * @param file_name Name of the file that will be created. + */ + public void createDefaultConfigFile() throws Exception { + String content = ""; + content += "# This configuration file contains values for the certificate\n"; + content += "# used by this application. The certificate will be stored in\n"; + content += "# keystore.jks .\n\n"; + content += "kspassword=123456 #Password for the keystore.\n"; + content += "ksalias=SXP #Alias for the certificate in the keystore.\n"; + content += "serialnumber=0123456789 #Serial Number.\n"; + content += "signalgorithm=MD5WithRSA #Algorithm used for siging the certificate. (SHA256withRSA)\n"; + content += "domainname=localhost #IP / domain name of the serveur.\n"; + + File file = new File(this.config_file); + try { + FileWriter file_writer = new FileWriter(file); + file_writer.write(content); + file_writer.close(); + } catch (IOException exception) { + throw new IOException("Error while creation of default configuration file : " + + this.config_file + "\n", exception); + } + } + + /** + * {@inheritDoc} + * Implemented Signature : "self-signed" + * "CA-signed" + */ + @Override + public Certificate CreateCertificate(String signature) throws Exception { + if (signature == "self-signed") { + if (!this.flag) { + //Provider custom + Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + + //Keys (priv & public) generation. + KeyPairGenerator key_gen = KeyPairGenerator.getInstance("RSA"); + key_gen.initialize(1024); + KeyPair keys = key_gen.genKeyPair(); + this.key_pair = keys; + + //Création du certificat. + X509V3CertificateGenerator cert_gen = new X509V3CertificateGenerator(); + + X500Principal cn = new X500Principal("CN=" + domain_name); + cert_gen.setSerialNumber(this.serial_number); + cert_gen.setIssuerDN(cn); + cert_gen.setNotBefore(new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000)); + cert_gen.setNotAfter(new Date(System.currentTimeMillis() + 365 * 24 * 60 * 60 * 1000)); + cert_gen.setSubjectDN(cn); + cert_gen.setPublicKey(keys.getPublic()); + cert_gen.setSignatureAlgorithm(this.sign_alg); + + //this.cert = cert_gen.generateX509Certificate(keys.getPrivate(), "BC"); //CA private key (autosigned) + this.cert = cert_gen.generate(keys.getPrivate(), "BC"); //CA private key (autosigned) + this.flag = true; + } + } + // else if( signature == "CA-signed" ) + // { + // //Provider custom + // + // Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + // + // //Keys (priv & public) generation. + // + // KeyPairGenerator key_gen = KeyPairGenerator.getInstance("RSA"); + // key_gen.initialize(2048); + // KeyPair keys = key_gen.genKeyPair(); + // this.key_pair = keys; + // + // // Create a session for Let's Encrypt + // + // Session session = new Session("acme://letsencrypt.org/staging", this.key_pair); + // + // // Register a new user + // + // Registration reg = null; + // try + // { + // reg = new RegistrationBuilder().create(session); + // } + // catch (AcmeConflictException ex) + // { + // reg = Registration.bind(session, ex.getLocation()); + // System.out.println("Let's Encrypt account does already exist"); + // } + // + // URI agreement = reg.getAgreement(); + // reg.modify().setAgreement(agreement).commit(); + // + // Authorization auth = null; + // try + // { + // auth = reg.authorizeDomain(domain_name); + // } + // catch (AcmeUnauthorizedException ex) + // { + // // Maybe there are new T&C to accept? + // reg.modify().setAgreement(agreement).commit(); + // // Then try again... + // auth = reg.authorizeDomain(domain_name); + // } + // + // Challenge challenge = httpChallenge(auth, domain_name); + // if (challenge == null) + // { + // System.exit(0); + // } + // System.out.println("challenge created"); + // challenge.trigger(); + // + // int attempts = 10; + // while (challenge.getStatus() != Status.VALID && attempts-- > 0) + // { + // System.out.println(attempts); + // if (challenge.getStatus() == Status.INVALID) + // { + // System.out.println("Challenge failed... Giving up."); + // System.exit(0); + // } + // try + // { + // Thread.sleep(3000L); + // } + // catch (InterruptedException ex) + // { + // System.out.println("interrupted"); + // } + // challenge.update(); + // } + // if (challenge.getStatus() != Status.VALID) + // { + // System.out.println("Failed to pass the challenge... Giving up."); + // System.exit(0); + // } + // System.out.println("challenge acepté"); + // // Generate a CSR for the domain + // CSRBuilder csrb = new CSRBuilder(); + // csrb.addDomains(domain_name);//peut etre une collection de string + // csrb.sign(key_pair); + // + // // Request a signed certificate + // org.shredzone.acme4j.Certificate certificate = reg.requestCertificate(csrb.getEncoded()); + // + // // Download the certificate chain + // X509Certificate[] chain = certificate.downloadChain(); + // this.cert = chain[0]; + // } + else { + throw new RuntimeException("Unknown Signature process : " + signature); + } + + return this.cert; + } // public Challenge httpChallenge(Authorization auth, String domain) throws AcmeException, IOException @@ -365,60 +335,55 @@ public Certificate CreateCertificate(String signature) throws Exception // return challenge; // } - /** - * {@inheritDoc} - */ - @Override - public Certificate[] CreateChainCertificate() throws Exception - { - if( !this.flag ) - this.CreateCertificate("self-signed"); - - Certificate[] cert_chain = new X509Certificate[1]; - cert_chain[0] = this.cert; - return cert_chain; - } - - /** - * Store the created certificate in the specified file (keystore). - * @param file_name The keystore file. - * #Author Pelletier Sébastien - */ - @Override - public void StoreInKeystore(String file_name) throws Exception - { - File file = new File(file_name); - if( file.exists() ) - { - System.out.println("Keystore already exist"); - return; - } - - char[] password = this.keystore_password.toCharArray(); - new KeyStore.PasswordProtection(password); - - //Keystore Creation - KeyStore ks = KeyStore.getInstance("jks"); - ks.load(null, password); //Loading from nothing (null) in order to create a new one. - - Certificate[] cert_chain = this.CreateChainCertificate(); - - ks.setEntry(this.ks_alias, - new KeyStore.PrivateKeyEntry(key_pair.getPrivate(), cert_chain), - new KeyStore.PasswordProtection(password)); - - //Storing the created key in the file. - java.io.FileOutputStream fos = null; - try - { - fos = new java.io.FileOutputStream(file_name); - ks.store(fos, password); - } - finally - { - if(fos != null) - fos.close(); - } - } + /** + * {@inheritDoc} + */ + @Override + public Certificate[] CreateChainCertificate() throws Exception { + if (!this.flag) + this.CreateCertificate("self-signed"); + + Certificate[] cert_chain = new X509Certificate[1]; + cert_chain[0] = this.cert; + return cert_chain; + } + + /** + * Store the created certificate in the specified file (keystore). + * + * @param file_name The keystore file. + * #Author Pelletier Sébastien + */ + @Override + public void StoreInKeystore(String file_name) throws Exception { + File file = new File(file_name); + if (file.exists()) { + System.out.println("Keystore already exist"); + return; + } + + char[] password = this.keystore_password.toCharArray(); + new KeyStore.PasswordProtection(password); + + //Keystore Creation + KeyStore ks = KeyStore.getInstance("jks"); + ks.load(null, password); //Loading from nothing (null) in order to create a new one. + + Certificate[] cert_chain = this.CreateChainCertificate(); + + ks.setEntry(this.ks_alias, + new KeyStore.PrivateKeyEntry(key_pair.getPrivate(), cert_chain), + new KeyStore.PasswordProtection(password)); + + //Storing the created key in the file. + java.io.FileOutputStream fos = null; + try { + fos = new java.io.FileOutputStream(file_name); + ks.store(fos, password); + } finally { + if (fos != null) + fos.close(); + } + } } diff --git a/src/main/java/crypt/impl/encryption/ElGamalEncrypter.java b/src/main/java/crypt/impl/encryption/ElGamalEncrypter.java index f5d8fba6..99b8b6a6 100644 --- a/src/main/java/crypt/impl/encryption/ElGamalEncrypter.java +++ b/src/main/java/crypt/impl/encryption/ElGamalEncrypter.java @@ -11,43 +11,43 @@ /** * El Gamal implementation for encryption. Use {@link ElGamalAsymKey} as key - * @author Prudhomme Julien * + * @author Prudhomme Julien */ -public class ElGamalEncrypter implements Encrypter{ - - private ElGamalKey key; - - @Override - public void setKey(ElGamalKey key) { - this.key = key; - } - - @Override - public byte[] encrypt(byte[] plainText) { - if(this.key == null) { - throw new RuntimeException("key not defined"); - } - ElGamalParameters params = new ElGamalParameters(key.getP(), key.getG()); - ElGamalPublicKeyParameters pubKey = new ElGamalPublicKeyParameters(key.getPublicKey(), params); - - ElGamalEngine e = new ElGamalEngine(); - e.init(true, pubKey); +public class ElGamalEncrypter implements Encrypter { + + private ElGamalKey key; + + @Override + public void setKey(ElGamalKey key) { + this.key = key; + } + + @Override + public byte[] encrypt(byte[] plainText) { + if (this.key == null) { + throw new RuntimeException("key not defined"); + } + ElGamalParameters params = new ElGamalParameters(key.getP(), key.getG()); + ElGamalPublicKeyParameters pubKey = new ElGamalPublicKeyParameters(key.getPublicKey(), params); + + ElGamalEngine e = new ElGamalEngine(); + e.init(true, pubKey); return e.processBlock(plainText, 0, plainText.length); - } - - @Override - public byte[] decrypt(byte[] cypher) { - if(this.key == null) { - throw new RuntimeException("key not defined"); - } - ElGamalParameters params = new ElGamalParameters(key.getP(), key.getG()); - ElGamalPrivateKeyParameters privKey = new ElGamalPrivateKeyParameters(key.getPrivateKey(), params); - - ElGamalEngine e = new ElGamalEngine(); - e.init(false, privKey); - - return e.processBlock(cypher, 0, cypher.length) ; - } + } + + @Override + public byte[] decrypt(byte[] cypher) { + if (this.key == null) { + throw new RuntimeException("key not defined"); + } + ElGamalParameters params = new ElGamalParameters(key.getP(), key.getG()); + ElGamalPrivateKeyParameters privKey = new ElGamalPrivateKeyParameters(key.getPrivateKey(), params); + + ElGamalEngine e = new ElGamalEngine(); + e.init(false, privKey); + + return e.processBlock(cypher, 0, cypher.length); + } } diff --git a/src/main/java/crypt/impl/encryption/ElGamalSerpentEncrypter.java b/src/main/java/crypt/impl/encryption/ElGamalSerpentEncrypter.java index 633b061c..aac090a4 100644 --- a/src/main/java/crypt/impl/encryption/ElGamalSerpentEncrypter.java +++ b/src/main/java/crypt/impl/encryption/ElGamalSerpentEncrypter.java @@ -11,147 +11,152 @@ /** * Encrypter that uses an asymmetric protocol to encrypt a password and - * encrypt data using this password by a symmetric system - * - * @author Nathanaël Eon + * encrypt data using this password by a symmetric system * + * @author Nathanaël Eon */ public class ElGamalSerpentEncrypter implements Encrypter { - - private ElGamalKey key; - - - @Override - public void setKey(ElGamalKey k){ - key = k; - } - - @Override - public byte[] encrypt(byte[] buffer){ - return encryptMsg(buffer).getBytes(); - } - - @Override - public byte[] decrypt(byte[] buffer){ - return decryptMsg(new String(buffer)); - } - - - /** - * The encryption works as follow : - * set a password, encrypt it through elgamal - * encrypt the message with Serpent thanks to the password - * @param msg : msg to encrypt - * @param key : receiver ElGamalKey (using public key to encrypt) - * @return : encrypted key and msg as a json String - */ - public String encryptMsg(byte[] msg){ - // Create a password - String pwd = createPwd(20); - - // Set the encrypter for the password with ElGamal - Encrypter encrypter1 = EncrypterFactory.createElGamalEncrypter(); - encrypter1.setKey(key); - - // set the encrypter for the message with the password - Encrypter encrypter2 = EncrypterFactory.createSerpentEncrypter(); - encrypter2.setKey(pwd.getBytes()); - - // create the message - JsonTools json = new JsonTools<>(new TypeReference(){}); - byte[][] content = new byte[2][]; - content[0] = encrypter1.encrypt(pwd.getBytes()); - content[1] = encrypter2.encrypt(msg); - - return json.toJson(content, true); - } - - /** - * decrypt the password using ElGamal private key - * decrypt the message with password - * @param msg : crypted message - * @param key : ElGamalKey of the receiver (using private key here) - * @return : decrypted message - */ - private byte[] decryptMsg(String msg){ - // Get the two different encrypted data (password and message) - JsonTools json = new JsonTools<>(new TypeReference(){}); - byte[][] content = json.toEntity(msg, true); - - // Decrypt the password - Encrypter encrypter1 = EncrypterFactory.createElGamalEncrypter(); - encrypter1.setKey(key); - byte[] pwd = encrypter1.decrypt(content[0]); - - // Decrypt the message - Encrypter encrypter2 = EncrypterFactory.createSerpentEncrypter(); - encrypter2.setKey(pwd); - return encrypter2.decrypt(content[1]); - } - - - public String encryptMsg(byte[] msg,ElGamalKey secondKey){ - - String pwd = createPwd(20); - - Encrypter encrypter1 = EncrypterFactory.createElGamalEncrypter(); - encrypter1.setKey(key); - - Encrypter encrypter2 = EncrypterFactory.createElGamalEncrypter(); - encrypter2.setKey(secondKey); - - Encrypter encrypter3 = EncrypterFactory.createSerpentEncrypter(); - encrypter3.setKey(pwd.getBytes()); - - JsonTools json = new JsonTools<>(new TypeReference(){}); - byte[][] content = new byte[3][]; - content[0] = encrypter1.encrypt(pwd.getBytes()); - content[1] = encrypter2.encrypt(pwd.getBytes()); - content[2] = encrypter3.encrypt(msg); - - return json.toJson(content, true); - } - - - public byte[] decryptMsg(String msg,ElGamalKey secondKey){ - - JsonTools json = new JsonTools<>(new TypeReference(){}); - byte[][] content = json.toEntity(msg, true); - - byte[] pwd; - - Encrypter encrypter1 = EncrypterFactory.createElGamalEncrypter(); - encrypter1.setKey(key); - - if(key.getPublicKey().equals(secondKey.getPublicKey())){//sender - pwd= encrypter1.decrypt(content[1]); - }else{//receiver - pwd= encrypter1.decrypt(content[0]); - } - - Encrypter encrypter2 = EncrypterFactory.createSerpentEncrypter(); - encrypter2.setKey(pwd); - return encrypter2.decrypt(content[2]); - } - - - - /** - * Create a password using predefinite - * @param len : length of the password wanted - * @return : a randomly generated String - */ - private String createPwd(int len){ - // Characters we will use to encrypt - char[] characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~`!@#$%^&*()-_=+[{]}\\|;:\'\",<.>/?".toCharArray(); - - // Build a random String from the characters - StringBuilder sb = new StringBuilder(); - Random random = new Random(); - for (int j = 0; j < len; j++) { - char c = characters[random.nextInt(characters.length)]; - sb.append(c); - } - return sb.toString(); - } + + private ElGamalKey key; + + + @Override + public void setKey(ElGamalKey k) { + key = k; + } + + @Override + public byte[] encrypt(byte[] buffer) { + return encryptMsg(buffer).getBytes(); + } + + @Override + public byte[] decrypt(byte[] buffer) { + return decryptMsg(new String(buffer)); + } + + + /** + * The encryption works as follow : + * set a password, encrypt it through elgamal + * encrypt the message with Serpent thanks to the password + * + * @param msg : msg to encrypt + * @param key : receiver ElGamalKey (using public key to encrypt) + * @return : encrypted key and msg as a json String + */ + public String encryptMsg(byte[] msg) { + // Create a password + String pwd = createPwd(20); + + // Set the encrypter for the password with ElGamal + Encrypter encrypter1 = EncrypterFactory.createElGamalEncrypter(); + encrypter1.setKey(key); + + // set the encrypter for the message with the password + Encrypter encrypter2 = EncrypterFactory.createSerpentEncrypter(); + encrypter2.setKey(pwd.getBytes()); + + // create the message + JsonTools json = new JsonTools<>(new TypeReference() { + }); + byte[][] content = new byte[2][]; + content[0] = encrypter1.encrypt(pwd.getBytes()); + content[1] = encrypter2.encrypt(msg); + + return json.toJson(content, true); + } + + /** + * decrypt the password using ElGamal private key + * decrypt the message with password + * + * @param msg : crypted message + * @param key : ElGamalKey of the receiver (using private key here) + * @return : decrypted message + */ + private byte[] decryptMsg(String msg) { + // Get the two different encrypted data (password and message) + JsonTools json = new JsonTools<>(new TypeReference() { + }); + byte[][] content = json.toEntity(msg, true); + + // Decrypt the password + Encrypter encrypter1 = EncrypterFactory.createElGamalEncrypter(); + encrypter1.setKey(key); + byte[] pwd = encrypter1.decrypt(content[0]); + + // Decrypt the message + Encrypter encrypter2 = EncrypterFactory.createSerpentEncrypter(); + encrypter2.setKey(pwd); + return encrypter2.decrypt(content[1]); + } + + + public String encryptMsg(byte[] msg, ElGamalKey secondKey) { + + String pwd = createPwd(20); + + Encrypter encrypter1 = EncrypterFactory.createElGamalEncrypter(); + encrypter1.setKey(key); + + Encrypter encrypter2 = EncrypterFactory.createElGamalEncrypter(); + encrypter2.setKey(secondKey); + + Encrypter encrypter3 = EncrypterFactory.createSerpentEncrypter(); + encrypter3.setKey(pwd.getBytes()); + + JsonTools json = new JsonTools<>(new TypeReference() { + }); + byte[][] content = new byte[3][]; + content[0] = encrypter1.encrypt(pwd.getBytes()); + content[1] = encrypter2.encrypt(pwd.getBytes()); + content[2] = encrypter3.encrypt(msg); + + return json.toJson(content, true); + } + + + public byte[] decryptMsg(String msg, ElGamalKey secondKey) { + + JsonTools json = new JsonTools<>(new TypeReference() { + }); + byte[][] content = json.toEntity(msg, true); + + byte[] pwd; + + Encrypter encrypter1 = EncrypterFactory.createElGamalEncrypter(); + encrypter1.setKey(key); + + if (key.getPublicKey().equals(secondKey.getPublicKey())) {//sender + pwd = encrypter1.decrypt(content[1]); + } else {//receiver + pwd = encrypter1.decrypt(content[0]); + } + + Encrypter encrypter2 = EncrypterFactory.createSerpentEncrypter(); + encrypter2.setKey(pwd); + return encrypter2.decrypt(content[2]); + } + + + /** + * Create a password using predefinite + * + * @param len : length of the password wanted + * @return : a randomly generated String + */ + private String createPwd(int len) { + // Characters we will use to encrypt + char[] characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~`!@#$%^&*()-_=+[{]}\\|;:\'\",<.>/?".toCharArray(); + + // Build a random String from the characters + StringBuilder sb = new StringBuilder(); + Random random = new Random(); + for (int j = 0; j < len; j++) { + char c = characters[random.nextInt(characters.length)]; + sb.append(c); + } + return sb.toString(); + } } diff --git a/src/main/java/crypt/impl/encryption/SerpentEncrypter.java b/src/main/java/crypt/impl/encryption/SerpentEncrypter.java index 259931df..6552ce12 100644 --- a/src/main/java/crypt/impl/encryption/SerpentEncrypter.java +++ b/src/main/java/crypt/impl/encryption/SerpentEncrypter.java @@ -11,122 +11,126 @@ /** * Encrypter block symetric encryption with Serpent algorithm + * * @author Prudhomme Julien */ -public class SerpentEncrypter implements Encrypter{ - private Object key; //key generated for serpent - private static final int BLOCK_SIZE = 16; - - /** - * Provide the nth block according to BLOCK_SIZE - * @param n a number between 0 and size of blocks / BLOCK_SIZE - * @return the nth block - */ - private byte[] getBlock(int n, byte[] blocks) { - byte[] res = new byte[BLOCK_SIZE]; - int j = n*BLOCK_SIZE + BLOCK_SIZE; - for(int i = n*BLOCK_SIZE, k=0; i < j; i++, k++) { - //we add as much 0 as needed to fit the block - if(i >= blocks.length) res[k] = 0; - else res[k] = blocks[i]; - } - return res; - } - - /** - * Randomise a new initialisation vector for the encryption - * It is used for the first Xor operation - * @return a random init vector - */ - private byte[] getRandomInitVector() { - byte[] res = new byte[BLOCK_SIZE]; - Random r = new SecureRandom(); - r.nextBytes(res); - return res; - } - - - /** - * encrypt the result of Xor between encrypted previous block (or Init Vector) and the current block - * @param previous The previous (already) encrypted block or an init vector - * @param current the current block - * @return encrypted block - */ - private byte[] encrytBlock(byte[] previous, byte[] current) { - byte[] res = new byte[BLOCK_SIZE]; - for(int i = 0; i < BLOCK_SIZE; i++) { - res[i] = (byte) (previous[i] ^ current[i]); - } - return Serpent_BitSlice.blockEncrypt(res, 0, key); - } - - private byte[] decryptBlock(byte[] previous, byte[] current) { - byte[] res = Serpent_BitSlice.blockDecrypt(current, 0, key); - for(int i = 0; i < BLOCK_SIZE; i++) { - res[i] = (byte) (res[i] ^ previous[i]); - } - return res; - } - - @Override - public byte[] encrypt(byte[] plainText) { - if(this.key == null) { - throw new RuntimeException("key not defined"); - } - ArrayList blocks = new ArrayList<>(); - blocks.add(getRandomInitVector()); - for(int i = 0; i * BLOCK_SIZE < plainText.length; i++) { - blocks.add(this.encrytBlock(blocks.get(blocks.size()-1), this.getBlock(i, plainText))); - } - //allocate enough bytes for the cipher, initvector, and the number of 0 added - byte[] res = new byte[blocks.size() * BLOCK_SIZE + 1]; - // we keep how much 0 were added at the end - res[res.length-1] = (byte) ((blocks.size() - 1)*BLOCK_SIZE - plainText.length); - int k = 0; - for(byte[] b: blocks) { //we put encryption result in a single byte array - for(int i = 0; i < b.length; i++) { - res[k] = b[i]; - k++; - } - } - return res; - } +public class SerpentEncrypter implements Encrypter { + private static final int BLOCK_SIZE = 16; + private Object key; //key generated for serpent - @Override - public byte[] decrypt(byte[] cypher) { - if(this.key == null) { - throw new RuntimeException("key not defined"); - } - byte added = cypher[cypher.length - 1]; //retriving how much 0 were added - //allocate the right size (remove added 0, init vector, and the byte used to keep added - byte[] res = new byte[cypher.length - added - BLOCK_SIZE - 1]; - int k = 0; - for(int i = 1; i*BLOCK_SIZE < cypher.length - 1; i++) { - byte[] plainText = decryptBlock(this.getBlock(i-1, cypher), this.getBlock(i, cypher)); - for(int j = 0; j < plainText.length && k < res.length; j++, k++) { - res[k] = plainText[j]; - } - } - return res; - } - - - - /** - * Set the key (password) for the encryption - * @param key The password - */ - public void setKey(String key) { - setKey(key.getBytes()); - } + /** + * Provide the nth block according to BLOCK_SIZE + * + * @param n a number between 0 and size of blocks / BLOCK_SIZE + * @return the nth block + */ + private byte[] getBlock(int n, byte[] blocks) { + byte[] res = new byte[BLOCK_SIZE]; + int j = n * BLOCK_SIZE + BLOCK_SIZE; + for (int i = n * BLOCK_SIZE, k = 0; i < j; i++, k++) { + //we add as much 0 as needed to fit the block + if (i >= blocks.length) res[k] = 0; + else res[k] = blocks[i]; + } + return res; + } - @Override - public void setKey(byte[] key) { - try { - //generate the key with Serpent - this.key = Serpent_BitSlice.makeKey(key); - } catch (InvalidKeyException e) { - LoggerUtilities.logStackTrace(e); - } - } + /** + * Randomise a new initialisation vector for the encryption + * It is used for the first Xor operation + * + * @return a random init vector + */ + private byte[] getRandomInitVector() { + byte[] res = new byte[BLOCK_SIZE]; + Random r = new SecureRandom(); + r.nextBytes(res); + return res; + } + + + /** + * encrypt the result of Xor between encrypted previous block (or Init Vector) and the current block + * + * @param previous The previous (already) encrypted block or an init vector + * @param current the current block + * @return encrypted block + */ + private byte[] encrytBlock(byte[] previous, byte[] current) { + byte[] res = new byte[BLOCK_SIZE]; + for (int i = 0; i < BLOCK_SIZE; i++) { + res[i] = (byte) (previous[i] ^ current[i]); + } + return Serpent_BitSlice.blockEncrypt(res, 0, key); + } + + private byte[] decryptBlock(byte[] previous, byte[] current) { + byte[] res = Serpent_BitSlice.blockDecrypt(current, 0, key); + for (int i = 0; i < BLOCK_SIZE; i++) { + res[i] = (byte) (res[i] ^ previous[i]); + } + return res; + } + + @Override + public byte[] encrypt(byte[] plainText) { + if (this.key == null) { + throw new RuntimeException("key not defined"); + } + ArrayList blocks = new ArrayList<>(); + blocks.add(getRandomInitVector()); + for (int i = 0; i * BLOCK_SIZE < plainText.length; i++) { + blocks.add(this.encrytBlock(blocks.get(blocks.size() - 1), this.getBlock(i, plainText))); + } + //allocate enough bytes for the cipher, initvector, and the number of 0 added + byte[] res = new byte[blocks.size() * BLOCK_SIZE + 1]; + // we keep how much 0 were added at the end + res[res.length - 1] = (byte) ((blocks.size() - 1) * BLOCK_SIZE - plainText.length); + int k = 0; + for (byte[] b : blocks) { //we put encryption result in a single byte array + for (int i = 0; i < b.length; i++) { + res[k] = b[i]; + k++; + } + } + return res; + } + + @Override + public byte[] decrypt(byte[] cypher) { + if (this.key == null) { + throw new RuntimeException("key not defined"); + } + byte added = cypher[cypher.length - 1]; //retriving how much 0 were added + //allocate the right size (remove added 0, init vector, and the byte used to keep added + byte[] res = new byte[cypher.length - added - BLOCK_SIZE - 1]; + int k = 0; + for (int i = 1; i * BLOCK_SIZE < cypher.length - 1; i++) { + byte[] plainText = decryptBlock(this.getBlock(i - 1, cypher), this.getBlock(i, cypher)); + for (int j = 0; j < plainText.length && k < res.length; j++, k++) { + res[k] = plainText[j]; + } + } + return res; + } + + + /** + * Set the key (password) for the encryption + * + * @param key The password + */ + public void setKey(String key) { + setKey(key.getBytes()); + } + + @Override + public void setKey(byte[] key) { + try { + //generate the key with Serpent + this.key = Serpent_BitSlice.makeKey(key); + } catch (InvalidKeyException e) { + LoggerUtilities.logStackTrace(e); + } + } } diff --git a/src/main/java/crypt/impl/hashs/SHA256Hasher.java b/src/main/java/crypt/impl/hashs/SHA256Hasher.java index 7065b6d4..bc8d455a 100644 --- a/src/main/java/crypt/impl/hashs/SHA256Hasher.java +++ b/src/main/java/crypt/impl/hashs/SHA256Hasher.java @@ -8,35 +8,35 @@ /** * SHA-256 {@link crypt.api.hashs.Hasher} implementation - * @author Prudhomme Julien * + * @author Prudhomme Julien */ public class SHA256Hasher extends AbstractHasher { - /** - * Create a new SHA256Hasher instance that will hash with {@code SHA-256} - */ - public SHA256Hasher() { - super(); - } - - @Override - public byte[] getHash(byte[] message) { - MessageDigest md = null; - try { - //Getting SHA-256 hashing instance - md = MessageDigest.getInstance("SHA-256"); - md.reset(); - if(this.salt != null) { - //if salt is set, adding salt to the hash. - md.update(this.salt); - } - return md.digest(message); - } catch (NoSuchAlgorithmException e) { - LoggerUtilities.logStackTrace(e); - //SHA-256 algorithm doesn't exist on this machine - return null; - } - } + /** + * Create a new SHA256Hasher instance that will hash with {@code SHA-256} + */ + public SHA256Hasher() { + super(); + } + + @Override + public byte[] getHash(byte[] message) { + MessageDigest md = null; + try { + //Getting SHA-256 hashing instance + md = MessageDigest.getInstance("SHA-256"); + md.reset(); + if (this.salt != null) { + //if salt is set, adding salt to the hash. + md.update(this.salt); + } + return md.digest(message); + } catch (NoSuchAlgorithmException e) { + LoggerUtilities.logStackTrace(e); + //SHA-256 algorithm doesn't exist on this machine + return null; + } + } } diff --git a/src/main/java/crypt/impl/key/ElGamalAsymKey.java b/src/main/java/crypt/impl/key/ElGamalAsymKey.java index 819c83dc..8bfa2c08 100644 --- a/src/main/java/crypt/impl/key/ElGamalAsymKey.java +++ b/src/main/java/crypt/impl/key/ElGamalAsymKey.java @@ -7,78 +7,85 @@ /** * ElGamal key implementations. * Contain public, private keys and g, p parameters. - * @author Prudhomme Julien * + * @author Prudhomme Julien */ -public class ElGamalAsymKey extends AbstractAsymKey{ - - /** - * Create a new ElGamalAsymKey from p, g, and a public key, typically used for encrypting - * The private key is not set. - * @param p P parameters - * @param g g parameters - * @param publicKey the public key - */ - public ElGamalAsymKey(BigInteger p, BigInteger g, BigInteger publicKey) { - this(p, g, publicKey, null); - } - - /** - * Create a new, full ElGamalAsymKey, used for signing and decrypting - * @param p P parameters - * @param g g parameters - * @param publicKey the public key - * @param privateKey the private key - */ - public ElGamalAsymKey(BigInteger p, BigInteger g, BigInteger publicKey, BigInteger privateKey) { - this.publicKey = publicKey; - this.privateKey = privateKey; - this.params.put("p", p); - this.params.put("g", g); - } - - /** - * Create a new, empty ElGamalAsymKey - */ - public ElGamalAsymKey() {} - - /** - * Possible values : p, g - */ - @Override - public BigInteger getParam(String p) { - return super.getParam(p); - } - - /** - * Get the P parameters of the ElGamal key - * @return the P parameters - */ - public BigInteger getP() { - return params.get("p"); - } - - /** - * Get the G parameters of the ElGamal key - * @return the G parameters - */ - public BigInteger getG() { - return params.get("g"); - } - - /** - * Set the P parameters of the ElGamal key - * @param p - */ - public void setP(BigInteger p) { - params.put("p", p); - } - - /** - * Set the G parameters of the ElGamal key - * @param g - */ - public void setG(BigInteger g) { - params.put("g", g); - } +public class ElGamalAsymKey extends AbstractAsymKey { + + /** + * Create a new ElGamalAsymKey from p, g, and a public key, typically used for encrypting + * The private key is not set. + * + * @param p P parameters + * @param g g parameters + * @param publicKey the public key + */ + public ElGamalAsymKey(BigInteger p, BigInteger g, BigInteger publicKey) { + this(p, g, publicKey, null); + } + + /** + * Create a new, full ElGamalAsymKey, used for signing and decrypting + * + * @param p P parameters + * @param g g parameters + * @param publicKey the public key + * @param privateKey the private key + */ + public ElGamalAsymKey(BigInteger p, BigInteger g, BigInteger publicKey, BigInteger privateKey) { + this.publicKey = publicKey; + this.privateKey = privateKey; + this.params.put("p", p); + this.params.put("g", g); + } + + /** + * Create a new, empty ElGamalAsymKey + */ + public ElGamalAsymKey() { + } + + /** + * Possible values : p, g + */ + @Override + public BigInteger getParam(String p) { + return super.getParam(p); + } + + /** + * Get the P parameters of the ElGamal key + * + * @return the P parameters + */ + public BigInteger getP() { + return params.get("p"); + } + + /** + * Set the P parameters of the ElGamal key + * + * @param p + */ + public void setP(BigInteger p) { + params.put("p", p); + } + + /** + * Get the G parameters of the ElGamal key + * + * @return the G parameters + */ + public BigInteger getG() { + return params.get("g"); + } + + /** + * Set the G parameters of the ElGamal key + * + * @param g + */ + public void setG(BigInteger g) { + params.put("g", g); + } } diff --git a/src/main/java/crypt/impl/signatures/ElGamalSignature.java b/src/main/java/crypt/impl/signatures/ElGamalSignature.java index ba31d7cc..8f7a6538 100644 --- a/src/main/java/crypt/impl/signatures/ElGamalSignature.java +++ b/src/main/java/crypt/impl/signatures/ElGamalSignature.java @@ -1,94 +1,99 @@ package crypt.impl.signatures; -import java.math.BigInteger; - -import javax.xml.bind.annotation.XmlElement; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import javax.xml.bind.annotation.XmlElement; +import java.math.BigInteger; + /** * Object that represent an ElGamal signature - * @author Prudhomme Julien * + * @author Prudhomme Julien */ public class ElGamalSignature { - @XmlElement(name="r") - private BigInteger r; - @XmlElement(name="s") - private BigInteger s; - - /* For sigma protocols */ - @XmlElement(name="k") - private BigInteger k; - @XmlElement(name="m") - private byte[] m; - - - /** - * Create a new ElGamal signature with r & s parameters - * @param r R parameter - * @param s S parameter - */ - public ElGamalSignature(BigInteger r, BigInteger s) { - this.r = r; - this.s = s; - } - - /** - * Constructor for sigma protocols - * TODO resee - * @param r - * @param s - * @param u - * @param m - */ - @JsonCreator - public ElGamalSignature(@JsonProperty("r") BigInteger r, @JsonProperty("s") BigInteger s, @JsonProperty("k") BigInteger k, @JsonProperty("m") byte[] m) { - this.r = r; - this.s = s; - this.k = k; - this.m = m; - } + @XmlElement(name = "r") + private BigInteger r; + @XmlElement(name = "s") + private BigInteger s; + + /* For sigma protocols */ + @XmlElement(name = "k") + private BigInteger k; + @XmlElement(name = "m") + private byte[] m; + + + /** + * Create a new ElGamal signature with r & s parameters + * + * @param r R parameter + * @param s S parameter + */ + public ElGamalSignature(BigInteger r, BigInteger s) { + this.r = r; + this.s = s; + } + + /** + * Constructor for sigma protocols + * TODO resee + * + * @param r + * @param s + * @param u + * @param m + */ + @JsonCreator + public ElGamalSignature(@JsonProperty("r") BigInteger r, @JsonProperty("s") BigInteger s, @JsonProperty("k") BigInteger k, @JsonProperty("m") byte[] m) { + this.r = r; + this.s = s; + this.k = k; + this.m = m; + } + + /** + * Get the R parameter + * + * @return R + */ + public BigInteger getR() { + return r; + } + + /** + * Set the R parameter + * + * @param r R + */ + public void setR(BigInteger r) { + this.r = r; + } + + /** + * Get the S parameter + * + * @return S + */ + public BigInteger getS() { + return s; + } + + /** + * Set the S parameter + * + * @param s S + */ + public void setS(BigInteger s) { + this.s = s; + } + + public BigInteger getK() { + return k; + } - /** - * Get the R parameter - * @return R - */ - public BigInteger getR() { - return r; - } - - /** - * Set the R parameter - * @param r R - */ - public void setR(BigInteger r) { - this.r = r; - } - - /** - * Get the S parameter - * @return S - */ - public BigInteger getS() { - return s; - } - - /** - * Set the S parameter - * @param s S - */ - public void setS(BigInteger s) { - this.s = s; - } - - public BigInteger getK() { - return k; - } - - public byte[] getM() { - return m; - } + public byte[] getM() { + return m; + } } diff --git a/src/main/java/crypt/impl/signatures/ElGamalSigner.java b/src/main/java/crypt/impl/signatures/ElGamalSigner.java index 15ceda5c..95790610 100644 --- a/src/main/java/crypt/impl/signatures/ElGamalSigner.java +++ b/src/main/java/crypt/impl/signatures/ElGamalSigner.java @@ -1,60 +1,60 @@ package crypt.impl.signatures; -import java.math.BigInteger; -import java.security.SecureRandom; - import crypt.api.hashs.Hasher; import crypt.base.AbstractSigner; import crypt.impl.hashs.SHA256Hasher; import model.entity.ElGamalKey; +import java.math.BigInteger; +import java.security.SecureRandom; + /** * Implementation of ElGamal signatures - * @author Prudhomme Julien * + * @author Prudhomme Julien */ public class ElGamalSigner extends AbstractSigner { - @Override - public ElGamalSignature sign(byte[] message) { - if(key == null || key.getPrivateKey() == null) { - throw new RuntimeException("Private key not set !"); - } - SecureRandom random = new SecureRandom(); - Hasher hasher = new SHA256Hasher(); - BigInteger m = new BigInteger(hasher.getHash(message)); - - BigInteger k; - do { - k = BigInteger.probablePrime(1023, random); - } while(k.compareTo(BigInteger.ONE)<= 0 || k.gcd(key.getP()).compareTo(BigInteger.ONE)!= 0 ); - - BigInteger l = k.modInverse(key.getP().subtract(BigInteger.ONE)); - BigInteger r = key.getG().modPow(k,key.getP()); - BigInteger s = l.multiply(m.subtract(r.multiply(key.getPrivateKey())).mod(key.getP().subtract(BigInteger.ONE))); - - return new ElGamalSignature(r, s); - } - - @Override - public boolean verify(byte[] message, ElGamalSignature sign) { - if(key == null || key.getPublicKey() == null) { - throw new RuntimeException("public key not set !"); - } - - Hasher hasher = new SHA256Hasher(); - - BigInteger m = new BigInteger(hasher.getHash(message)); - BigInteger v = key.getG().modPow(m, key.getP()); - BigInteger w = (key.getPublicKey().modPow(sign.getR(), - key.getP()).multiply(sign.getR().modPow(sign.getS(), key.getP())).mod(key.getP())); - - return v.equals(w); - } - - @Override - public ElGamalKey getKey() { - return this.key; - } + @Override + public ElGamalSignature sign(byte[] message) { + if (key == null || key.getPrivateKey() == null) { + throw new RuntimeException("Private key not set !"); + } + SecureRandom random = new SecureRandom(); + Hasher hasher = new SHA256Hasher(); + BigInteger m = new BigInteger(hasher.getHash(message)); + + BigInteger k; + do { + k = BigInteger.probablePrime(1023, random); + } while (k.compareTo(BigInteger.ONE) <= 0 || k.gcd(key.getP()).compareTo(BigInteger.ONE) != 0); + + BigInteger l = k.modInverse(key.getP().subtract(BigInteger.ONE)); + BigInteger r = key.getG().modPow(k, key.getP()); + BigInteger s = l.multiply(m.subtract(r.multiply(key.getPrivateKey())).mod(key.getP().subtract(BigInteger.ONE))); + + return new ElGamalSignature(r, s); + } + + @Override + public boolean verify(byte[] message, ElGamalSignature sign) { + if (key == null || key.getPublicKey() == null) { + throw new RuntimeException("public key not set !"); + } + + Hasher hasher = new SHA256Hasher(); + + BigInteger m = new BigInteger(hasher.getHash(message)); + BigInteger v = key.getG().modPow(m, key.getP()); + BigInteger w = (key.getPublicKey().modPow(sign.getR(), + key.getP()).multiply(sign.getR().modPow(sign.getS(), key.getP())).mod(key.getP())); + + return v.equals(w); + } + + @Override + public ElGamalKey getKey() { + return this.key; + } } diff --git a/src/main/java/crypt/impl/signatures/SigmaSigner.java b/src/main/java/crypt/impl/signatures/SigmaSigner.java index 353aa906..ab7b19c9 100644 --- a/src/main/java/crypt/impl/signatures/SigmaSigner.java +++ b/src/main/java/crypt/impl/signatures/SigmaSigner.java @@ -1,7 +1,5 @@ package crypt.impl.signatures; -import java.math.BigInteger; - import crypt.base.AbstractSigner; import model.entity.ElGamalKey; import model.entity.sigma.Or; @@ -11,80 +9,84 @@ import protocol.impl.sigma.PCS; import protocol.impl.sigma.Sender; -public class SigmaSigner extends AbstractSigner{ - - - private ElGamalKey trentK; - private ElGamalKey receiverK; - - public ElGamalKey getTrentK(){ - return trentK; - } - public void setTrentK(ElGamalKey t){ - this.trentK = t; - } - - public ElGamalKey getReceiverK(){ - return receiverK; - } - public void setReceiverK(ElGamalKey r){ - this.receiverK = r; - } - - - /* Sign the message - */ - @Override - public SigmaSignature sign(byte[] message) { - if (this.getReceiverK() == null || this.getTrentK() == null){ - throw new RuntimeException("Trent and receiver keys not set"); - } - - Sender sender = new Sender(this.key); - // Need to setup the "encrypt - byte[] b = Sender.getIdentificationData(this.key); - sender.Encryption(b, this.getTrentK()); - - Responses rpcs = sender.SendResponseCCE(message, this.trentK); - PCS p = new PCS(sender, this.trentK); - Or pcs = p.getPcs(message, this.receiverK, false); - - SigmaSignature s = new SigmaSignature(pcs, rpcs); - s.setTrenK(trentK); - return s; - } - - - /* Verify the signature - */ - @Override - public boolean verify(byte[] message, SigmaSignature sign) { - ElGamalKey trentKey = sign.getTrentK(); - - ResEncrypt resE = sign.getPcs().ands[0].resEncrypt; - - // checks the resEncrypt according to the receiverK - if (this.getReceiverK() != null){ - BigInteger m = new BigInteger(resE.getM()).mod(trentKey.getP()); - BigInteger n = new BigInteger(Sender.getIdentificationData(getReceiverK())); - if (!m.equals(n)){ - return false; - } - } - - // If trent and sender keys not set, just check signature - if (this.getTrentK() == null){ - return sign.getPcs().Verifies(message) && sign.getRpcs().Verifies(trentKey, resE); - } - - // Check the signature and if keys match (Trent and sender keys) - return sign.getPcs().Verifies(message) && sign.getRpcs().Verifies(trentKey, resE) - && trentK.getPublicKey().equals(trentKey.getPublicKey()); - } - - - @Override - public ElGamalKey getKey(){ - return this.key; - } +import java.math.BigInteger; + +public class SigmaSigner extends AbstractSigner { + + + private ElGamalKey trentK; + private ElGamalKey receiverK; + + public ElGamalKey getTrentK() { + return trentK; + } + + public void setTrentK(ElGamalKey t) { + this.trentK = t; + } + + public ElGamalKey getReceiverK() { + return receiverK; + } + + public void setReceiverK(ElGamalKey r) { + this.receiverK = r; + } + + + /* Sign the message + */ + @Override + public SigmaSignature sign(byte[] message) { + if (this.getReceiverK() == null || this.getTrentK() == null) { + throw new RuntimeException("Trent and receiver keys not set"); + } + + Sender sender = new Sender(this.key); + // Need to setup the "encrypt + byte[] b = Sender.getIdentificationData(this.key); + sender.Encryption(b, this.getTrentK()); + + Responses rpcs = sender.SendResponseCCE(message, this.trentK); + PCS p = new PCS(sender, this.trentK); + Or pcs = p.getPcs(message, this.receiverK, false); + + SigmaSignature s = new SigmaSignature(pcs, rpcs); + s.setTrenK(trentK); + return s; + } + + + /* Verify the signature + */ + @Override + public boolean verify(byte[] message, SigmaSignature sign) { + ElGamalKey trentKey = sign.getTrentK(); + + ResEncrypt resE = sign.getPcs().ands[0].resEncrypt; + + // checks the resEncrypt according to the receiverK + if (this.getReceiverK() != null) { + BigInteger m = new BigInteger(resE.getM()).mod(trentKey.getP()); + BigInteger n = new BigInteger(Sender.getIdentificationData(getReceiverK())); + if (!m.equals(n)) { + return false; + } + } + + // If trent and sender keys not set, just check signature + if (this.getTrentK() == null) { + return sign.getPcs().Verifies(message) && sign.getRpcs().Verifies(trentKey, resE); + } + + // Check the signature and if keys match (Trent and sender keys) + return sign.getPcs().Verifies(message) && sign.getRpcs().Verifies(trentKey, resE) + && trentK.getPublicKey().equals(trentKey.getPublicKey()); + } + + + @Override + public ElGamalKey getKey() { + return this.key; + } } diff --git a/src/main/java/crypt/utils/AbstractParser.java b/src/main/java/crypt/utils/AbstractParser.java index d756bcd9..77f3c720 100644 --- a/src/main/java/crypt/utils/AbstractParser.java +++ b/src/main/java/crypt/utils/AbstractParser.java @@ -1,16 +1,5 @@ package crypt.utils; -import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Field; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Hashtable; - import controller.tools.LoggerUtilities; import crypt.annotations.CryptCryptAnnotation; import crypt.annotations.CryptHashAnnotation; @@ -19,234 +8,247 @@ import crypt.api.encryption.Encrypter; import crypt.api.key.AsymKey; import crypt.factories.EncrypterFactory; -import crypt.factories.HasherFactory; -import crypt.impl.encryption.ElGamalEncrypter; import crypt.impl.encryption.ElGamalSerpentEncrypter; import model.entity.ElGamalKey; -import model.entity.User; + +import java.lang.reflect.Field; +import java.math.BigInteger; +import java.util.Hashtable; /** - * Abstract class that parse Entity fields for each annotation, and prepare fields for parser Action implemented in its child class. - * + * Abstract class that parse Entity fields for each annotation, and prepare fields for parser Action implemented in its child class. + * + * @param Type of Object generic type. * @author radoua abderrahim - * @param Type of Object generic type. */ -public abstract class AbstractParser implements ParserAnnotation{ - - //private User user; - - - private Entity entity; - private byte[] salt; - - private Hashtable fieldsToCrypt; - private Hashtable fieldsToHash; - private Hashtable fieldsToSign; - - private AsymKey key; - - /** - * Constructor - * @param entity - */ - public AbstractParser(Entity entity){ - this.entity = entity; - fieldsToCrypt = new Hashtable<>(); - fieldsToHash = new Hashtable<>(); - fieldsToSign = new Hashtable<>(); - init(); - } - - /** - * Constructor - * @param entity - */ - public AbstractParser(Entity entity,AsymKey key){ - this.entity = entity; - this.key = key; - fieldsToCrypt = new Hashtable<>(); - fieldsToHash = new Hashtable<>(); - fieldsToSign = new Hashtable<>(); - init(); - } - - - /** - * Iterate on all fields and check for all possible annotations with each one - * if an annotation found stored in Hashtable specific for that category. - */ - public void init(){ - - Field [] tabsField = entity.getClass().getDeclaredFields(); - - for (Field field : tabsField) { - - CryptHashAnnotation annotationHasher = field.getAnnotation(CryptHashAnnotation.class); - CryptCryptAnnotation annotationCrypt = field.getAnnotation(CryptCryptAnnotation.class); - CryptSigneAnnotation annotationSigne = field.getAnnotation(CryptSigneAnnotation.class); - - if(annotationHasher!=null){ - fieldsToHash.put(field, annotationHasher); - } - - if(annotationCrypt!=null){ - fieldsToCrypt.put(field,annotationCrypt); - } - - if(annotationSigne!=null){ - fieldsToSign.put(field, annotationSigne); - } - } - } - - /** - * read the salt within the Entity - *

- * if no salt found within the Entity, it will return null. - *

- * @return byte[] - */ - public byte[] getSalt(){ - - try { - - Field field = entity.getClass().getDeclaredField("salt"); - - field.setAccessible(true); - - this.salt = (byte []) field.get(entity); - - return this.salt; - - } catch (NoSuchFieldException e) { - LoggerUtilities.logStackTrace(e); - } catch (SecurityException e) { - LoggerUtilities.logStackTrace(e); - } catch (IllegalArgumentException e) { - LoggerUtilities.logStackTrace(e); - } catch (IllegalAccessException e) { - LoggerUtilities.logStackTrace(e); - } - - return null; - } - - /** - * getter - * @return Entity the entity - */ - public Entity getEntity() { - return entity; - } - - /** - * Hashtable of fields that should be encrypted or decrypted - * Hashtable of field as key and annotation as value. - * @return Hashtable - */ - public Hashtable getFieldsToCrypt() { - return fieldsToCrypt; - } - - /** - * Hashtable of fields that should be hashed - * Hashtable of field as key and annotation as value. - * @return Hashtable - */ - public Hashtable getFieldsToHash() { - return fieldsToHash; - } - - /** - * Hashtable of fields that should be signed or checked - * Hashtable of field as key and annotation as value. - * @return Hashtable - */ - public Hashtable getFieldsToSign() { - return fieldsToSign; - } - - - /** - * private key of user - * @return BigInteger - */ - public BigInteger getPrivateKey(){ - return this.key.getPrivateKey(); - } - - /** - * public key of user - * @return BigInteger - */ - public BigInteger getPublicKey(){ - return this.key.getPublicKey(); - } - - /** - * ElGamalKey of user - * Composite key public and private key - * @return ElGamalKey - */ - public ElGamalKey getKey(){ - return (ElGamalKey) this.key; - } - - public void setKey(AsymKey key) { - this.key = key; - } - - /** - * if entity signature not correct set entity to null - */ - public void setEntityToNull() { - this.entity = null; - this.fieldsToCrypt = new Hashtable<>(); - this.fieldsToHash = new Hashtable<>(); - this.fieldsToSign = new Hashtable<>(); - } - - /** - * encrypt String data - * using an asymmetric protocol to encrypt a password and encrypt data using this password by a symmetric system - * @param data : String - * @return : encrypted data as a json String - */ - protected String encrypt(String data,boolean isKeyPublic){ - - Encrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); - - encrypter.setKey(getKey()); - - return new String(encrypter.encrypt(data.getBytes())); - } - - /** - * decrypt String data - * using an asymmetric protocol to decrypt a password and decrypt data using this password by a symmetric system - * @param data : String as json format - * @return : decrypted data as String - */ - protected String decrypt(String data,boolean isKeyPublic){ - - Encrypter decrypter = EncrypterFactory.createElGamalSerpentEncrypter(); - - decrypter.setKey(getKey()); - - return new String(decrypter.decrypt(data.getBytes())); - } - - - protected String encrypt(String data,ElGamalKey key,boolean isKeyPublic){ - ElGamalSerpentEncrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); - encrypter.setKey(getKey()); - return new String(encrypter.encryptMsg(data.getBytes(),key).getBytes()); - } - - protected String decrypt(String data,ElGamalKey key,boolean isKeyPublic){ - ElGamalSerpentEncrypter decrypter = EncrypterFactory.createElGamalSerpentEncrypter(); - decrypter.setKey(getKey()); - return new String(decrypter.decryptMsg(new String(data.getBytes()),key)); - } - +public abstract class AbstractParser implements ParserAnnotation { + + //private User user; + + + private Entity entity; + private byte[] salt; + + private Hashtable fieldsToCrypt; + private Hashtable fieldsToHash; + private Hashtable fieldsToSign; + + private AsymKey key; + + /** + * Constructor + * + * @param entity + */ + public AbstractParser(Entity entity) { + this.entity = entity; + fieldsToCrypt = new Hashtable<>(); + fieldsToHash = new Hashtable<>(); + fieldsToSign = new Hashtable<>(); + init(); + } + + /** + * Constructor + * + * @param entity + */ + public AbstractParser(Entity entity, AsymKey key) { + this.entity = entity; + this.key = key; + fieldsToCrypt = new Hashtable<>(); + fieldsToHash = new Hashtable<>(); + fieldsToSign = new Hashtable<>(); + init(); + } + + + /** + * Iterate on all fields and check for all possible annotations with each one + * if an annotation found stored in Hashtable specific for that category. + */ + public void init() { + + Field[] tabsField = entity.getClass().getDeclaredFields(); + + for (Field field : tabsField) { + + CryptHashAnnotation annotationHasher = field.getAnnotation(CryptHashAnnotation.class); + CryptCryptAnnotation annotationCrypt = field.getAnnotation(CryptCryptAnnotation.class); + CryptSigneAnnotation annotationSigne = field.getAnnotation(CryptSigneAnnotation.class); + + if (annotationHasher != null) { + fieldsToHash.put(field, annotationHasher); + } + + if (annotationCrypt != null) { + fieldsToCrypt.put(field, annotationCrypt); + } + + if (annotationSigne != null) { + fieldsToSign.put(field, annotationSigne); + } + } + } + + /** + * read the salt within the Entity + *

+ * if no salt found within the Entity, it will return null. + *

+ * + * @return byte[] + */ + public byte[] getSalt() { + + try { + + Field field = entity.getClass().getDeclaredField("salt"); + + field.setAccessible(true); + + this.salt = (byte[]) field.get(entity); + + return this.salt; + + } catch (NoSuchFieldException e) { + LoggerUtilities.logStackTrace(e); + } catch (SecurityException e) { + LoggerUtilities.logStackTrace(e); + } catch (IllegalArgumentException e) { + LoggerUtilities.logStackTrace(e); + } catch (IllegalAccessException e) { + LoggerUtilities.logStackTrace(e); + } + + return null; + } + + /** + * getter + * + * @return Entity the entity + */ + public Entity getEntity() { + return entity; + } + + /** + * Hashtable of fields that should be encrypted or decrypted + * Hashtable of field as key and annotation as value. + * + * @return Hashtable + */ + public Hashtable getFieldsToCrypt() { + return fieldsToCrypt; + } + + /** + * Hashtable of fields that should be hashed + * Hashtable of field as key and annotation as value. + * + * @return Hashtable + */ + public Hashtable getFieldsToHash() { + return fieldsToHash; + } + + /** + * Hashtable of fields that should be signed or checked + * Hashtable of field as key and annotation as value. + * + * @return Hashtable + */ + public Hashtable getFieldsToSign() { + return fieldsToSign; + } + + + /** + * private key of user + * + * @return BigInteger + */ + public BigInteger getPrivateKey() { + return this.key.getPrivateKey(); + } + + /** + * public key of user + * + * @return BigInteger + */ + public BigInteger getPublicKey() { + return this.key.getPublicKey(); + } + + /** + * ElGamalKey of user + * Composite key public and private key + * + * @return ElGamalKey + */ + public ElGamalKey getKey() { + return (ElGamalKey) this.key; + } + + public void setKey(AsymKey key) { + this.key = key; + } + + /** + * if entity signature not correct set entity to null + */ + public void setEntityToNull() { + this.entity = null; + this.fieldsToCrypt = new Hashtable<>(); + this.fieldsToHash = new Hashtable<>(); + this.fieldsToSign = new Hashtable<>(); + } + + /** + * encrypt String data + * using an asymmetric protocol to encrypt a password and encrypt data using this password by a symmetric system + * + * @param data : String + * @return : encrypted data as a json String + */ + protected String encrypt(String data, boolean isKeyPublic) { + + Encrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); + + encrypter.setKey(getKey()); + + return new String(encrypter.encrypt(data.getBytes())); + } + + /** + * decrypt String data + * using an asymmetric protocol to decrypt a password and decrypt data using this password by a symmetric system + * + * @param data : String as json format + * @return : decrypted data as String + */ + protected String decrypt(String data, boolean isKeyPublic) { + + Encrypter decrypter = EncrypterFactory.createElGamalSerpentEncrypter(); + + decrypter.setKey(getKey()); + + return new String(decrypter.decrypt(data.getBytes())); + } + + + protected String encrypt(String data, ElGamalKey key, boolean isKeyPublic) { + ElGamalSerpentEncrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); + encrypter.setKey(getKey()); + return new String(encrypter.encryptMsg(data.getBytes(), key).getBytes()); + } + + protected String decrypt(String data, ElGamalKey key, boolean isKeyPublic) { + ElGamalSerpentEncrypter decrypter = EncrypterFactory.createElGamalSerpentEncrypter(); + decrypter.setKey(getKey()); + return new String(decrypter.decryptMsg(new String(data.getBytes()), key)); + } + } diff --git a/src/main/java/crypt/utils/BigIntegerRandom.java b/src/main/java/crypt/utils/BigIntegerRandom.java index 8c886fcc..eae74110 100644 --- a/src/main/java/crypt/utils/BigIntegerRandom.java +++ b/src/main/java/crypt/utils/BigIntegerRandom.java @@ -4,13 +4,13 @@ import java.security.SecureRandom; public class BigIntegerRandom { - private static SecureRandom random = new SecureRandom(); - static public BigInteger rand (int bitLength, BigInteger p) - { - BigInteger s; - s = new BigInteger(bitLength,random); - while(s.compareTo(BigInteger.ONE) < 0 || s.compareTo(p) > 0) - s = new BigInteger(bitLength,random); - return s; - } + private static SecureRandom random = new SecureRandom(); + + static public BigInteger rand(int bitLength, BigInteger p) { + BigInteger s; + s = new BigInteger(bitLength, random); + while (s.compareTo(BigInteger.ONE) < 0 || s.compareTo(p) > 0) + s = new BigInteger(bitLength, random); + return s; + } } diff --git a/src/main/java/crypt/utils/CryptoParser.java b/src/main/java/crypt/utils/CryptoParser.java index 9adf4ac2..2d371b52 100644 --- a/src/main/java/crypt/utils/CryptoParser.java +++ b/src/main/java/crypt/utils/CryptoParser.java @@ -1,17 +1,5 @@ package crypt.utils; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Hashtable; -import java.util.Map.Entry; - -import org.bouncycastle.crypto.params.ElGamalParameters; - import controller.tools.LoggerUtilities; import crypt.annotations.CryptCryptAnnotation; import crypt.annotations.CryptHashAnnotation; @@ -21,350 +9,351 @@ import crypt.api.key.AsymKey; import crypt.api.signatures.Signer; import crypt.factories.AsymKeyFactory; -import crypt.factories.ElGamalAsymKeyFactory; -import crypt.factories.EncrypterFactory; import crypt.factories.HasherFactory; import crypt.factories.SignerFactory; -import crypt.impl.encryption.ElGamalEncrypter; import crypt.impl.signatures.ElGamalSignature; -import crypt.impl.signatures.ElGamalSigner; import model.entity.ElGamalKey; import model.entity.ElGamalSignEntity; -import model.entity.User; + +import java.lang.reflect.Field; +import java.math.BigInteger; +import java.util.Hashtable; +import java.util.Map.Entry; /** - * Class represent the parser implementation. + * Class represent the parser implementation. + * + * @param Type of Object generic type. * @author radoua abderrahim - * @param Type of Object generic type. */ public class CryptoParser extends AbstractParser { - public CryptoParser(Entity entity) { - super(entity); - } - - public CryptoParser(Entity entity,AsymKey key) { - super(entity,key); - } - - - /** - * {@inheritDoc} - */ - @Override - public Entity parseAnnotation(ParserAction ... actions) { - - for (ParserAction action : actions) { - switch (action) { - case HasherAction: - hasherFields(); - break; - case CryptAction: - cryptFields(); - break; - case DecryptAction: - decryptFields(); - break; - case SigneAction: - signeFields(); - break; - case CheckAction: - checkSignature(); - break; - case Resilience: - resilienceFields(); - break; - } - } - - return getEntity(); - } - - /** - * hasher action implementation - */ - private void hasherFields() { - - Hashtable fieldsMap = getFieldsToHash(); //get fields to hash - - for (Entry entry : fieldsMap.entrySet()) { - - Field field = entry.getKey(); - - CryptHashAnnotation annotation = entry.getValue(); - - try { - - field.setAccessible(true); - - Object valueOfField = field.get(getEntity()); - - Hasher hasher = HasherFactory.createDefaultHasher(); - - hasher.setSalt(getSalt()); - - valueOfField = hasher.getHash((byte[]) valueOfField); - - field.set(getEntity(), valueOfField); - - } catch (IllegalArgumentException e) { - LoggerUtilities.logStackTrace(e); - } catch (IllegalAccessException e) { - LoggerUtilities.logStackTrace(e); - } - } - } - - /** - * encrypt action implementation - */ - private void cryptFields() { - - Hashtable fieldsMap = getFieldsToCrypt(); - - for (Entry entry : fieldsMap.entrySet()) { - - Field field = entry.getKey(); - - CryptCryptAnnotation annotation = entry.getValue(); - - field.setAccessible(true); - - try { - - String valueOfField = String.valueOf(field.get(getEntity())); - - if(annotation.isCryptBySecondKey()){ - - ElGamalKey elgamalkey = AsymKeyFactory.createElGamalAsymKey(false); - - Field keyField = getEntity().getClass().getDeclaredField(annotation.secondKey()); - - //key is BigInteger - keyField.setAccessible(true); - - if(! (keyField.get(getEntity()) instanceof BigInteger) ){ //not BigIntger throw exception - throw new RuntimeException("Check-key must be a BigInteger!"); - } - - elgamalkey.setPublicKey((BigInteger) keyField.get(getEntity())); - - field.set(getEntity(), this.encrypt(valueOfField,elgamalkey,annotation.isEncryptKeyPublic())); - - }else{ - field.set(getEntity(), this.encrypt(valueOfField,annotation.isEncryptKeyPublic())); - } - - } catch (IllegalArgumentException e) { - LoggerUtilities.logStackTrace(e); - } catch (IllegalAccessException e) { - LoggerUtilities.logStackTrace(e); - } catch (NoSuchFieldException e) { - LoggerUtilities.logStackTrace(e); - } catch (SecurityException e) { - LoggerUtilities.logStackTrace(e); - } - } - } - - /** - * decrypt action implementation - */ - private void decryptFields() { - - Hashtable fieldsMap = getFieldsToCrypt(); - - for (Entry entry : fieldsMap.entrySet()) { - - Field field = entry.getKey(); - - CryptCryptAnnotation annotation = entry.getValue(); - - field.setAccessible(true); - - try { - - String valueOfField = String.valueOf(field.get(getEntity())); - - if(annotation.isCryptBySecondKey()){ - - ElGamalKey elgamalkey = AsymKeyFactory.createElGamalAsymKey(false); - - Field keyField = getEntity().getClass().getDeclaredField(annotation.secondKey()); - - //key is BigInteger - keyField.setAccessible(true); - - if(! (keyField.get(getEntity()) instanceof BigInteger) ){ - throw new RuntimeException("Check-key must be a BigInteger!"); - } - - elgamalkey.setPublicKey((BigInteger) keyField.get(getEntity())); - - field.set(getEntity(), this.decrypt(valueOfField,elgamalkey,annotation.isEncryptKeyPublic())); - - }else{ - field.set(getEntity(), this.decrypt(valueOfField,annotation.isEncryptKeyPublic())); - } - - } catch (IllegalArgumentException e) { - LoggerUtilities.logStackTrace(e); - } catch (IllegalAccessException e) { - LoggerUtilities.logStackTrace(e); - } catch (NoSuchFieldException e) { - LoggerUtilities.logStackTrace(e); - } catch (SecurityException e) { - LoggerUtilities.logStackTrace(e); - } - } - } - - /** - * signed action implementation - */ - private void signeFields() { - - Hashtable fieldsMap = getFieldsToSign(); - - for (Entry entry : fieldsMap.entrySet()) { - - Field field = entry.getKey(); - - CryptSigneAnnotation annotation = entry.getValue(); - - field.setAccessible(true); - - StringBuilder sb = new StringBuilder(); - - for (String nameOfField : annotation.signeWithFields()) { - try { - - Field f = getEntity().getClass().getDeclaredField(nameOfField); - - f.setAccessible(true); - - if(f.get(getEntity()) instanceof byte[]){ - sb.append(new String((byte[])f.get(getEntity()), "UTF-8")); - }else{ - sb.append(String.valueOf(f.get(getEntity()))); - } - } catch (Exception e) { - LoggerUtilities.logStackTrace(e); - } - } - - Signer signer = SignerFactory.createElGamalSigner(); - - ElGamalKey elgamalkey = AsymKeyFactory.createElGamalAsymKey(false); - - elgamalkey.setPrivateKey(getPrivateKey()); - //elgamalkey.setPublicKey(null); - - signer.setKey(elgamalkey); - //System.out.println("sign : { "+sb.toString()+" }"); - ElGamalSignature elGamalSignature = signer.sign(sb.toString().getBytes()); - - ElGamalSignEntity signatureEntity = new ElGamalSignEntity(); //save signature in entity Item as a ElGamalSignEntity object - signatureEntity.setR(elGamalSignature.getR()); - - signatureEntity.setS(elGamalSignature.getS()); - - - try { - - field.set(getEntity(), signatureEntity); - - } catch (IllegalArgumentException e) { - LoggerUtilities.logStackTrace(e); - } catch (IllegalAccessException e) { - LoggerUtilities.logStackTrace(e); - } - - } - } - - /** - * check the signature action implementation - */ - private void checkSignature(){ - - Hashtable fieldsMap = getFieldsToSign(); - - for (Entry entry : fieldsMap.entrySet()) { - - Field field = entry.getKey(); - - CryptSigneAnnotation annotation = entry.getValue(); - - field.setAccessible(true); - - StringBuilder sb = new StringBuilder(); - - for (String nameOfField : annotation.signeWithFields()) { - try { - - Field f = getEntity().getClass().getDeclaredField(nameOfField); - - f.setAccessible(true); - - if(f.get(getEntity()) instanceof byte[]){ - sb.append(new String((byte[])f.get(getEntity()), "UTF-8")); - }else{ - sb.append(String.valueOf(f.get(getEntity()))); - } - - } catch (Exception e) { - LoggerUtilities.logStackTrace(e); - } - } - - try { - - Signer signer = SignerFactory.createElGamalSigner(); - - ElGamalKey elgamalkey = AsymKeyFactory.createElGamalAsymKey(false); - - //elgamalkey.setPrivateKey(null); - - Field keyField = getEntity().getClass().getDeclaredField(annotation.checkByKey()); - - keyField.setAccessible(true); - - if(keyField.get(getEntity()) instanceof ElGamalKey){ - - elgamalkey.setPublicKey(((ElGamalKey) keyField.get(getEntity())).getPublicKey()); - - }else if(keyField.get(getEntity()) instanceof BigInteger){ //key is BigInteger - - elgamalkey.setPublicKey((BigInteger) keyField.get(getEntity())); - - }else{ - - throw new RuntimeException("Check-key must be a BigInteger or ElGamalKey !"); - } - - signer.setKey(elgamalkey); - - ElGamalSignEntity signEntity = (ElGamalSignEntity) field.get(getEntity()); - - ElGamalSignature signatue = new ElGamalSignature(signEntity.getR(), signEntity.getS()); - //System.out.println("check : { "+sb.toString()+" }"); - if(!signer.verify(sb.toString().getBytes(), signatue)){ - setEntityToNull(); - return; - } - } catch (Exception e) { - LoggerUtilities.logStackTrace(e); - } - } - - } - - /** - * resilience action implementation - */ - private void resilienceFields() { - - } + public CryptoParser(Entity entity) { + super(entity); + } + + public CryptoParser(Entity entity, AsymKey key) { + super(entity, key); + } + + + /** + * {@inheritDoc} + */ + @Override + public Entity parseAnnotation(ParserAction... actions) { + + for (ParserAction action : actions) { + switch (action) { + case HasherAction: + hasherFields(); + break; + case CryptAction: + cryptFields(); + break; + case DecryptAction: + decryptFields(); + break; + case SigneAction: + signeFields(); + break; + case CheckAction: + checkSignature(); + break; + case Resilience: + resilienceFields(); + break; + } + } + + return getEntity(); + } + + /** + * hasher action implementation + */ + private void hasherFields() { + + Hashtable fieldsMap = getFieldsToHash(); //get fields to hash + + for (Entry entry : fieldsMap.entrySet()) { + + Field field = entry.getKey(); + + CryptHashAnnotation annotation = entry.getValue(); + + try { + + field.setAccessible(true); + + Object valueOfField = field.get(getEntity()); + + Hasher hasher = HasherFactory.createDefaultHasher(); + + hasher.setSalt(getSalt()); + + valueOfField = hasher.getHash((byte[]) valueOfField); + + field.set(getEntity(), valueOfField); + + } catch (IllegalArgumentException e) { + LoggerUtilities.logStackTrace(e); + } catch (IllegalAccessException e) { + LoggerUtilities.logStackTrace(e); + } + } + } + + /** + * encrypt action implementation + */ + private void cryptFields() { + + Hashtable fieldsMap = getFieldsToCrypt(); + + for (Entry entry : fieldsMap.entrySet()) { + + Field field = entry.getKey(); + + CryptCryptAnnotation annotation = entry.getValue(); + + field.setAccessible(true); + + try { + + String valueOfField = String.valueOf(field.get(getEntity())); + + if (annotation.isCryptBySecondKey()) { + + ElGamalKey elgamalkey = AsymKeyFactory.createElGamalAsymKey(false); + + Field keyField = getEntity().getClass().getDeclaredField(annotation.secondKey()); + + //key is BigInteger + keyField.setAccessible(true); + + if (!(keyField.get(getEntity()) instanceof BigInteger)) { //not BigIntger throw exception + throw new RuntimeException("Check-key must be a BigInteger!"); + } + + elgamalkey.setPublicKey((BigInteger) keyField.get(getEntity())); + + field.set(getEntity(), this.encrypt(valueOfField, elgamalkey, annotation.isEncryptKeyPublic())); + + } else { + field.set(getEntity(), this.encrypt(valueOfField, annotation.isEncryptKeyPublic())); + } + + } catch (IllegalArgumentException e) { + LoggerUtilities.logStackTrace(e); + } catch (IllegalAccessException e) { + LoggerUtilities.logStackTrace(e); + } catch (NoSuchFieldException e) { + LoggerUtilities.logStackTrace(e); + } catch (SecurityException e) { + LoggerUtilities.logStackTrace(e); + } + } + } + + /** + * decrypt action implementation + */ + private void decryptFields() { + + Hashtable fieldsMap = getFieldsToCrypt(); + + for (Entry entry : fieldsMap.entrySet()) { + + Field field = entry.getKey(); + + CryptCryptAnnotation annotation = entry.getValue(); + + field.setAccessible(true); + + try { + + String valueOfField = String.valueOf(field.get(getEntity())); + + if (annotation.isCryptBySecondKey()) { + + ElGamalKey elgamalkey = AsymKeyFactory.createElGamalAsymKey(false); + + Field keyField = getEntity().getClass().getDeclaredField(annotation.secondKey()); + + //key is BigInteger + keyField.setAccessible(true); + + if (!(keyField.get(getEntity()) instanceof BigInteger)) { + throw new RuntimeException("Check-key must be a BigInteger!"); + } + + elgamalkey.setPublicKey((BigInteger) keyField.get(getEntity())); + + field.set(getEntity(), this.decrypt(valueOfField, elgamalkey, annotation.isEncryptKeyPublic())); + + } else { + field.set(getEntity(), this.decrypt(valueOfField, annotation.isEncryptKeyPublic())); + } + + } catch (IllegalArgumentException e) { + LoggerUtilities.logStackTrace(e); + } catch (IllegalAccessException e) { + LoggerUtilities.logStackTrace(e); + } catch (NoSuchFieldException e) { + LoggerUtilities.logStackTrace(e); + } catch (SecurityException e) { + LoggerUtilities.logStackTrace(e); + } + } + } + + /** + * signed action implementation + */ + private void signeFields() { + + Hashtable fieldsMap = getFieldsToSign(); + + for (Entry entry : fieldsMap.entrySet()) { + + Field field = entry.getKey(); + + CryptSigneAnnotation annotation = entry.getValue(); + + field.setAccessible(true); + + StringBuilder sb = new StringBuilder(); + + for (String nameOfField : annotation.signeWithFields()) { + try { + + Field f = getEntity().getClass().getDeclaredField(nameOfField); + + f.setAccessible(true); + + if (f.get(getEntity()) instanceof byte[]) { + sb.append(new String((byte[]) f.get(getEntity()), "UTF-8")); + } else { + sb.append(String.valueOf(f.get(getEntity()))); + } + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } + } + + Signer signer = SignerFactory.createElGamalSigner(); + + ElGamalKey elgamalkey = AsymKeyFactory.createElGamalAsymKey(false); + + elgamalkey.setPrivateKey(getPrivateKey()); + //elgamalkey.setPublicKey(null); + + signer.setKey(elgamalkey); + //System.out.println("sign : { "+sb.toString()+" }"); + ElGamalSignature elGamalSignature = signer.sign(sb.toString().getBytes()); + + ElGamalSignEntity signatureEntity = new ElGamalSignEntity(); //save signature in entity Item as a ElGamalSignEntity object + signatureEntity.setR(elGamalSignature.getR()); + + signatureEntity.setS(elGamalSignature.getS()); + + + try { + + field.set(getEntity(), signatureEntity); + + } catch (IllegalArgumentException e) { + LoggerUtilities.logStackTrace(e); + } catch (IllegalAccessException e) { + LoggerUtilities.logStackTrace(e); + } + + } + } + + /** + * check the signature action implementation + */ + private void checkSignature() { + + Hashtable fieldsMap = getFieldsToSign(); + + for (Entry entry : fieldsMap.entrySet()) { + + Field field = entry.getKey(); + + CryptSigneAnnotation annotation = entry.getValue(); + + field.setAccessible(true); + + StringBuilder sb = new StringBuilder(); + + for (String nameOfField : annotation.signeWithFields()) { + try { + + Field f = getEntity().getClass().getDeclaredField(nameOfField); + + f.setAccessible(true); + + if (f.get(getEntity()) instanceof byte[]) { + sb.append(new String((byte[]) f.get(getEntity()), "UTF-8")); + } else { + sb.append(String.valueOf(f.get(getEntity()))); + } + + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } + } + + try { + + Signer signer = SignerFactory.createElGamalSigner(); + + ElGamalKey elgamalkey = AsymKeyFactory.createElGamalAsymKey(false); + + //elgamalkey.setPrivateKey(null); + + Field keyField = getEntity().getClass().getDeclaredField(annotation.checkByKey()); + + keyField.setAccessible(true); + + if (keyField.get(getEntity()) instanceof ElGamalKey) { + + elgamalkey.setPublicKey(((ElGamalKey) keyField.get(getEntity())).getPublicKey()); + + } else if (keyField.get(getEntity()) instanceof BigInteger) { //key is BigInteger + + elgamalkey.setPublicKey((BigInteger) keyField.get(getEntity())); + + } else { + + throw new RuntimeException("Check-key must be a BigInteger or ElGamalKey !"); + } + + signer.setKey(elgamalkey); + + ElGamalSignEntity signEntity = (ElGamalSignEntity) field.get(getEntity()); + + ElGamalSignature signatue = new ElGamalSignature(signEntity.getR(), signEntity.getS()); + //System.out.println("check : { "+sb.toString()+" }"); + if (!signer.verify(sb.toString().getBytes(), signatue)) { + setEntityToNull(); + return; + } + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } + } + + } + + /** + * resilience action implementation + */ + private void resilienceFields() { + + } } \ No newline at end of file diff --git a/src/main/java/model/api/EntityValidation.java b/src/main/java/model/api/EntityValidation.java index 6930c5b8..fdb46d63 100644 --- a/src/main/java/model/api/EntityValidation.java +++ b/src/main/java/model/api/EntityValidation.java @@ -1,31 +1,33 @@ package model.api; -import java.util.Set; - import javax.validation.ConstraintViolation; +import java.util.Set; /** * Interface to validate Entities - * @author Julien Prudhomme * * @param + * @author Julien Prudhomme */ public interface EntityValidation { - /** - * Set the entity to check - * @param entity - An entity - */ - public void setEntity(Entity entity); - - /** - * Validate the settled entity - * @return true if the entity is settled and valid. Otherwise false - */ - public boolean validate(); - - /** - * Return a set of constraint violation if necessary. - * @return - */ - public Set> getViolations(); + /** + * Set the entity to check + * + * @param entity - An entity + */ + public void setEntity(Entity entity); + + /** + * Validate the settled entity + * + * @return true if the entity is settled and valid. Otherwise false + */ + public boolean validate(); + + /** + * Return a set of constraint violation if necessary. + * + * @return + */ + public Set> getViolations(); } diff --git a/src/main/java/model/api/EstablisherType.java b/src/main/java/model/api/EstablisherType.java index 1776f34d..47e86e9c 100644 --- a/src/main/java/model/api/EstablisherType.java +++ b/src/main/java/model/api/EstablisherType.java @@ -1,6 +1,6 @@ package model.api; public enum EstablisherType { - Sigma, - Ethereum + Sigma, + Ethereum } diff --git a/src/main/java/model/api/ItemSyncManager.java b/src/main/java/model/api/ItemSyncManager.java index 03e648b7..0b37e8fb 100644 --- a/src/main/java/model/api/ItemSyncManager.java +++ b/src/main/java/model/api/ItemSyncManager.java @@ -2,6 +2,6 @@ import model.entity.Item; -public interface ItemSyncManager extends SyncManager{ - +public interface ItemSyncManager extends SyncManager { + } diff --git a/src/main/java/model/api/Manager.java b/src/main/java/model/api/Manager.java index 821b3557..038ec418 100644 --- a/src/main/java/model/api/Manager.java +++ b/src/main/java/model/api/Manager.java @@ -1,98 +1,116 @@ package model.api; +import java.util.ArrayList; import java.util.Collection; -import java.util.Hashtable; - -import javax.persistence.EntityManager; /** * Asynchronous entity manager. Can handle network things - * @author Julien Prudhomme * * @param + * @author Julien Prudhomme */ public interface Manager { - /** - * Find one entity by its id - * @param id - * @param l - */ - public void findOneById(String id, ManagerListener l); - - /** - * Find all entity that match attribute - * @param attribute - * @param value - * @param l - */ - public void findAllByAttribute(String attribute, String value, ManagerListener l); - - /** - * Find one that match attribute - * @param attribute - * @param value - * @param l - */ - public void findOneByAttribute(String attribute, String value, ManagerListener l); - - /** - * Persist the entity in the manager - * @param entity - * @return true if done - */ - public boolean persist(Entity entity); - - /** - * Begin a transaction - * @return true if done - */ - public boolean begin(); - - /** - * End a transaction - * @return true if done - */ - public boolean end(); - - /** - * Remove an entity from the DB - * @param an entity - * @return True if the entity has been removed, false otherwise - */ - public boolean remove(Entity entity); - - /** - * Is the entity in a "managed state" ? - * i.e. Is it persistent ? - * @param entity - */ - public boolean contains(Entity entity); - - /** - * Returns a list of the currently "managed" entities. - */ - public Collection watchlist(); - - /** - * Returns a list of changed entities that currently in "managed" state. - */ - public Collection changesInWatchlist(); - - /** - * Checks if all the managed entities (i.e. the "watchlist") are valid entities. - * If the validation at persist() call is activated (default) this will always return true. - * Go to bin/META-INF/persistence.xml to change validation mode - * @return true if all the managed entities are valid, false otherwise - */ - public boolean check(); - - /** - * Close the transaction manager - * @return fails if the operation failed - */ - public boolean close(); - - - + /** + * Find one entity by its id + * + * @param id + * @param l + */ + public void findOneById(String id, ManagerListener l); + + + + + /**TODO**/ + public void findAllById(ArrayList id, ManagerListener l); + + /** + * Find all entity that match attribute + * + * @param attribute + * @param value + * @param l + */ + public void findAllByAttribute(String attribute, String value, ManagerListener l); + + /** + * Find one that match attribute + * + * @param attribute + * @param value + * @param l + */ + public void findOneByAttribute(String attribute, String value, ManagerListener l); + + + + /*TODO*/ + public void findAll(ManagerListener l); + + /** + * Persist the entity in the manager + * + * @param entity + * @return true if done + */ + public boolean persist(Entity entity); + + /** + * Begin a transaction + * + * @return true if done + */ + public boolean begin(); + + /** + * End a transaction + * + * @return true if done + */ + public boolean end(); + + /** + * Remove an entity from the DB + * + * @param an entity + * @return True if the entity has been removed, false otherwise + */ + public boolean remove(Entity entity); + + /** + * Is the entity in a "managed state" ? + * i.e. Is it persistent ? + * + * @param entity + */ + public boolean contains(Entity entity); + + /** + * Returns a list of the currently "managed" entities. + */ + public Collection watchlist(); + + /** + * Returns a list of changed entities that currently in "managed" state. + */ + public Collection changesInWatchlist(); + + /** + * Checks if all the managed entities (i.e. the "watchlist") are valid entities. + * If the validation at persist() call is activated (default) this will always return true. + * Go to bin/META-INF/persistence.xml to change validation mode + * + * @return true if all the managed entities are valid, false otherwise + */ + public boolean check(); + + /** + * Close the transaction manager + * + * @return fails if the operation failed + */ + public boolean close(); + + } diff --git a/src/main/java/model/api/ManagerDecorator.java b/src/main/java/model/api/ManagerDecorator.java index 11e24b2f..11e59d60 100644 --- a/src/main/java/model/api/ManagerDecorator.java +++ b/src/main/java/model/api/ManagerDecorator.java @@ -1,122 +1,135 @@ package model.api; +import java.util.ArrayList; import java.util.Collection; -import java.util.Hashtable; - -import javax.persistence.EntityManager; /** * Entities manager. Handle local and distant storage, search. - * @author Julien Prudhomme * * @param + * @author Julien Prudhomme */ -public abstract class ManagerDecorator implements Manager{ - - private Manager em; - - public ManagerDecorator(Manager em) { - this.em = em; - } - - /** - * {@inheritDoc} - */ - @Override - public void findOneById(String id, ManagerListener l) { - em.findOneById(id, l); - } - - /** - * {@inheritDoc} - */ - @Override - public void findAllByAttribute(String attribute, String value, ManagerListener l) { - em.findAllByAttribute(attribute, value, l); - } - - /** - * {@inheritDoc} - */ - @Override - public void findOneByAttribute(String attribute, String value, ManagerListener l) { - em.findOneByAttribute(attribute, value, l); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean persist(Entity entity) { - return em.persist(entity); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean begin() { - return em.begin(); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean end() { - return em.end(); - } - - - /** - * {@inheritDoc} - */ - @Override - public boolean remove(Entity entity){ - return em.remove(entity); - } - - /** - * {@inheritDoc} - */ - @Override - public Collection watchlist(){ - return em.watchlist(); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean contains(Entity entity){ - return em.contains(entity); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean check(){ - return em.check(); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean close() { - return em.close(); - } - - /** - * {@inheritDoc} - */ - @Override - public Collection changesInWatchlist() { - return em.changesInWatchlist(); - } - - - - +public abstract class ManagerDecorator implements Manager { + + private Manager em; + + public ManagerDecorator(Manager em) { + this.em = em; + } + + /** + * {@inheritDoc} + */ + @Override + public void findOneById(String id, ManagerListener l) { + em.findOneById(id, l); + } + + + + /**TODO**/ + @Override + public void findAllById(ArrayList id , ManagerListener l){ + em.findAllById(id,l); + } + + /** + * {@inheritDoc} + */ + @Override + public void findAllByAttribute(String attribute, String value, ManagerListener l) { + em.findAllByAttribute(attribute, value, l); + } + + /** + * {@inheritDoc} + */ + @Override + public void findOneByAttribute(String attribute, String value, ManagerListener l) { + em.findOneByAttribute(attribute, value, l); + } + + /** + * {@inheritDoc} + */ + @Override + public void findAll(ManagerListener l) { + em.findAll(l); + } + + + /** + * {@inheritDoc} + */ + @Override + public boolean persist(Entity entity) { + return em.persist(entity); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean begin() { + return em.begin(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean end() { + return em.end(); + } + + + /** + * {@inheritDoc} + */ + @Override + public boolean remove(Entity entity) { + return em.remove(entity); + } + + /** + * {@inheritDoc} + */ + @Override + public Collection watchlist() { + return em.watchlist(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean contains(Entity entity) { + return em.contains(entity); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean check() { + return em.check(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean close() { + return em.close(); + } + + /** + * {@inheritDoc} + */ + @Override + public Collection changesInWatchlist() { + return em.changesInWatchlist(); + } + + } diff --git a/src/main/java/model/api/ManagerListener.java b/src/main/java/model/api/ManagerListener.java index 1735bb25..22bc3661 100644 --- a/src/main/java/model/api/ManagerListener.java +++ b/src/main/java/model/api/ManagerListener.java @@ -4,14 +4,15 @@ /** * AsyncManager listener - * @author Julien Prudhomme * * @param + * @author Julien Prudhomme */ public interface ManagerListener { - /** - * method called when one or more results are available. - * @param results - */ - public void notify(Collection results); + /** + * method called when one or more results are available. + * + * @param results + */ + public void notify(Collection results); } diff --git a/src/main/java/model/api/MessageSyncManager.java b/src/main/java/model/api/MessageSyncManager.java index 90f615f0..7c2e0396 100644 --- a/src/main/java/model/api/MessageSyncManager.java +++ b/src/main/java/model/api/MessageSyncManager.java @@ -4,5 +4,5 @@ public interface MessageSyncManager extends SyncManager { - + } diff --git a/src/main/java/model/api/Status.java b/src/main/java/model/api/Status.java index a976be90..18d23736 100644 --- a/src/main/java/model/api/Status.java +++ b/src/main/java/model/api/Status.java @@ -1,9 +1,9 @@ package model.api; public enum Status { - NOWHERE, - SIGNING, - FINALIZED, - CANCELLED, - RESOLVING, + NOWHERE, + SIGNING, + FINALIZED, + CANCELLED, + RESOLVING, } diff --git a/src/main/java/model/api/SyncManager.java b/src/main/java/model/api/SyncManager.java index b2688722..6d433701 100644 --- a/src/main/java/model/api/SyncManager.java +++ b/src/main/java/model/api/SyncManager.java @@ -1,107 +1,120 @@ package model.api; +import java.util.ArrayList; import java.util.Collection; -import java.util.Hashtable; - -import javax.persistence.EntityManager; /** * General interface for entity managers - * @author Julien Prudhomme * * @param class' entity + * @author Julien Prudhomme */ public interface SyncManager { - /** - * Initialise the entity manager with the unit name - * @param unitName unit (entity) name for persistance. See persistance.xml in META-INF - */ - public void initialisation(String unitName, Class c); - - /** - * Find one entity with its Id - * @param id entity id - * @return An instance of the entity or null. - */ - public Entity findOneById(String id); - - /** - * Return the whole collection of stored entities - * @return A collection of entities - */ - public Collection findAll(); - - /** - * Find all entry with corresponding att/value - * @param attribute - * @param value - * @return - */ - public Collection findAllByAttribute(String attribute, String value); - - /** - * Return an object corresponding to the attribute/value - * @param attribute - * @param value - * @return - */ - public Entity findOneByAttribute(String attribute, String value); - - /** - * Persist(insert) this instance to the database - * @param entity - * @return true if done - */ - public boolean persist(Entity entity); - - /** - * Begin the transaction - * @return true if done - */ - public boolean begin(); - - /** - * end (commit) the transaction - * @return true if done - */ - public boolean end(); - - /** - * Checks if all the managed entities (i.e. the "watchlist") are valid entities. - * If the validation at persist() call is activated (default) this will always return true. - * Go to bin/META-INF/persistence.xml to change validation mode - * @return true if all the managed entities are valid, false otherwise - */ - public boolean check(); - - /** - * Checks if a given entity is in 'managed' state for this manager. - * @param entity - * @return true if entity is managed, false otherwise - */ - public boolean contains(Entity entity); - - /** - * Gives a list of the entities currently in 'managed' state. - */ - public Collection watchlist(); - - /** - * Returns a list of changed entities that currently in "managed" state. - */ - public Collection changesInWatchlist(); - - /** - * Remove an entity from the DB - * @param an entity - * @return True if the entity has been removed, false otherwise - */ - public boolean remove(Entity entity); - - /** - * Close the entity manager - * @return false if the operation fails (exceptions are logged) - */ - public boolean close(); - + /** + * Initialise the entity manager with the unit name + * + * @param unitName unit (entity) name for persistance. See persistance.xml in META-INF + */ + public void initialisation(String unitName, Class c); + + /** + * Find one entity with its Id + * + * @param id entity id + * @return An instance of the entity or null. + */ + public Entity findOneById(String id); + + + /**TODO**/ + public Collection findAllById(ArrayList id); + /** + * Return the whole collection of stored entities + * + * @return A collection of entities + */ + public Collection findAll(); + + /** + * Find all entry with corresponding att/value + * + * @param attribute + * @param value + * @return + */ + public Collection findAllByAttribute(String attribute, String value); + + /** + * Return an object corresponding to the attribute/value + * + * @param attribute + * @param value + * @return + */ + public Entity findOneByAttribute(String attribute, String value); + + /** + * Persist(insert) this instance to the database + * + * @param entity + * @return true if done + */ + public boolean persist(Entity entity); + + /** + * Begin the transaction + * + * @return true if done + */ + public boolean begin(); + + /** + * end (commit) the transaction + * + * @return true if done + */ + public boolean end(); + + /** + * Checks if all the managed entities (i.e. the "watchlist") are valid entities. + * If the validation at persist() call is activated (default) this will always return true. + * Go to bin/META-INF/persistence.xml to change validation mode + * + * @return true if all the managed entities are valid, false otherwise + */ + public boolean check(); + + /** + * Checks if a given entity is in 'managed' state for this manager. + * + * @param entity + * @return true if entity is managed, false otherwise + */ + public boolean contains(Entity entity); + + /** + * Gives a list of the entities currently in 'managed' state. + */ + public Collection watchlist(); + + /** + * Returns a list of changed entities that currently in "managed" state. + */ + public Collection changesInWatchlist(); + + /** + * Remove an entity from the DB + * + * @param an entity + * @return True if the entity has been removed, false otherwise + */ + public boolean remove(Entity entity); + + /** + * Close the entity manager + * + * @return false if the operation fails (exceptions are logged) + */ + public boolean close(); + } diff --git a/src/main/java/model/api/UserSyncManager.java b/src/main/java/model/api/UserSyncManager.java index 124380df..54add22c 100644 --- a/src/main/java/model/api/UserSyncManager.java +++ b/src/main/java/model/api/UserSyncManager.java @@ -2,12 +2,13 @@ import model.entity.User; -public interface UserSyncManager extends SyncManager{ - /** - * Get an user according to username/password combo - * @param username - * @param password - * @return an User or null if no user/pass match - */ - public User getUser(String username, String password); +public interface UserSyncManager extends SyncManager { + /** + * Get an user according to username/password combo + * + * @param username + * @param password + * @return an User or null if no user/pass match + */ + public User getUser(String username, String password); } diff --git a/src/main/java/model/api/Wish.java b/src/main/java/model/api/Wish.java index 36c0f18a..24465cb7 100644 --- a/src/main/java/model/api/Wish.java +++ b/src/main/java/model/api/Wish.java @@ -1,7 +1,7 @@ package model.api; public enum Wish { - NEUTRAL, - ACCEPT, - REFUSE + NEUTRAL, + ACCEPT, + REFUSE } diff --git a/src/main/java/model/entity/ContractEntity.java b/src/main/java/model/entity/ContractEntity.java index a7d2c602..cbac7338 100644 --- a/src/main/java/model/entity/ContractEntity.java +++ b/src/main/java/model/entity/ContractEntity.java @@ -32,29 +32,45 @@ public class ContractEntity { @Id @GeneratedValue(generator="uuid") private String id; - + @XmlElement(name="userid") @NotNull private String userid; - + @XmlElement(name="createdAt") @NotNull @Temporal(TemporalType.TIMESTAMP) @JsonFormat(shape=JsonFormat.Shape.STRING, pattern="dd-MM-yyyy") private Date createdAt; - + @XmlElement(name="title") private String title; - + @XmlElement(name="clauses") private ArrayList clauses; - + + //clause Canceled + @XmlElement(name="termination") + private ArrayList termination; + + //clause Excution Modality + @XmlElement(name="implementing") + private ArrayList implementing; + + // clause Exchange + + @XmlElement(name="exchange") + @Lob + @JsonFormat(shape=JsonFormat.Shape.STRING) + private ArrayList exchange; + // Id of the parties + @XmlElement(name="parties") @Lob @JsonFormat(shape=JsonFormat.Shape.STRING) private ArrayList parties; - + // Maps the id with the name @XmlElement(name="partiesNames") @Lob @@ -82,25 +98,25 @@ public class ContractEntity { @XmlElement(name="establisherType") @JsonFormat(shape=JsonFormat.Shape.STRING) private EstablisherType establisherType; - + @XmlElement(name="establishementData") @Lob @JsonFormat(shape=JsonFormat.Shape.STRING) private String establishementData; - - + + public String getId() { return id; } - - + + public String getUserid() { return userid; } public void setUserid(String u) { this.userid=u; } - + public String getTitle() { return title; @@ -108,73 +124,87 @@ public String getTitle() { public void setTitle(String t) { this.title=t; } - - + + public void setCreatedAt(Date date) { createdAt = date; } - + public Date getCreatedAt() { return createdAt; } - + public ArrayList getClauses() { return clauses; } public void setClauses(ArrayList c) { this.clauses=c; } - - + + public ArrayList getTermination() {return termination; } + public void setTermination(ArrayList termination) { + this.termination=termination; + } + + public ArrayList getImplementing() {return implementing; } + public void setImplementing(ArrayList implementing) { + this.implementing=implementing; + } + + public ArrayList getExchange() {return exchange; } + public void setExchange(ArrayList e) { + this.exchange=e; + } + public ArrayList getParties() { return parties; } public void setParties(ArrayList p) { this.parties=p; } - - + + public HashMap getPartiesNames() { return partiesNames; } public void setPartiesNames(HashMap n) { this.partiesNames=n; } - - + + public Wish getWish() { return wish; } public void setWish(Wish w) { this.wish=w; } - - + + public Status getStatus() { return status; } public void setStatus(Status s) { this.status=s; } - - + + public HashMap getSignatures() { return signatures; } public void setSignatures(HashMap s) { this.signatures=s; } - - + + public EstablisherType getEstablisherType() { return establisherType; } public void setEstablisherType(EstablisherType e) { this.establisherType = e; } - - + + public String getEstablishementData() { return establishementData; } diff --git a/src/main/java/model/entity/ElGamalKey.java b/src/main/java/model/entity/ElGamalKey.java index 917b2c6b..68f323e1 100644 --- a/src/main/java/model/entity/ElGamalKey.java +++ b/src/main/java/model/entity/ElGamalKey.java @@ -1,133 +1,136 @@ package model.entity; -import java.io.Serializable; -import java.math.BigInteger; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import crypt.api.key.AsymKey; import javax.persistence.Entity; import javax.validation.constraints.NotNull; import javax.xml.bind.annotation.XmlElement; +import java.io.Serializable; +import java.math.BigInteger; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; //import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +@Entity +public class ElGamalKey implements AsymKey, Serializable { -import com.fasterxml.jackson.databind.annotation.JsonSerialize; + /** + * + */ + private static final long serialVersionUID = -6531626985325397645L; -import crypt.api.key.AsymKey; + @NotNull + @XmlElement(name = "privateKey") + @JsonSerialize(using = controller.tools.BigIntegerSerializer.class) + @JsonDeserialize(using = controller.tools.BigIntegerDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JsonIgnore + private BigInteger privateKey; -@Entity -public class ElGamalKey implements AsymKey, Serializable{ - - /** - * - */ - private static final long serialVersionUID = -6531626985325397645L; - - @NotNull - @XmlElement(name="privateKey") - @JsonSerialize(using=controller.tools.BigIntegerSerializer.class) - @JsonDeserialize(using=controller.tools.BigIntegerDeserializer.class) - @JsonFormat(shape=JsonFormat.Shape.STRING) - @JsonIgnore - private BigInteger privateKey; - - @NotNull - @XmlElement(name="publicKey") - @JsonSerialize(using=controller.tools.BigIntegerSerializer.class) - @JsonDeserialize(using=controller.tools.BigIntegerDeserializer.class) - @JsonFormat(shape=JsonFormat.Shape.STRING) - private BigInteger publicKey; - - @NotNull - @XmlElement(name="p") - @JsonSerialize(using=controller.tools.BigIntegerSerializer.class) - @JsonDeserialize(using=controller.tools.BigIntegerDeserializer.class) - @JsonFormat(shape=JsonFormat.Shape.STRING) - private BigInteger p; - - @NotNull - @XmlElement(name="g") - @JsonSerialize(using=controller.tools.BigIntegerSerializer.class) - @JsonDeserialize(using=controller.tools.BigIntegerDeserializer.class) - @JsonFormat(shape=JsonFormat.Shape.STRING) - private BigInteger g; - - @Override - public BigInteger getPublicKey() { - return publicKey; - } - @Override - public BigInteger getPrivateKey() { - return privateKey; - } - @Override - public BigInteger getParam(String param) { - switch(param) { - case "p": return p; - case "g": return g; - default: throw new RuntimeException("param " + param + " undefined"); - } - } - @Override - public void setPublicKey(BigInteger pbk) { - publicKey = pbk; - } - @Override - public void setPrivateKey(BigInteger pk) { - privateKey = pk; - } - - public void setG(BigInteger g) { - this.g = g; - } - - public void setP(BigInteger p) { - this.p = p; - } - - public BigInteger getP() { - return p; - } - - public BigInteger getG() { - return g; - } - - @Override - public String toString(){ - StringBuffer s = new StringBuffer(); - s.append("<" + this.getClass().getSimpleName().toLowerCase() + ">"); - s.append("" + this.getG() + ""); - s.append("

" + this.getP() + "

"); - s.append("" + this.getPublicKey() + ""); - s.append(""); - return s.toString(); - } - - @Override - public boolean equals(Object o){ - if (! (o instanceof ElGamalKey)) - return false; - ElGamalKey k = (ElGamalKey) o; - return k.getP().equals(this.getP()) - && k.getG().equals(this.getG()) - && k.getPublicKey().equals(this.getPublicKey()); - } - - @Override - public int hashCode(){ - return this.getPublicKey().hashCode(); - } - - public ElGamalKey copy(){ - ElGamalKey copy = new ElGamalKey(); - copy.setPrivateKey(this.getPrivateKey()); - copy.setPublicKey(this.getPublicKey()); - copy.setG(this.getG()); - copy.setP(this.getP()); - return copy; - } + @NotNull + @XmlElement(name = "publicKey") + @JsonSerialize(using = controller.tools.BigIntegerSerializer.class) + @JsonDeserialize(using = controller.tools.BigIntegerDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigInteger publicKey; + + @NotNull + @XmlElement(name = "p") + @JsonSerialize(using = controller.tools.BigIntegerSerializer.class) + @JsonDeserialize(using = controller.tools.BigIntegerDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigInteger p; + + @NotNull + @XmlElement(name = "g") + @JsonSerialize(using = controller.tools.BigIntegerSerializer.class) + @JsonDeserialize(using = controller.tools.BigIntegerDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigInteger g; + + @Override + public BigInteger getPublicKey() { + return publicKey; + } + + @Override + public void setPublicKey(BigInteger pbk) { + publicKey = pbk; + } + + @Override + public BigInteger getPrivateKey() { + return privateKey; + } + + @Override + public void setPrivateKey(BigInteger pk) { + privateKey = pk; + } + + @Override + public BigInteger getParam(String param) { + switch (param) { + case "p": + return p; + case "g": + return g; + default: + throw new RuntimeException("param " + param + " undefined"); + } + } + + public BigInteger getP() { + return p; + } + + public void setP(BigInteger p) { + this.p = p; + } + + public BigInteger getG() { + return g; + } + + public void setG(BigInteger g) { + this.g = g; + } + + @Override + public String toString() { + StringBuffer s = new StringBuffer(); + s.append("<" + this.getClass().getSimpleName().toLowerCase() + ">"); + s.append("" + this.getG() + ""); + s.append("

" + this.getP() + "

"); + s.append("" + this.getPublicKey() + ""); + s.append(""); + return s.toString(); + } + + @Override + public boolean equals(Object o) { + if (!(o instanceof ElGamalKey)) + return false; + ElGamalKey k = (ElGamalKey) o; + return k.getP().equals(this.getP()) + && k.getG().equals(this.getG()) + && k.getPublicKey().equals(this.getPublicKey()); + } + + @Override + public int hashCode() { + return this.getPublicKey().hashCode(); + } + + public ElGamalKey copy() { + ElGamalKey copy = new ElGamalKey(); + copy.setPrivateKey(this.getPrivateKey()); + copy.setPublicKey(this.getPublicKey()); + copy.setG(this.getG()); + copy.setP(this.getP()); + return copy; + } } diff --git a/src/main/java/model/entity/ElGamalSignEntity.java b/src/main/java/model/entity/ElGamalSignEntity.java index ba848b06..96a8d973 100644 --- a/src/main/java/model/entity/ElGamalSignEntity.java +++ b/src/main/java/model/entity/ElGamalSignEntity.java @@ -1,61 +1,62 @@ package model.entity; -import java.io.Serializable; -import java.math.BigInteger; - -import javax.persistence.Entity; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlElement; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; - import crypt.api.signatures.ParamName; import crypt.base.BaseSignature; +import javax.persistence.Entity; +import javax.validation.constraints.NotNull; +import javax.xml.bind.annotation.XmlElement; +import java.io.Serializable; +import java.math.BigInteger; + @Entity -public class ElGamalSignEntity extends BaseSignature implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = 7049291865908224884L; - - @ParamName("r") - @XmlElement(name="r") - @NotNull - @JsonSerialize(using=controller.tools.BigIntegerSerializer.class) - @JsonDeserialize(using=controller.tools.BigIntegerDeserializer.class) - @JsonFormat(shape=JsonFormat.Shape.STRING) - private BigInteger r; - - @ParamName("s") - @XmlElement(name="s") - @NotNull - @JsonSerialize(using=controller.tools.BigIntegerSerializer.class) - @JsonDeserialize(using=controller.tools.BigIntegerDeserializer.class) - @JsonFormat(shape=JsonFormat.Shape.STRING) - private BigInteger s; - - public BigInteger getR() { - return r; - } - public void setR(BigInteger r) { - this.r = r; - } - public BigInteger getS() { - return s; - } - public void setS(BigInteger s) { - this.s = s; - } - - /* - * Help for debug only - */ - @Override - public String toString() { - return "ElGamalSignEntity [r=" + r + ", s=" + s + "]"; - } +public class ElGamalSignEntity extends BaseSignature implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 7049291865908224884L; + + @ParamName("r") + @XmlElement(name = "r") + @NotNull + @JsonSerialize(using = controller.tools.BigIntegerSerializer.class) + @JsonDeserialize(using = controller.tools.BigIntegerDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigInteger r; + + @ParamName("s") + @XmlElement(name = "s") + @NotNull + @JsonSerialize(using = controller.tools.BigIntegerSerializer.class) + @JsonDeserialize(using = controller.tools.BigIntegerDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigInteger s; + + public BigInteger getR() { + return r; + } + + public void setR(BigInteger r) { + this.r = r; + } + + public BigInteger getS() { + return s; + } + + public void setS(BigInteger s) { + this.s = s; + } + + /* + * Help for debug only + */ + @Override + public String toString() { + return "ElGamalSignEntity [r=" + r + ", s=" + s + "]"; + } } diff --git a/src/main/java/model/entity/Item.java b/src/main/java/model/entity/Item.java index 122b9c27..ad0493a9 100644 --- a/src/main/java/model/entity/Item.java +++ b/src/main/java/model/entity/Item.java @@ -1,136 +1,129 @@ package model.entity; -import java.math.BigInteger; -import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import crypt.annotations.CryptSigneAnnotation; +import org.eclipse.persistence.annotations.UuidGenerator; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import javax.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; - -import org.eclipse.persistence.annotations.UuidGenerator; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - -import crypt.annotations.CryptSigneAnnotation; +import java.math.BigInteger; +import java.util.Date; @XmlRootElement @Entity public class Item { - - @XmlElement(name="id") - @UuidGenerator(name="uuid") + + @XmlElement(name = "id") + @UuidGenerator(name = "uuid") @Id - @GeneratedValue(generator="uuid") - private String id; - - @XmlElement(name="title") - @NotNull - @Size(min = 3, max = 255) - private String title; - - @Lob - @XmlElement(name="description") - @NotNull - @Size(min = 3, max = 2000) - private String description; - - @XmlElement(name="createdAt") - @NotNull - @Temporal(TemporalType.TIMESTAMP) - @JsonFormat(shape=JsonFormat.Shape.STRING, pattern="dd-MM-yyyy") - private Date createdAt; - - @XmlElement(name="pbkey") - @NotNull - @Lob - @JsonSerialize(using=controller.tools.BigIntegerSerializer.class) - @JsonDeserialize(using=controller.tools.BigIntegerDeserializer.class) - @JsonFormat(shape=JsonFormat.Shape.STRING) - private BigInteger pbkey; - - @XmlElement(name="username") - @NotNull - @Size(min = 2, max = 255) - private String username; - - @XmlElement(name="userid") - @NotNull - private String userid; - - - @CryptSigneAnnotation(signeWithFields={"title","description","createdAt","username","userid","pbkey"},checkByKey="pbkey") //,ownerAttribute="userid") - @XmlElement(name="signature") - //@NotNull - private ElGamalSignEntity signature; - - public String getId() { - return id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public void setCreatedAt(Date date) { - createdAt = date; - } - - public Date getCreatedAt() { - return createdAt; - } - - public BigInteger getPbkey() { - return pbkey; - } - - public void setPbkey(BigInteger pbkey) { - this.pbkey = pbkey; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getUserid() { - return userid; - } - - public void setUserid(String userid) { - this.userid = userid; - } - - - public ElGamalSignEntity getSignature() { - return signature; - } - - public void setSignature(ElGamalSignEntity signature) { - this.signature = signature; - } + @GeneratedValue(generator = "uuid") + private String id; + + @XmlElement(name = "title") + @NotNull + @Size(min = 3, max = 255) + private String title; + + @Lob + @XmlElement(name = "description") + @NotNull + @Size(min = 3, max = 2000) + private String description; + + @XmlElement(name = "createdAt") + @NotNull + @Temporal(TemporalType.TIMESTAMP) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd-MM-yyyy") + private Date createdAt; + + @XmlElement(name = "pbkey") + @NotNull + @Lob + @JsonSerialize(using = controller.tools.BigIntegerSerializer.class) + @JsonDeserialize(using = controller.tools.BigIntegerDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigInteger pbkey; + + @XmlElement(name = "username") + @NotNull + @Size(min = 2, max = 255) + private String username; + + @XmlElement(name = "userid") + @NotNull + private String userid; + + + @CryptSigneAnnotation(signeWithFields = {"title", "description", "createdAt", "username", "userid", "pbkey"}, checkByKey = "pbkey") + //,ownerAttribute="userid") + @XmlElement(name = "signature") + //@NotNull + private ElGamalSignEntity signature; + + public String getId() { + return id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date date) { + createdAt = date; + } + + public BigInteger getPbkey() { + return pbkey; + } + + public void setPbkey(BigInteger pbkey) { + this.pbkey = pbkey; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getUserid() { + return userid; + } + + public void setUserid(String userid) { + this.userid = userid; + } + + + public ElGamalSignEntity getSignature() { + return signature; + } + + public void setSignature(ElGamalSignEntity signature) { + this.signature = signature; + } } diff --git a/src/main/java/model/entity/LoginToken.java b/src/main/java/model/entity/LoginToken.java index 8da797b1..82c1e6a3 100644 --- a/src/main/java/model/entity/LoginToken.java +++ b/src/main/java/model/entity/LoginToken.java @@ -4,19 +4,22 @@ @Entity public class LoginToken { - private String token; - private String userid; - - public String getToken() { - return token; - } - public void setToken(String token) { - this.token = token; - } - public String getUserid() { - return userid; - } - public void setUserid(String l) { - this.userid = l; - } + private String token; + private String userid; + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public String getUserid() { + return userid; + } + + public void setUserid(String l) { + this.userid = l; + } } diff --git a/src/main/java/model/entity/Message.java b/src/main/java/model/entity/Message.java index cef1a9cf..eb43857e 100644 --- a/src/main/java/model/entity/Message.java +++ b/src/main/java/model/entity/Message.java @@ -1,159 +1,215 @@ package model.entity; -import static javax.persistence.EnumType.STRING; - -import java.math.BigInteger; -import java.util.Date; - -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import org.eclipse.persistence.annotations.UuidGenerator; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import crypt.annotations.CryptCryptAnnotation; import crypt.annotations.CryptSigneAnnotation; +import org.eclipse.persistence.annotations.UuidGenerator; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.math.BigInteger; +import java.util.*; + +import static javax.persistence.EnumType.STRING; @XmlRootElement @Entity public class Message { - @XmlElement(name="id") - @UuidGenerator(name="uuid") - @Id - @GeneratedValue(generator="uuid") - private String id; - - @XmlElement(name="sendingDate") - @NotNull - @Temporal(TemporalType.TIMESTAMP) - @JsonFormat(shape=JsonFormat.Shape.STRING, pattern="dd-MM-yyyy HH:mm:ss") - private Date sendingDate; - - @XmlElement(name="senderId") - @NotNull - @Size(min = 1, max = 128) - private String senderId; - - @XmlElement(name="senderName") - @NotNull - @Size(min = 1, max = 128) - private String senderName; - - @XmlElement(name="receiverId") - @NotNull - private String receiverId; - - @XmlElement(name="receiverName") - @NotNull - private String receiverName; - - @CryptCryptAnnotation(isCryptBySecondKey=true,secondKey="pbkey") - @Lob - @XmlElement(name="messageContent") - @NotNull - @Size(min = 1, max = 4096) - private String messageContent; - - public static enum ReceptionStatus {DRAFT, SENT, RECEIVED} - @XmlElement(name="status") - @Enumerated(STRING) - public ReceptionStatus status = ReceptionStatus.DRAFT; - - - @XmlElement(name="pbkey") - @NotNull - @Lob - @JsonSerialize(using=controller.tools.BigIntegerSerializer.class) - @JsonDeserialize(using=controller.tools.BigIntegerDeserializer.class) - @JsonFormat(shape=JsonFormat.Shape.STRING) - private BigInteger pbkey; - - @Lob - @CryptSigneAnnotation(signeWithFields={"sendingDate","senderId","senderName","receiverId","receiverName","pbkey","messageContent"},checkByKey="pbkey") //,ownerAttribute="senderId") - @XmlElement(name="signature") - //@NotNull - private ElGamalSignEntity signature; - - - public String getId(){ - return this.id; - } - - public void setSendingDate(Date date){ - this.sendingDate = date; - } - - public Date getSendingDate(){ - return this.sendingDate; - } - - public void setSender(String id, String name){ - this.senderId = id; - this.senderName = name; - } - - public String getSenderId(){ - return this.senderId; - } - public String getSenderName(){ - return this.senderName; - } - - public void setReceiver(String id, String name){ - this.receiverId = id; - this.receiverName = name; - } - - public String getReceiverId(){ - return this.receiverId; - } - - public String getReceiverName(){ - return this.receiverName; - } - - - public void setMessageContent(String content){ - this.messageContent = content; - } - - public String getMessageContent(){ - return this.messageContent; - } - - public void setStatus(ReceptionStatus status){ - this.status = status; - } - - public ReceptionStatus getStatus(){ - return this.status; - } - - - public BigInteger getPbkey() { - return pbkey; - } - - public void setPbkey(BigInteger pbkey) { - this.pbkey = pbkey; - } - - public ElGamalSignEntity getSignature() { - return signature; - } - - public void setSignature(ElGamalSignEntity signature) { - this.signature = signature; - } + + + @XmlElement(name = "chatGroup") + private Boolean chatGroup; + + + @XmlElement(name = "contractID") + private String contractID; + + + @XmlElement(name = "chatID") + private String chatID; + + + @XmlElement(name = "status") + @Enumerated(STRING) + public ReceptionStatus status = ReceptionStatus.DRAFT; + @XmlElement(name = "id") + @UuidGenerator(name = "uuid") + @Id + @GeneratedValue(generator = "uuid") + private String id; + @XmlElement(name = "sendingDate") + @NotNull + @Temporal(TemporalType.TIMESTAMP) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd-MM-yyyy HH:mm:ss") + private Date sendingDate; + @XmlElement(name = "senderId") + @NotNull + @Size(min = 1, max = 128) + private String senderId; + @XmlElement(name = "senderName") + @NotNull + @Size(min = 1, max = 128) + private String senderName; + + @XmlElement(name = "receiverId") + @NotNull + private String receiverId; + + @XmlElement(name = "receiverName") + @NotNull + private String receiverName; + + @XmlElement(name = "receivers") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private ArrayList receivers; + + + + @XmlElement(name = "receiversNicks") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private ArrayList receiversNicks; + + + + @CryptCryptAnnotation(isCryptBySecondKey = true, secondKey = "pbkey") + @Lob + @XmlElement(name = "messageContent") + @NotNull + @Size(min = 1, max = 4096) + private String messageContent; + @XmlElement(name = "pbkey") + @NotNull + @Lob + @JsonSerialize(using = controller.tools.BigIntegerSerializer.class) + @JsonDeserialize(using = controller.tools.BigIntegerDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigInteger pbkey; + @Lob + @CryptSigneAnnotation(signeWithFields = {"sendingDate", "senderId", "senderName", "receiverId", "receiverName", "pbkey", "messageContent"}, checkByKey = "pbkey") + //,ownerAttribute="senderId") + @XmlElement(name = "signature") + //@NotNull + private ElGamalSignEntity signature; + + + public ArrayList getReceiversNicks() { + return receiversNicks; + } + + public void setReceiversNicks(ArrayList receiversNicks) { + this.receiversNicks = receiversNicks; + } + + public String getChatID(){ + return this.chatID; + } + + public void setChatID(String uuid){ + this.chatID = uuid; + } + + public String getContractID(){ + return this.contractID; + } + + public Boolean getChatGroup() { + return this.chatGroup; + } + + public void setChatGroup(Boolean chatGroup) { + this.chatGroup = chatGroup; + } + + public void setContractID(String contractID) { + this.contractID = contractID; + } + + public String getId() { + return this.id; + } + + public Date getSendingDate() { + return this.sendingDate; + } + + public void setReceiver(String id, String name) { + this.receiverId = id; + this.receiverName = name; + } + + public String getReceiverId() { + return this.receiverId; + } + + public String getReceiverName() { + return this.receiverName; + } + + public void setSendingDate(Date date) { + this.sendingDate = date; + } + + public void setSender(String id, String name) { + this.senderId = id; + this.senderName = name; + } + + public String getSenderId() { + return this.senderId; + } + + public String getSenderName() { + return this.senderName; + } + + public void setReceivers(ArrayList receivers) { + this.receivers = receivers; + } + + public ArrayList getReceivers() { + return this.receivers; + } + + public String getMessageContent() { + return this.messageContent; + } + + public void setMessageContent(String content) { + this.messageContent = content; + } + + public ReceptionStatus getStatus() { + return this.status; + } + + public void setStatus(ReceptionStatus status) { + this.status = status; + } + + public BigInteger getPbkey() { + return pbkey; + } + + public void setPbkey(BigInteger pbkey) { + this.pbkey = pbkey; + } + + public ElGamalSignEntity getSignature() { + return signature; + } + + public void setSignature(ElGamalSignEntity signature) { + this.signature = signature; + } + + + + public static enum ReceptionStatus {DRAFT, SENT, RECEIVED} } diff --git a/src/main/java/model/entity/User.java b/src/main/java/model/entity/User.java index edbd9014..5de94c80 100644 --- a/src/main/java/model/entity/User.java +++ b/src/main/java/model/entity/User.java @@ -1,117 +1,109 @@ package model.entity; -import java.util.Date; +import crypt.annotations.CryptHashAnnotation; +import crypt.annotations.CryptSigneAnnotation; +import org.eclipse.persistence.annotations.UuidGenerator; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import javax.persistence.*; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; import javax.validation.constraints.Size; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; - -import org.eclipse.persistence.annotations.UuidGenerator; - -import crypt.annotations.CryptHashAnnotation; -import crypt.annotations.CryptSigneAnnotation; -import crypt.annotations.CryptCryptAnnotation; +import java.util.Date; @XmlRootElement @Entity -@Table(name="\"User\"") +@Table(name = "\"User\"") public class User { - - @XmlElement(name="id") - @UuidGenerator(name="uuid") + + @XmlElement(name = "id") + @UuidGenerator(name = "uuid") @Id - @GeneratedValue(generator="uuid") - private String id; - - @XmlElement(name="nick") - @NotNull - @Size(min = 3, max = 64) - private String nick; - - @XmlElement(name="salt") - @NotNull - private byte[] salt; - - @CryptHashAnnotation - @XmlElement(name="passwordHash") - @NotNull - private byte[] passwordHash; - - @Temporal(TemporalType.TIME) - @NotNull - @XmlElement(name="createdAt") - private Date createdAt; - - @NotNull - @XmlElement(name="keys") - private ElGamalKey keys; - - @CryptSigneAnnotation(signeWithFields={"nick","createdAt","passwordHash","salt"},checkByKey="keys") //,ownerAttribute="id") - @XmlElement(name="signature") + @GeneratedValue(generator = "uuid") + private String id; + + @XmlElement(name = "nick") + @NotNull + @Size(min = 3, max = 64) + private String nick; + + @XmlElement(name = "salt") + @NotNull + private byte[] salt; + + @CryptHashAnnotation + @XmlElement(name = "passwordHash") + @NotNull + private byte[] passwordHash; + + @Temporal(TemporalType.TIME) + @NotNull + @XmlElement(name = "createdAt") + private Date createdAt; + + @NotNull + @XmlElement(name = "keys") + private ElGamalKey keys; + + @CryptSigneAnnotation(signeWithFields = {"nick", "createdAt", "passwordHash", "salt"}, checkByKey = "keys") + //,ownerAttribute="id") + @XmlElement(name = "signature") // @NotNull - private ElGamalSignEntity signature; - - public void setId(String id) { - this.id = id; - } - - public String getId() { - return id; - } - - public void setNick(String nick) { - this.nick = nick; - } - - public String getNick() { - return nick; - } - - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } - - public Date getCreatedAt() { - return createdAt; - } - - public void setSalt(byte[] salt) { - this.salt = salt; - } - - public byte[] getSalt() { - return salt; - } - - public void setPasswordHash(byte[] passwordHash) { - this.passwordHash = passwordHash; - } - - public byte[] getPasswordHash() { - return passwordHash; - } - - public ElGamalKey getKey() { - return keys; - } - - public void setKey(ElGamalKey key) { - this.keys = key; - } - - public ElGamalSignEntity getSignature() { - return signature; - } - - public void setSignature(ElGamalSignEntity signature) { - this.signature = signature; - } + private ElGamalSignEntity signature; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNick() { + return nick; + } + + public void setNick(String nick) { + this.nick = nick; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public byte[] getSalt() { + return salt; + } + + public void setSalt(byte[] salt) { + this.salt = salt; + } + + public byte[] getPasswordHash() { + return passwordHash; + } + + public void setPasswordHash(byte[] passwordHash) { + this.passwordHash = passwordHash; + } + + public ElGamalKey getKey() { + return keys; + } + + public void setKey(ElGamalKey key) { + this.keys = key; + } + + public ElGamalSignEntity getSignature() { + return signature; + } + + public void setSignature(ElGamalSignEntity signature) { + this.signature = signature; + } } diff --git a/src/main/java/model/entity/sigma/And.java b/src/main/java/model/entity/sigma/And.java index f489b689..c6a587a0 100644 --- a/src/main/java/model/entity/sigma/And.java +++ b/src/main/java/model/entity/sigma/And.java @@ -14,114 +14,104 @@ You should have received a copy of the GNU Lesser General Public License along with SXP. If not, see . */ package model.entity.sigma; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlElement; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; - import controller.tools.MapResponseKeyDeserializer; import controller.tools.MapSerializer; import model.entity.ElGamalKey; import protocol.impl.sigma.Receiver; +import javax.xml.bind.annotation.XmlElement; +import java.util.HashMap; +import java.util.Map; + /** * This class is for the composability of reponses. This is clause And. - * @author sarah * + * @author sarah */ public class And { - - private Receiver receiver; - - - @XmlElement(name="resEncrypt") - public ResEncrypt resEncrypt; - - @XmlElement(name="rK") + @XmlElement(name = "resEncrypt") + public ResEncrypt resEncrypt; + @XmlElement(name = "rK") @JsonSerialize(using = MapSerializer.class) @JsonDeserialize(using = MapResponseKeyDeserializer.class) - public Map rK = new HashMap <>(); - - - @XmlElement(name="responses") - public Responses[] responses; - - - /** - * Transform the And into a String - * @return the string corresponding to the AND - */ - @Override - public String toString(){ - StringBuffer andS = new StringBuffer(); - andS.append("<" + this.getClass().getSimpleName().toLowerCase() + ">"); - andS.append(this.resEncrypt.toString()); - andS.append("" + rK.toString() + ""); - andS.append(""); - for (Responses r : responses){ - andS.append(r.toString()); - } - andS.append(""); - andS.append(""); - return andS.toString(); - } - - /** - * Constructor - * Needed to transform json String to Java - */ - public And(){ - this.receiver = new Receiver(); - } - /** - * Constructor - * @param receiver - * @param rK (HashMap for each response associate with Keys) - * @param resEncrypt - * @param responses (all responses to need verify) - */ - - public And (HashMap rK, ResEncrypt resEncrypt, Responses ... responses) - { - this.receiver = new Receiver(); - this.rK = rK; - this.resEncrypt= resEncrypt; - this.responses = responses; - } - - /** - * Verify if set of responses is true or not for the receiver - * @param or - * if "or" the receiver doesn't verify if challenge it's good - * @return boolean - */ - public Boolean Verifies(Boolean or) - { - for(Responses res : responses) - { - if (!or) - { - if (!receiver.VerifiesChallenge(res.getChallenge(), res.getMasks(), resEncrypt.getM())) - { - System.out.println("the challenge is fabricated"); - return false; - } - } - - if (!receiver.Verifies(res, rK.get(res), resEncrypt)) - { - System.out.println("There is a problem in signatures"); - return false; - } - } + public Map rK = new HashMap<>(); + @XmlElement(name = "responses") + public Responses[] responses; + private Receiver receiver; + + + /** + * Constructor + * Needed to transform json String to Java + */ + public And() { + this.receiver = new Receiver(); + } + + /** + * Constructor + * + * @param receiver + * @param rK (HashMap for each response associate with Keys) + * @param resEncrypt + * @param responses (all responses to need verify) + */ + + public And(HashMap rK, ResEncrypt resEncrypt, Responses... responses) { + this.receiver = new Receiver(); + this.rK = rK; + this.resEncrypt = resEncrypt; + this.responses = responses; + } + + /** + * Transform the And into a String + * + * @return the string corresponding to the AND + */ + @Override + public String toString() { + StringBuffer andS = new StringBuffer(); + andS.append("<" + this.getClass().getSimpleName().toLowerCase() + ">"); + andS.append(this.resEncrypt.toString()); + andS.append("" + rK.toString() + ""); + andS.append(""); + for (Responses r : responses) { + andS.append(r.toString()); + } + andS.append(""); + andS.append(""); + return andS.toString(); + } + + /** + * Verify if set of responses is true or not for the receiver + * + * @param or if "or" the receiver doesn't verify if challenge it's good + * @return boolean + */ + public Boolean Verifies(Boolean or) { + for (Responses res : responses) { + if (!or) { + if (!receiver.VerifiesChallenge(res.getChallenge(), res.getMasks(), resEncrypt.getM())) { + System.out.println("the challenge is fabricated"); + return false; + } + } + + if (!receiver.Verifies(res, rK.get(res), resEncrypt)) { + System.out.println("There is a problem in signatures"); + return false; + } + } // System.out.println("And signature verified"); - return true; - - } + return true; + + } } diff --git a/src/main/java/model/entity/sigma/Masks.java b/src/main/java/model/entity/sigma/Masks.java index adef8fde..02a0d893 100644 --- a/src/main/java/model/entity/sigma/Masks.java +++ b/src/main/java/model/entity/sigma/Masks.java @@ -15,100 +15,99 @@ If not, see . */ package model.entity.sigma; -import java.math.BigInteger; - import javax.xml.bind.annotation.XmlElement; +import java.math.BigInteger; /** * Mask to send in the protocolSigma + * * @author sarah bourkis * @author Julien Prudhomme - * */ public class Masks { - - @XmlElement(name="a") - private BigInteger a; - - @XmlElement(name="aBis") - private BigInteger aBis; - - /** - * Constructor - * @param a - * @param aBis - */ - public Masks (BigInteger a, BigInteger aBis) - { - this.setA(a); - this.setaBis(aBis); - } - - public Masks (){ - } - - - public BigInteger getA() { - return a; - } - - public void setA(BigInteger a) { - this.a = a; - } - - public BigInteger getaBis() { - return aBis; - } - - public void setaBis(BigInteger aBis) { - this.aBis = aBis; - } - - @Override - public String toString() { - StringBuffer s = new StringBuffer(); - s.append("<" + this.getClass().getSimpleName().toLowerCase() + ">"); - s.append("" + a.toString(16) + ""); - if (aBis==null) { - s.append(""); - } else { - s.append("" + aBis.toString(16) + ""); - } - s.append(""); - return s.toString(); - } - - /** - * Override equals to be able to compare masks - */ - @Override - public boolean equals(Object o){ - if (!(o instanceof Masks)){ - return false; - } - Masks m = (Masks) o; - boolean okA =a.toString().equals(m.getA().toString()); - boolean okaBis; - if (aBis == null && m.getaBis()==null){ - okaBis = true; - }else if (aBis==null || m.getaBis()==null){ - return false; - }else{ - okaBis = aBis.toString().equals(m.getaBis().toString()); - } - return okA && okaBis; - } - - /** - * Override hashcode to be able to compare masks - */ - @Override - public int hashCode(){ - if (aBis==null){ - return a.intValue(); - } - return a.intValue() + aBis.intValue(); - } + + @XmlElement(name = "a") + private BigInteger a; + + @XmlElement(name = "aBis") + private BigInteger aBis; + + /** + * Constructor + * + * @param a + * @param aBis + */ + public Masks(BigInteger a, BigInteger aBis) { + this.setA(a); + this.setaBis(aBis); + } + + public Masks() { + } + + + public BigInteger getA() { + return a; + } + + public void setA(BigInteger a) { + this.a = a; + } + + public BigInteger getaBis() { + return aBis; + } + + public void setaBis(BigInteger aBis) { + this.aBis = aBis; + } + + @Override + public String toString() { + StringBuffer s = new StringBuffer(); + s.append("<" + this.getClass().getSimpleName().toLowerCase() + ">"); + s.append("" + a.toString(16) + ""); + if (aBis == null) { + s.append(""); + } else { + s.append("" + aBis.toString(16) + ""); + } + s.append(""); + return s.toString(); + } + + /** + * Override equals to be able to compare masks + */ + @Override + public boolean equals(Object o) { + if (!(o instanceof Masks)) { + return false; + } + Masks m = (Masks) o; + boolean okA = a.toString().equals(m.getA().toString()); + boolean okaBis; + if (aBis == null && m.getaBis() == null) { + okaBis = true; + } else if (aBis == null || m.getaBis() == null) { + return false; + } else { + okaBis = aBis.toString().equals(m.getaBis().toString()); + } + return okA && okaBis; + } + + /** + * Override hashcode to be able to compare masks + */ + @Override + public int hashCode() { + if (aBis == null) { + return a.intValue(); + } + return a.intValue() + aBis.intValue(); + } } diff --git a/src/main/java/model/entity/sigma/Or.java b/src/main/java/model/entity/sigma/Or.java index 162d2a66..4c5363ac 100644 --- a/src/main/java/model/entity/sigma/Or.java +++ b/src/main/java/model/entity/sigma/Or.java @@ -14,93 +14,83 @@ You should have received a copy of the GNU Lesser General Public License along with SXP. If not, see . */ package model.entity.sigma; -import java.math.BigInteger; -import java.util.ArrayList; - -import javax.xml.bind.annotation.XmlElement; import com.fasterxml.jackson.annotation.JsonIgnore; - import protocol.impl.sigma.Receiver; +import javax.xml.bind.annotation.XmlElement; +import java.math.BigInteger; +import java.util.ArrayList; + /** * This class is for the composability. This is clause Or. - * @author sarah * + * @author sarah */ public class Or { - private Receiver receiver; - - @XmlElement(name="contract") - public byte[] contract; - - @XmlElement(name="ands") - public And[] ands; - - - @JsonIgnore - public ArrayList challenges = new ArrayList (); - + @XmlElement(name = "contract") + public byte[] contract; + @XmlElement(name = "ands") + public And[] ands; + @JsonIgnore + public ArrayList challenges = new ArrayList(); + private Receiver receiver; + @XmlElement(name = "a") + private BigInteger a; - @XmlElement(name="a") - private BigInteger a; - - /** - * Constructor - * @param receiver - * @param a (a mask) - * @param ands (set of clause and to need to verify) - */ - public Or (BigInteger a, And ... ands) - { - this.receiver = new Receiver(); - this.ands = ands; - this.setA(a); - } - - /** - * Constructor - * Useful to get back a json String into an Or object - */ - public Or(){ - receiver = new Receiver(); - } - - /** - * Verifies if clauses in the Or is true or not for the receiver - * @param resEncrypt - * @return Boolean - */ - public Boolean Verifies(byte[] m) - { - challenges.clear(); - for(And and : ands) - { - if (!receiver.Verifies(and, true)) - { - System.out.println("Signature problem"); - return false; - } - for (Responses res : and.responses){ - challenges.add(res.getChallenge()); - } - } - if (!receiver.VerifiesChallenges(m, getA(), challenges)) - { + /** + * Constructor + * + * @param receiver + * @param a (a mask) + * @param ands (set of clause and to need to verify) + */ + public Or(BigInteger a, And... ands) { + this.receiver = new Receiver(); + this.ands = ands; + this.setA(a); + } + + /** + * Constructor + * Useful to get back a json String into an Or object + */ + public Or() { + receiver = new Receiver(); + } + + /** + * Verifies if clauses in the Or is true or not for the receiver + * + * @param resEncrypt + * @return Boolean + */ + public Boolean Verifies(byte[] m) { + challenges.clear(); + for (And and : ands) { + if (!receiver.Verifies(and, true)) { + System.out.println("Signature problem"); + return false; + } + for (Responses res : and.responses) { + challenges.add(res.getChallenge()); + } + } + if (!receiver.VerifiesChallenges(m, getA(), challenges)) { // System.out.println("Problem in challenges"); - return false; - } - challenges=new ArrayList (); - return true; - - } + return false; + } + challenges = new ArrayList(); + return true; + + } - public BigInteger getA() { - return a; - } + public BigInteger getA() { + return a; + } - public void setA(BigInteger a) { - this.a = a; - } + public void setA(BigInteger a) { + this.a = a; + } } diff --git a/src/main/java/model/entity/sigma/ResEncrypt.java b/src/main/java/model/entity/sigma/ResEncrypt.java index becf32c4..4e1ac589 100644 --- a/src/main/java/model/entity/sigma/ResEncrypt.java +++ b/src/main/java/model/entity/sigma/ResEncrypt.java @@ -16,88 +16,87 @@ package model.entity.sigma; -import java.math.BigInteger; - import javax.xml.bind.annotation.XmlElement; +import java.math.BigInteger; /** - * It's the result of encryption - * @author sarah + * It's the result of encryption * + * @author sarah */ public class ResEncrypt { - @XmlElement(name="u") - private BigInteger u; - - @XmlElement(name="v") - private BigInteger v; - - @XmlElement(name="M") - private byte[] M; - - /** - * Constructor - * @param u - * @param v - * @param M - */ - public ResEncrypt(BigInteger u, BigInteger v, byte[] M) - { - super(); - this.setU(u); - this.setV(v); - this.setM(M); - } - - /** - * Constructor - * used to transform json string to java - */ - public ResEncrypt(){ - super(); - } - - /** - * Create a toString method - * @return : representative Sting of the instance - */ - @Override - public String toString(){ - StringBuffer s = new StringBuffer(); - s.append("<" + this.getClass().getSimpleName().toLowerCase() + ">"); - s.append("" + u.toString() + ""); - s.append("" + v.toString() + ""); - s.append("" + M.toString() + ""); - s.append(""); - return s.toString(); - } - - public BigInteger getU() { - return u; - } - - public void setU(BigInteger u) { - this.u = u; - } - - public BigInteger getV() { - return v; - } - - public void setV(BigInteger v) { - this.v = v; - } - - public byte[] getM() { - return M; - } - - public void setM(byte[] m) { - M = m; - } - - - + @XmlElement(name = "u") + private BigInteger u; + + @XmlElement(name = "v") + private BigInteger v; + + @XmlElement(name = "M") + private byte[] M; + + /** + * Constructor + * + * @param u + * @param v + * @param M + */ + public ResEncrypt(BigInteger u, BigInteger v, byte[] M) { + super(); + this.setU(u); + this.setV(v); + this.setM(M); + } + + /** + * Constructor + * used to transform json string to java + */ + public ResEncrypt() { + super(); + } + + /** + * Create a toString method + * + * @return : representative Sting of the instance + */ + @Override + public String toString() { + StringBuffer s = new StringBuffer(); + s.append("<" + this.getClass().getSimpleName().toLowerCase() + ">"); + s.append("" + u.toString() + ""); + s.append("" + v.toString() + ""); + s.append("" + M.toString() + ""); + s.append(""); + return s.toString(); + } + + public BigInteger getU() { + return u; + } + + public void setU(BigInteger u) { + this.u = u; + } + + public BigInteger getV() { + return v; + } + + public void setV(BigInteger v) { + this.v = v; + } + + public byte[] getM() { + return M; + } + + public void setM(byte[] m) { + M = m; + } + + } diff --git a/src/main/java/model/entity/sigma/Responses.java b/src/main/java/model/entity/sigma/Responses.java index c52c7ca0..bda1a07d 100644 --- a/src/main/java/model/entity/sigma/Responses.java +++ b/src/main/java/model/entity/sigma/Responses.java @@ -15,122 +15,124 @@ If not, see . */ package model.entity.sigma; -import java.math.BigInteger; - -import javax.xml.bind.annotation.XmlElement; - import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; +import model.entity.ElGamalKey; + +import javax.xml.bind.annotation.XmlElement; +import java.math.BigInteger; /** * It's response to need to send in the protocol * it's abstract, for the different response in the protocol + * * @author Sarah Boukris * @author Julien Prudhomme */ -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonSubTypes.Type; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; - -import model.entity.ElGamalKey; - @JsonTypeInfo(use = Id.CLASS, - include = JsonTypeInfo.As.PROPERTY, - property = "type") + include = JsonTypeInfo.As.PROPERTY, + property = "type") @JsonSubTypes({ - @Type(value = ResponsesCCD.class), - @Type(value = ResponsesCCE.class), - @Type(value = ResponsesSchnorr.class), + @Type(value = ResponsesCCD.class), + @Type(value = ResponsesCCE.class), + @Type(value = ResponsesSchnorr.class), }) -public abstract class Responses{ - - - @XmlElement(name="masks") - private Masks masks; - - @XmlElement(name="challenge") - private BigInteger challenge; - - @XmlElement(name="response") - private BigInteger response; - - public Responses(Masks masks, BigInteger challenge, BigInteger response) - { - super(); - this.setMasks(masks); - this.setChallenge(challenge); - this.setResponse(response); - } - - /** - * Constructor - * used to transform json string to java - */ - public Responses(){ - super(); - } +public abstract class Responses { + + + @XmlElement(name = "masks") + private Masks masks; + + @XmlElement(name = "challenge") + private BigInteger challenge; + + @XmlElement(name = "response") + private BigInteger response; + + public Responses(Masks masks, BigInteger challenge, BigInteger response) { + super(); + this.setMasks(masks); + this.setChallenge(challenge); + this.setResponse(response); + } + + /** + * Constructor + * used to transform json string to java + */ + public Responses() { + super(); + } @JsonGetter("masks") - public Masks getMasks() { - return masks; - } + public Masks getMasks() { + return masks; + } @JsonSetter("masks") - public void setMasks(Masks masks) { - this.masks = masks; - } - public BigInteger getResponse() { - return response; - } - public void setResponse(BigInteger response) { - this.response = response; - } - public BigInteger getChallenge() { - return challenge; - } - public void setChallenge(BigInteger challenge) { - this.challenge = challenge; - } - - /** - * Verify the response according to the type of response - * @param Keys - * @param res - * @return - */ - public abstract Boolean Verifies(ElGamalKey Keys, ResEncrypt res); - - /** - * override equals to be able to compare two responses - */ - @Override - public boolean equals(Object o){ - if (!(o instanceof Responses)) - return false; - - Responses r = (Responses) o; - if (r.getMasks() == null - || r.getResponse() == null - || r.getChallenge() == null) - return false; - - boolean okM = r.getMasks().equals(this.getMasks()); - boolean okRes = r.getResponse().toString().equals(this.getResponse().toString()); - boolean okCha = r.getChallenge().toString().equals(this.getChallenge().toString()); - return okM && okRes && okCha; - } - - /** - * override hashCode to be able to compare 2 responses - */ - @Override - public int hashCode(){ - int hashM = masks.hashCode(); - int hashR = response.intValue(); - int hashC = response.intValue(); - return hashM + hashR + hashC; - } - + public void setMasks(Masks masks) { + this.masks = masks; + } + + public BigInteger getResponse() { + return response; + } + + public void setResponse(BigInteger response) { + this.response = response; + } + + public BigInteger getChallenge() { + return challenge; + } + + public void setChallenge(BigInteger challenge) { + this.challenge = challenge; + } + + /** + * Verify the response according to the type of response + * + * @param Keys + * @param res + * @return + */ + public abstract Boolean Verifies(ElGamalKey Keys, ResEncrypt res); + + /** + * override equals to be able to compare two responses + */ + @Override + public boolean equals(Object o) { + if (!(o instanceof Responses)) + return false; + + Responses r = (Responses) o; + if (r.getMasks() == null + || r.getResponse() == null + || r.getChallenge() == null) + return false; + + boolean okM = r.getMasks().equals(this.getMasks()); + boolean okRes = r.getResponse().toString().equals(this.getResponse().toString()); + boolean okCha = r.getChallenge().toString().equals(this.getChallenge().toString()); + return okM && okRes && okCha; + } + + /** + * override hashCode to be able to compare 2 responses + */ + @Override + public int hashCode() { + int hashM = masks.hashCode(); + int hashR = response.intValue(); + int hashC = response.intValue(); + return hashM + hashR + hashC; + } + } diff --git a/src/main/java/model/entity/sigma/ResponsesCCD.java b/src/main/java/model/entity/sigma/ResponsesCCD.java index 6a448497..9603a0fa 100644 --- a/src/main/java/model/entity/sigma/ResponsesCCD.java +++ b/src/main/java/model/entity/sigma/ResponsesCCD.java @@ -14,79 +14,78 @@ You should have received a copy of the GNU Lesser General Public License along with SXP. If not, see . */ package model.entity.sigma; -import java.math.BigInteger; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - import model.entity.ElGamalKey; import protocol.impl.sigma.Trent; +import java.math.BigInteger; + /** * The CCD response - * @author sarah * + * @author sarah */ public class ResponsesCCD extends Responses { - /** - * Constructor - * @param mask - * @param challenge - * @param response - */ - @JsonCreator - public ResponsesCCD(@JsonProperty("masks") Masks mask, @JsonProperty("challenge") BigInteger challenge,@JsonProperty("response") BigInteger response) { - super(mask, challenge, response); - } - - public ResponsesCCD(){ - super(); - } - - @Override - /** - * Extends Responses - * Verify if the CCD response is good or not - */ - public Boolean Verifies( ElGamalKey tKeys, ResEncrypt res) { - if (!tKeys.getG().modPow(getResponse(), tKeys.getP()).equals(((tKeys.getPublicKey().modPow(getChallenge(), tKeys.getP())).multiply(getMasks().getA())).mod(tKeys.getP()))) - { - return false; - } - BigInteger M = new BigInteger (res.getM()); - if(!res.getU().modPow(getResponse(),tKeys.getP() ).equals(res.getV().divide(M).modPow(getChallenge(), tKeys.getP()).multiply(getMasks().getaBis()).mod(tKeys.getP()))) - { - return false; - } - - return true; - } - - public Boolean Verifies(ElGamalKey tKeys, ResEncrypt res, byte[] message){ - Trent t = new Trent(tKeys); - BigInteger c = t.SendChallenge(this.getMasks(), message); - if (!(this.getChallenge().equals(c))) - return false; - return this.Verifies(tKeys, res); - } - - - /** - * Override equals to be able to compare two responses - */ - @Override - public boolean equals(Object o){ - return super.equals(o); - } - - /** - * Override hashCode to be able to compare two responses - */ - @Override - public int hashCode(){ - int hashS = super.hashCode(); - return hashS + 2; - } + /** + * Constructor + * + * @param mask + * @param challenge + * @param response + */ + @JsonCreator + public ResponsesCCD(@JsonProperty("masks") Masks mask, @JsonProperty("challenge") BigInteger challenge, @JsonProperty("response") BigInteger response) { + super(mask, challenge, response); + } + + public ResponsesCCD() { + super(); + } + + @Override + /** + * Extends Responses + * Verify if the CCD response is good or not + */ + public Boolean Verifies(ElGamalKey tKeys, ResEncrypt res) { + if (!tKeys.getG().modPow(getResponse(), tKeys.getP()).equals(((tKeys.getPublicKey().modPow(getChallenge(), tKeys.getP())).multiply(getMasks().getA())).mod(tKeys.getP()))) { + return false; + } + BigInteger M = new BigInteger(res.getM()); + if (!res.getU().modPow(getResponse(), tKeys.getP()).equals(res.getV().divide(M).modPow(getChallenge(), tKeys.getP()).multiply(getMasks().getaBis()).mod(tKeys.getP()))) { + return false; + } + + return true; + } + + public Boolean Verifies(ElGamalKey tKeys, ResEncrypt res, byte[] message) { + Trent t = new Trent(tKeys); + BigInteger c = t.SendChallenge(this.getMasks(), message); + if (!(this.getChallenge().equals(c))) + return false; + return this.Verifies(tKeys, res); + } + + + /** + * Override equals to be able to compare two responses + */ + @Override + public boolean equals(Object o) { + return super.equals(o); + } + + /** + * Override hashCode to be able to compare two responses + */ + @Override + public int hashCode() { + int hashS = super.hashCode(); + return hashS + 2; + } } diff --git a/src/main/java/model/entity/sigma/ResponsesCCE.java b/src/main/java/model/entity/sigma/ResponsesCCE.java index 70e5440e..9ca7c504 100644 --- a/src/main/java/model/entity/sigma/ResponsesCCE.java +++ b/src/main/java/model/entity/sigma/ResponsesCCE.java @@ -14,91 +14,89 @@ You should have received a copy of the GNU Lesser General Public License along with SXP. If not, see . */ package model.entity.sigma; -import java.math.BigInteger; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - import model.entity.ElGamalKey; +import java.math.BigInteger; + /** * The CCE response - * @author sarah * + * @author sarah */ public class ResponsesCCE extends Responses { - /** - * Constructor - * @param mask - * @param challenge - * @param response - */ - @JsonCreator - public ResponsesCCE(@JsonProperty("masks") Masks mask, - @JsonProperty("challenge") BigInteger challenge, - @JsonProperty("response") BigInteger response) { - super(mask, challenge, response); - } - - public ResponsesCCE(){ - super(); - } - - - - @Override - /** - * Extends Responses - * Verify if the CCE response is good or not - */ - public Boolean Verifies(ElGamalKey tKeys, ResEncrypt res) { - - BigInteger gPowr = tKeys.getG().modPow(getResponse(),tKeys.getP()); - BigInteger uPowc = res.getU().modPow(getChallenge(), tKeys.getP()); - BigInteger uPowcMulta = uPowc.multiply(getMasks().getA()).mod(tKeys.getP()); - - if(!gPowr.equals(uPowcMulta)) - { - System.out.println("CCE verification failed on test 1"); - return false; - } - - BigInteger M = new BigInteger (res.getM()); - BigInteger pubPowr = tKeys.getPublicKey().modPow(getResponse(), tKeys.getP()); - - BigInteger vdivM = res.getV().divide(M); - BigInteger vDivMPowc = vdivM.modPow(getChallenge(), tKeys.getP()); - BigInteger vDivMPowcMultaBis = (vDivMPowc.multiply((getMasks().getaBis()))).mod(tKeys.getP()); - - if (!pubPowr.equals(vDivMPowcMultaBis)) - { - System.out.println("CCE verification failed on test 2"); - return false; - } - - return true; - } - - /** - * Override equals to be able to compare two responses - */ - @Override - public boolean equals(Object o){ - if (! (o instanceof ResponsesCCE)){ - return false; - } - return super.equals(o); - } - - /** - * Override hashCode to be able to compare two responses - */ - @Override - public int hashCode(){ - int hashS = super.hashCode(); - return hashS + 3; - } + /** + * Constructor + * + * @param mask + * @param challenge + * @param response + */ + @JsonCreator + public ResponsesCCE(@JsonProperty("masks") Masks mask, + @JsonProperty("challenge") BigInteger challenge, + @JsonProperty("response") BigInteger response) { + super(mask, challenge, response); + } + + public ResponsesCCE() { + super(); + } + + + @Override + /** + * Extends Responses + * Verify if the CCE response is good or not + */ + public Boolean Verifies(ElGamalKey tKeys, ResEncrypt res) { + + BigInteger gPowr = tKeys.getG().modPow(getResponse(), tKeys.getP()); + BigInteger uPowc = res.getU().modPow(getChallenge(), tKeys.getP()); + BigInteger uPowcMulta = uPowc.multiply(getMasks().getA()).mod(tKeys.getP()); + + if (!gPowr.equals(uPowcMulta)) { + System.out.println("CCE verification failed on test 1"); + return false; + } + + BigInteger M = new BigInteger(res.getM()); + BigInteger pubPowr = tKeys.getPublicKey().modPow(getResponse(), tKeys.getP()); + + BigInteger vdivM = res.getV().divide(M); + BigInteger vDivMPowc = vdivM.modPow(getChallenge(), tKeys.getP()); + BigInteger vDivMPowcMultaBis = (vDivMPowc.multiply((getMasks().getaBis()))).mod(tKeys.getP()); + + if (!pubPowr.equals(vDivMPowcMultaBis)) { + System.out.println("CCE verification failed on test 2"); + return false; + } + + return true; + } + + /** + * Override equals to be able to compare two responses + */ + @Override + public boolean equals(Object o) { + if (!(o instanceof ResponsesCCE)) { + return false; + } + return super.equals(o); + } + + /** + * Override hashCode to be able to compare two responses + */ + @Override + public int hashCode() { + int hashS = super.hashCode(); + return hashS + 3; + } } diff --git a/src/main/java/model/entity/sigma/ResponsesSchnorr.java b/src/main/java/model/entity/sigma/ResponsesSchnorr.java index 06f5cf18..eae98412 100644 --- a/src/main/java/model/entity/sigma/ResponsesSchnorr.java +++ b/src/main/java/model/entity/sigma/ResponsesSchnorr.java @@ -14,64 +14,65 @@ You should have received a copy of the GNU Lesser General Public License along with SXP. If not, see . */ package model.entity.sigma; -import java.math.BigInteger; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - import model.entity.ElGamalKey; +import java.math.BigInteger; + /** * The Schnorr response - * @author sarah * + * @author sarah */ -public class ResponsesSchnorr extends Responses{ +public class ResponsesSchnorr extends Responses { + + /** + * Constructor + * + * @param mask + * @param challenge + * @param response + */ + @JsonCreator + public ResponsesSchnorr(@JsonProperty("masks") Masks mask, @JsonProperty("challenge") BigInteger challenge, @JsonProperty("response") BigInteger response) { + super(mask, challenge, response); + } + + public ResponsesSchnorr() { + super(); + } + + /** + * Extends Responses + * Verify if the Schnorr response is good or not + */ + + @Override + public Boolean Verifies(ElGamalKey tKeys, ResEncrypt res) { + return (tKeys.getG().modPow(getResponse(), tKeys.getP()).equals(((tKeys.getPublicKey().modPow(getChallenge(), tKeys.getP())).multiply(getMasks().getA())).mod(tKeys.getP()))); + } + - /** - * Constructor - * @param mask - * @param challenge - * @param response - */ - @JsonCreator - public ResponsesSchnorr(@JsonProperty("masks") Masks mask, @JsonProperty("challenge") BigInteger challenge,@JsonProperty("response") BigInteger response) { - super(mask, challenge, response); - } - - public ResponsesSchnorr(){ - super(); - } - - /** - * Extends Responses - * Verify if the Schnorr response is good or not - */ - - @Override - public Boolean Verifies(ElGamalKey tKeys, ResEncrypt res) { - return (tKeys.getG().modPow(getResponse(), tKeys.getP()).equals(((tKeys.getPublicKey().modPow(getChallenge(), tKeys.getP())).multiply(getMasks().getA())).mod(tKeys.getP()))); - } - - - /** - * Override equals to be able to compare two responses - */ - @Override - public boolean equals(Object o){ - if (! (o instanceof ResponsesSchnorr)){ - return false; - } - return super.equals(o); - } + /** + * Override equals to be able to compare two responses + */ + @Override + public boolean equals(Object o) { + if (!(o instanceof ResponsesSchnorr)) { + return false; + } + return super.equals(o); + } - /** - * Override hashCode to be able to compare two responses - */ - @Override - public int hashCode(){ - int hashS = super.hashCode(); - return hashS + 1; - } + /** + * Override hashCode to be able to compare two responses + */ + @Override + public int hashCode() { + int hashS = super.hashCode(); + return hashS + 1; + } } diff --git a/src/main/java/model/entity/sigma/SigmaSignature.java b/src/main/java/model/entity/sigma/SigmaSignature.java index b41f59a7..1c181201 100644 --- a/src/main/java/model/entity/sigma/SigmaSignature.java +++ b/src/main/java/model/entity/sigma/SigmaSignature.java @@ -1,70 +1,76 @@ package model.entity.sigma; -import javax.xml.bind.annotation.XmlElement; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import crypt.base.BaseSignature; import model.entity.ElGamalKey; +import javax.xml.bind.annotation.XmlElement; + /** * @author Nathanaël Eon */ -public class SigmaSignature extends BaseSignature{ +public class SigmaSignature extends BaseSignature { + + /* Element that compose a Sigma Signature */ + @XmlElement(name = "pcs") + private Or pcs; + @XmlElement(name = "rpcs") + private Responses rpcs; + + @XmlElement(name = "trentK") + private ElGamalKey trentK; + + /* Simple constructor for Json */ + public SigmaSignature() { + } + + /* Comstructor with params */ + public SigmaSignature(Or p, Responses r) { + this.pcs = p; + this.rpcs = r; + } + + public Or getPcs() { + return pcs; + } + + public void setPcs(Or p) { + this.pcs = p; + } + + public Responses getRpcs() { + return rpcs; + } + + public void setRpcs(Responses r) { + this.rpcs = r; + } + + public ElGamalKey getTrentK() { + return trentK; + } + + public void setTrenK(ElGamalKey t) { + this.trentK = t; + } + + @Override + public String getParam(String p) { + if (p.equals("pcs")) { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + return json.toJson(pcs, true); + } else if (p.equals("rpcs")) { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + return json.toJson(rpcs); + } else if (p.equals("trentK")) { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + return json.toJson(trentK); + } + return null; + } - /* Element that compose a Sigma Signature */ - @XmlElement(name="pcs") - private Or pcs; - @XmlElement(name="rpcs") - private Responses rpcs; - - @XmlElement(name="trentK") - private ElGamalKey trentK; - - /* Simple constructor for Json */ - public SigmaSignature(){} - - /* Comstructor with params */ - public SigmaSignature(Or p, Responses r){ - this.pcs = p; - this.rpcs = r; - } - - public Or getPcs(){ - return pcs; - } - public void setPcs(Or p){ - this.pcs = p; - } - - public Responses getRpcs(){ - return rpcs; - } - public void setRpcs(Responses r){ - this.rpcs = r; - } - - public ElGamalKey getTrentK(){ - return trentK; - } - public void setTrenK(ElGamalKey t){ - this.trentK = t; - } - - @Override - public String getParam(String p){ - if (p.equals("pcs")){ - JsonTools json = new JsonTools<>(new TypeReference(){}); - return json.toJson(pcs, true); - }else if (p.equals("rpcs")){ - JsonTools json = new JsonTools<>(new TypeReference(){}); - return json.toJson(rpcs); - }else if (p.equals("trentK")){ - JsonTools json = new JsonTools<>(new TypeReference(){}); - return json.toJson(trentK); - } - return null; - } - } diff --git a/src/main/java/model/factory/ManagerFactory.java b/src/main/java/model/factory/ManagerFactory.java index ed2384b3..e9336a58 100644 --- a/src/main/java/model/factory/ManagerFactory.java +++ b/src/main/java/model/factory/ManagerFactory.java @@ -1,14 +1,6 @@ package model.factory; -import controller.managers.CryptoItemManagerDecorator; -import controller.managers.CryptoMessageManagerDecorator; -import controller.managers.CryptoUserManagerDecorator; -import controller.managers.NetworkContractManagerDecorator; -import controller.managers.NetworkItemManagerDecorator; -import controller.managers.NetworkMessageManagerDecorator; -import controller.managers.NetworkUserManagerDecorator; -import controller.managers.ResilienceContractManagerDecorator; -import controller.managers.ResilienceItemManagerDecorator; +import controller.managers.*; import model.api.ItemSyncManager; import model.api.Manager; import model.api.UserSyncManager; @@ -24,95 +16,92 @@ import network.api.Peer; public class ManagerFactory { - + /* ============================= ITEM ============================= */ - - //TODO : to be deleted - //old version, the new version is createCryptoNetworkResilianceItemManager(...) - public static Manager createNetworkResilianceItemManager(Peer peer, String who) { - ManagerAdapter adapter = new ManagerAdapter(new ItemSyncManagerImpl()); - NetworkItemManagerDecorator networkD = new NetworkItemManagerDecorator(adapter, peer, who); - ResilienceItemManagerDecorator resiNetworkD = new ResilienceItemManagerDecorator(networkD, peer); - return resiNetworkD; - } - - public static Manager createCryptoNetworkResilianceItemManager(Peer peer, String who,User user) { - ManagerAdapter adapter = new ManagerAdapter(new ItemSyncManagerImpl()); - NetworkItemManagerDecorator networkD = new NetworkItemManagerDecorator(adapter, peer, who); - CryptoItemManagerDecorator cyptoItemDecorator = new CryptoItemManagerDecorator(networkD, user); - ResilienceItemManagerDecorator resiNetworkD = new ResilienceItemManagerDecorator(cyptoItemDecorator, peer); - return resiNetworkD; - } - - public static Manager createCryptoNetworkResilianceItemManager(ItemSyncManager em,Peer peer, String who,User user) { - ManagerAdapter adapter = new ManagerAdapter(em); - NetworkItemManagerDecorator networkD = new NetworkItemManagerDecorator(adapter, peer, who); - CryptoItemManagerDecorator cyptoItemDecorator = new CryptoItemManagerDecorator(networkD, user); - ResilienceItemManagerDecorator resiNetworkD = new ResilienceItemManagerDecorator(cyptoItemDecorator, peer); - return resiNetworkD; - } - - /* ============================= USER ============================= */ - - public static Manager createCryptoUserManager(User user) { - ManagerAdapter adapter = new ManagerAdapter(new UserSyncManagerImpl()); - CryptoUserManagerDecorator hasherDecoratorUser = new CryptoUserManagerDecorator(adapter,user); - return hasherDecoratorUser; - } - - public static Manager createCryptoUserManager(UserSyncManager em,User user) { - CryptoUserManagerDecorator hasherDecoratorUser = new CryptoUserManagerDecorator(new ManagerAdapter(em),user); - return hasherDecoratorUser; - } - - public static Manager createCryptoNetworkUserManager(Peer peer, String who,User user) { - ManagerAdapter adapter = new ManagerAdapter(new UserSyncManagerImpl()); - NetworkUserManagerDecorator networkD = new NetworkUserManagerDecorator(adapter, peer, who); - CryptoUserManagerDecorator cyptoDecorator = new CryptoUserManagerDecorator(networkD, user); - return cyptoDecorator; - } - - public static Manager createNetworkResilianceUserManager(Peer peer, String who){ - ManagerAdapter adapter = new ManagerAdapter(new UserSyncManagerImpl()); - NetworkUserManagerDecorator networkD = new NetworkUserManagerDecorator(adapter, peer, who); - //TODO : resilience - //ResilienceUserManagerDecorator resiNetworkD = new ResilienceUserManagerDecorator(networkD, peer); - return networkD; - } + + //TODO : to be deleted + //old version, the new version is createCryptoNetworkResilianceItemManager(...) + public static Manager createNetworkResilianceItemManager(Peer peer, String who) { + ManagerAdapter adapter = new ManagerAdapter(new ItemSyncManagerImpl()); + NetworkItemManagerDecorator networkD = new NetworkItemManagerDecorator(adapter, peer, who); + ResilienceItemManagerDecorator resiNetworkD = new ResilienceItemManagerDecorator(networkD, peer); + return resiNetworkD; + } + + public static Manager createCryptoNetworkResilianceItemManager(Peer peer, String who, User user) { + ManagerAdapter adapter = new ManagerAdapter(new ItemSyncManagerImpl()); + NetworkItemManagerDecorator networkD = new NetworkItemManagerDecorator(adapter, peer, who); + CryptoItemManagerDecorator cyptoItemDecorator = new CryptoItemManagerDecorator(networkD, user); + ResilienceItemManagerDecorator resiNetworkD = new ResilienceItemManagerDecorator(cyptoItemDecorator, peer); + return resiNetworkD; + } + + public static Manager createCryptoNetworkResilianceItemManager(ItemSyncManager em, Peer peer, String who, User user) { + ManagerAdapter adapter = new ManagerAdapter(em); + NetworkItemManagerDecorator networkD = new NetworkItemManagerDecorator(adapter, peer, who); + CryptoItemManagerDecorator cyptoItemDecorator = new CryptoItemManagerDecorator(networkD, user); + ResilienceItemManagerDecorator resiNetworkD = new ResilienceItemManagerDecorator(cyptoItemDecorator, peer); + return resiNetworkD; + } + + /* ============================= USER ============================= */ + + public static Manager createCryptoUserManager(User user) { + ManagerAdapter adapter = new ManagerAdapter(new UserSyncManagerImpl()); + CryptoUserManagerDecorator hasherDecoratorUser = new CryptoUserManagerDecorator(adapter, user); + return hasherDecoratorUser; + } + + public static Manager createCryptoUserManager(UserSyncManager em, User user) { + CryptoUserManagerDecorator hasherDecoratorUser = new CryptoUserManagerDecorator(new ManagerAdapter(em), user); + return hasherDecoratorUser; + } + + public static Manager createCryptoNetworkUserManager(Peer peer, String who, User user) { + ManagerAdapter adapter = new ManagerAdapter(new UserSyncManagerImpl()); + NetworkUserManagerDecorator networkD = new NetworkUserManagerDecorator(adapter, peer, who); + CryptoUserManagerDecorator cyptoDecorator = new CryptoUserManagerDecorator(networkD, user); + return cyptoDecorator; + } + + public static Manager createNetworkResilianceUserManager(Peer peer, String who) { + ManagerAdapter adapter = new ManagerAdapter(new UserSyncManagerImpl()); + NetworkUserManagerDecorator networkD = new NetworkUserManagerDecorator(adapter, peer, who); + //TODO : resilience + //ResilienceUserManagerDecorator resiNetworkD = new ResilienceUserManagerDecorator(networkD, peer); + return networkD; + } /* ============================= MESSAGE ============================= */ - - public static Manager createCryptoMessageManager(User receiver,User sender) { - - ManagerAdapter adapter = new ManagerAdapter(new MessageSyncManagerImpl()); - CryptoMessageManagerDecorator messageManagerDecorator = new CryptoMessageManagerDecorator(adapter,null,receiver,sender); - - return messageManagerDecorator; - } - - public static Manager createNetworkResilianceMessageManager(Peer peer, String who,User receiver,User sender){ - ManagerAdapter adapter = new ManagerAdapter(new MessageSyncManagerImpl()); - NetworkMessageManagerDecorator networkD = new NetworkMessageManagerDecorator(adapter, peer, who); - CryptoMessageManagerDecorator messageManagerDecorator = new CryptoMessageManagerDecorator(networkD,who,receiver,sender); - //TODO : resilience - //ResilienceUserManagerDecorator resiNetworkD = new ResilienceUserManagerDecorator(networkD, peer); - return messageManagerDecorator; - } + + public static Manager createCryptoMessageManager(User receiver, User sender) { + + ManagerAdapter adapter = new ManagerAdapter(new MessageSyncManagerImpl()); + CryptoMessageManagerDecorator messageManagerDecorator = new CryptoMessageManagerDecorator(adapter, null, receiver, sender); + + return messageManagerDecorator; + } + + public static Manager createNetworkResilianceMessageManager(Peer peer, String who, User receiver, User sender) { + ManagerAdapter adapter = new ManagerAdapter(new MessageSyncManagerImpl()); + NetworkMessageManagerDecorator networkD = new NetworkMessageManagerDecorator(adapter, peer, who); + CryptoMessageManagerDecorator messageManagerDecorator = new CryptoMessageManagerDecorator(networkD, who, receiver, sender); + //TODO : resilience + //ResilienceUserManagerDecorator resiNetworkD = new ResilienceUserManagerDecorator(networkD, peer); + return messageManagerDecorator; + } /* ============================= CONTRACT ============================= */ - - public static Manager createNetworkResilianceContractManager(Peer peer, String who) { - ManagerAdapter adapter = new ManagerAdapter(new ContractSyncManagerImpl()); - NetworkContractManagerDecorator networkD = new NetworkContractManagerDecorator (adapter, peer, who); - ResilienceContractManagerDecorator resiNetworkD = new ResilienceContractManagerDecorator(networkD, peer); - return resiNetworkD; - } - - - - - + + public static Manager createNetworkResilianceContractManager(Peer peer, String who) { + ManagerAdapter adapter = new ManagerAdapter(new ContractSyncManagerImpl()); + NetworkContractManagerDecorator networkD = new NetworkContractManagerDecorator(adapter, peer, who); + ResilienceContractManagerDecorator resiNetworkD = new ResilienceContractManagerDecorator(networkD, peer); + return resiNetworkD; + } + + } diff --git a/src/main/java/model/factory/SyncManagerFactory.java b/src/main/java/model/factory/SyncManagerFactory.java index 5f0f5bb4..0bf5351a 100644 --- a/src/main/java/model/factory/SyncManagerFactory.java +++ b/src/main/java/model/factory/SyncManagerFactory.java @@ -10,16 +10,19 @@ import model.syncManager.UserSyncManagerImpl; public class SyncManagerFactory { - public static UserSyncManager createUserSyncManager() { - return new UserSyncManagerImpl(); - } - public static ItemSyncManager createItemSyncManager() { - return new ItemSyncManagerImpl(); - } - public static ContractSyncManager createContractSyncManager() { - return new ContractSyncManagerImpl(); - } - public static MessageSyncManager createMessageSyncManager() { - return new MessageSyncManagerImpl(); - } + public static UserSyncManager createUserSyncManager() { + return new UserSyncManagerImpl(); + } + + public static ItemSyncManager createItemSyncManager() { + return new ItemSyncManagerImpl(); + } + + public static ContractSyncManager createContractSyncManager() { + return new ContractSyncManagerImpl(); + } + + public static MessageSyncManager createMessageSyncManager() { + return new MessageSyncManagerImpl(); + } } diff --git a/src/main/java/model/factory/ValidatorFactory.java b/src/main/java/model/factory/ValidatorFactory.java index 6856594a..5198a77f 100644 --- a/src/main/java/model/factory/ValidatorFactory.java +++ b/src/main/java/model/factory/ValidatorFactory.java @@ -6,9 +6,20 @@ import model.validator.UserValidator; public class ValidatorFactory { - - public static ItemValidator createItemValidator() {return new ItemValidator();} - public static UserValidator createUserValidator() {return new UserValidator();} - public static MessageValidator createMessageValidator() {return new MessageValidator();} - public static ContractValidator createContractValidator() {return new ContractValidator();} + + public static ItemValidator createItemValidator() { + return new ItemValidator(); + } + + public static UserValidator createUserValidator() { + return new UserValidator(); + } + + public static MessageValidator createMessageValidator() { + return new MessageValidator(); + } + + public static ContractValidator createContractValidator() { + return new ContractValidator(); + } } diff --git a/src/main/java/model/manager/ManagerAdapter.java b/src/main/java/model/manager/ManagerAdapter.java index d0133b24..8644436e 100644 --- a/src/main/java/model/manager/ManagerAdapter.java +++ b/src/main/java/model/manager/ManagerAdapter.java @@ -1,89 +1,97 @@ package model.manager; +import model.api.Manager; +import model.api.ManagerListener; +import model.api.SyncManager; + import java.util.ArrayList; import java.util.Collection; -import java.util.Hashtable; -import javax.persistence.EntityManager; +public class ManagerAdapter implements Manager { -import model.api.Manager; -import model.api.ManagerListener; -import model.api.SyncManager; + private SyncManager em; + + public ManagerAdapter(SyncManager manager) { + em = manager; + } + + @Override + public void findOneById(String id, ManagerListener l) { + ArrayList r = new ArrayList<>(); + r.add(em.findOneById(id)); + l.notify(r); + } + + + /**TODO**/ + @Override + public void findAllById(ArrayList id, ManagerListener l){ + l.notify(em.findAllById(id)); + } + + @Override + public void findAllByAttribute(String attribute, String value, ManagerListener l) { + l.notify(em.findAllByAttribute(attribute, value)); + } + + + @Override + public void findOneByAttribute(String attribute, String value, ManagerListener l) { + ArrayList r = new ArrayList<>(); + r.add(em.findOneByAttribute(attribute, value)); + l.notify(r); + } + + @Override + public void findAll(ManagerListener l) { + l.notify(em.findAll()); + } + + + @Override + public boolean persist(Entity entity) { + return em.persist(entity); + } + + @Override + public boolean begin() { + return em.begin(); + } + + @Override + public boolean end() { + return em.end(); + } + + @Override + public boolean remove(Entity entity) { + return em.remove(entity); + } + + @Override + public boolean contains(Entity entity) { + return em.contains(entity); + } + + @Override + public Collection watchlist() { + return em.watchlist(); + } + + @Override + public boolean check() { + return em.check(); + } + + @Override + public boolean close() { + return em.close(); + } + + @Override + public Collection changesInWatchlist() { + return em.changesInWatchlist(); + } -public class ManagerAdapter implements Manager{ - - private SyncManager em; - - public ManagerAdapter(SyncManager manager) { - em = manager; - } - - @Override - public void findOneById(String id, ManagerListener l) { - ArrayList r = new ArrayList<>(); - r.add(em.findOneById(id)); - l.notify(r); - } - - @Override - public void findAllByAttribute(String attribute, String value, ManagerListener l) { - l.notify(em.findAllByAttribute(attribute, value)); - } - - - @Override - public void findOneByAttribute(String attribute, String value, ManagerListener l) { - ArrayList r = new ArrayList<>(); - r.add(em.findOneByAttribute(attribute, value)); - l.notify(r); - } - - - - @Override - public boolean persist(Entity entity) { - return em.persist(entity); - } - - @Override - public boolean begin() { - return em.begin(); - } - - @Override - public boolean end() { - return em.end(); - } - - @Override - public boolean remove(Entity entity) { - return em.remove(entity); - } - - @Override - public boolean contains(Entity entity) { - return em.contains(entity); - } - @Override - public Collection watchlist() { - return em.watchlist(); - } - - @Override - public boolean check() { - return em.check(); - } - - @Override - public boolean close(){ - return em.close(); - } - - @Override - public Collection changesInWatchlist() { - return em.changesInWatchlist(); - } - - } diff --git a/src/main/java/model/syncManager/AbstractSyncManager.java b/src/main/java/model/syncManager/AbstractSyncManager.java index 5b85ac4a..8d006081 100644 --- a/src/main/java/model/syncManager/AbstractSyncManager.java +++ b/src/main/java/model/syncManager/AbstractSyncManager.java @@ -1,217 +1,212 @@ package model.syncManager; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Iterator; - -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Persistence; -import javax.persistence.Query; - +import controller.tools.LoggerUtilities; +import model.validator.EntityValidator; import org.eclipse.persistence.internal.sessions.UnitOfWorkChangeSet; import org.eclipse.persistence.internal.sessions.UnitOfWorkImpl; -import org.eclipse.persistence.jpa.JpaEntityManager; import org.eclipse.persistence.sessions.UnitOfWork; import org.eclipse.persistence.sessions.changesets.ObjectChangeSet; -import controller.tools.LoggerUtilities; -import model.validator.EntityValidator; +import javax.persistence.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + + +public abstract class AbstractSyncManager implements model.api.SyncManager { + private EntityManagerFactory factory; + private EntityManager em; + private Class theClass; + + @Override + public void initialisation(String unitName, Class c) { + factory = Persistence.createEntityManagerFactory(unitName); + this.theClass = c; + em = factory.createEntityManager(); + } + + @SuppressWarnings("unchecked") + @Override + public Entity findOneById(String id) { + try { + return (Entity) em.find(theClass, id); + + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + return null; + } + } + + @Override + public Collection findAllById(ArrayList ids){ + ArrayList r = new ArrayList<>(); + for(String id : ids){ + r.add(findOneById(id)); + } + return r; + } + + + + @Override + @SuppressWarnings("unchecked") + public Entity findOneByAttribute(String attribute, String value) { + Query q = em.createQuery("select t from " + theClass.getSimpleName() + " t where t." + attribute + "=:value"); + q.setParameter("value", value); + try { + return (Entity) q.getSingleResult(); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + return null; + } + } + + @SuppressWarnings("unchecked") + @Override + public Collection findAll(){ + Query q = em.createQuery("select t from " + theClass.getSimpleName()+" t"); + try{ + return q.getResultList(); + }catch ( Exception e){ + LoggerUtilities.logStackTrace(e); + return null; + } + } + + @SuppressWarnings("unchecked") + @Override + public Collection findAllByAttribute(String attribute, String value) { + Query q = em.createQuery("select t from " + theClass.getSimpleName() + " t where t." + attribute + "=:value"); + q.setParameter("value", value); + try { + return q.getResultList(); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + return null; + } + } + + @Override + public boolean begin() { + try { + em.getTransaction().begin(); + return true; + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + return false; + } + } + + protected abstract EntityValidator getAdaptedValidator(); + + @Override + public boolean check() { + @SuppressWarnings("unchecked") + EntityValidator ev = (EntityValidator) this.getAdaptedValidator(); + boolean ret = true; + for (Entity ent : this.watchlist()) { + ev.setEntity(ent); + ret = ret && ev.validate(); + } + return ret; + } + + @Override + public boolean end() { + //Validate all the entities in the Watchlist + if (!this.check()) { + return false; + } + try { + EntityTransaction emtr = em.getTransaction(); + if (!emtr.getRollbackOnly()) + em.getTransaction().commit(); + em.clear(); // Should it be done here or before the close method? + return true; + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + return false; + } + } + + @Override + public boolean persist(Entity entity) { + try { + em.persist(entity); + return true; + } catch (Exception e) { + System.out.println(e); + LoggerUtilities.logStackTrace(e); + return false; + } + } + + @Override + public boolean remove(Entity entity) { + try { + em.remove(entity); + return true; + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + return false; + } + } + + @Override + public boolean contains(Entity entity) { + try { + return em.contains(entity); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + return false; + } + } + + + @SuppressWarnings("unchecked") + @Override + public Collection watchlist() { + UnitOfWorkImpl uow = (UnitOfWorkImpl) em.unwrap(UnitOfWork.class); + return uow.getCloneMapping().keySet(); + } + + @Override + public boolean close() { + try { + em.close(); + em = null; + return true; + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + return false; + } + } + + @Override + public Collection changesInWatchlist() { + + ArrayList res = new ArrayList<>(); + + UnitOfWorkImpl uow = (UnitOfWorkImpl) em.unwrap(UnitOfWork.class); + + final UnitOfWorkChangeSet changeSet = (UnitOfWorkChangeSet) uow.getCurrentChanges(); + + Collection collection = uow.getCloneMapping().keySet(); + + for (Iterator iterator = collection.iterator(); iterator.hasNext(); ) { + + Entity entity = iterator.next(); + + ObjectChangeSet objectChangeSet = changeSet.getObjectChangeSetForClone(entity); + + if (objectChangeSet.hasChanges()) { + res.add(entity); + } + + } + + return res; + } -public abstract class AbstractSyncManager implements model.api.SyncManager{ - private EntityManagerFactory factory; - private EntityManager em; - private Class theClass; - @Override - public void initialisation(String unitName, Class c) { - factory = Persistence.createEntityManagerFactory(unitName); - this.theClass = c; - em = factory.createEntityManager(); - } - - @SuppressWarnings("unchecked") - @Override - public Entity findOneById(String id) { - try - { - return (Entity) em.find(theClass, id); - - } - catch(Exception e) - { - LoggerUtilities.logStackTrace(e); - return null; - } - } - - @SuppressWarnings("unchecked") - @Override - public Collection findAll() { - try - { - Query q = em.createQuery("select t from " + theClass.getSimpleName() + " t"); - return q.getResultList(); - } - catch(Exception e) - { - LoggerUtilities.logStackTrace(e); - return null; - } - - } - - @Override - @SuppressWarnings("unchecked") - public Entity findOneByAttribute(String attribute, String value) { - Query q = em.createQuery("select t from " + theClass.getSimpleName() + " t where t."+ attribute + "=:value"); - q.setParameter("value", value); - try { - return (Entity) q.getSingleResult(); - } catch(Exception e) { - LoggerUtilities.logStackTrace(e); - return null; - } - } - - @SuppressWarnings("unchecked") - @Override - public Collection findAllByAttribute(String attribute, String value) { - Query q = em.createQuery("select t from " + theClass.getSimpleName() + " t where t."+ attribute + "=:value"); - q.setParameter("value", value); - try { - return q.getResultList(); - } catch(Exception e) { - LoggerUtilities.logStackTrace(e); - return null; - } - } - - @Override - public boolean begin() { - try - { - em.getTransaction().begin(); - return true; - } - catch(Exception e) - { - LoggerUtilities.logStackTrace(e); - return false; - } - } - - protected abstract EntityValidator getAdaptedValidator(); - - @Override - public boolean check(){ - @SuppressWarnings("unchecked") - EntityValidator ev = (EntityValidator) this.getAdaptedValidator(); - boolean ret = true; - for (Entity ent : this.watchlist()) { - ev.setEntity(ent); - ret = ret && ev.validate(); - } - return ret; - } - - @Override - public boolean end() { - //Validate all the entities in the Watchlist - if(! this.check()){return false;} - try{ - EntityTransaction emtr = em.getTransaction(); - if (!emtr.getRollbackOnly()) - em.getTransaction().commit(); - em.clear(); // Should it be done here or before the close method? - return true; - }catch(Exception e){ - LoggerUtilities.logStackTrace(e); - return false; - } - } - - @Override - public boolean persist(Entity entity) { - try{ - em.persist(entity); - return true; - }catch(Exception e){ - System.out.println(e); - LoggerUtilities.logStackTrace(e); - return false; - } - } - - @Override - public boolean remove(Entity entity){ - try{ - em.remove(entity); - return true; - }catch(Exception e){ - LoggerUtilities.logStackTrace(e); - return false; - } - } - - @Override - public boolean contains(Entity entity){ - try{ - return em.contains(entity); - }catch(Exception e){ - LoggerUtilities.logStackTrace(e); - return false; - } - } - - - @SuppressWarnings("unchecked") - @Override - public Collection watchlist() { - UnitOfWorkImpl uow = (UnitOfWorkImpl) em.unwrap(UnitOfWork.class); - return uow.getCloneMapping().keySet(); - } - - @Override - public boolean close() { - try{ - em.close(); - em = null; - return true; - }catch(Exception e){ - LoggerUtilities.logStackTrace(e); - return false; - } - } - - @Override - public Collection changesInWatchlist() { - - ArrayList res = new ArrayList<>(); - - UnitOfWorkImpl uow = (UnitOfWorkImpl) em.unwrap(UnitOfWork.class); - - final UnitOfWorkChangeSet changeSet = (UnitOfWorkChangeSet) uow.getCurrentChanges(); - - Collection collection = uow.getCloneMapping().keySet(); - - for (Iterator iterator = collection.iterator(); iterator.hasNext();) { - - Entity entity = iterator.next(); - - ObjectChangeSet objectChangeSet = changeSet.getObjectChangeSetForClone(entity); - - if(objectChangeSet.hasChanges()){ - res.add(entity); - } - - } - - return res; - } - - } diff --git a/src/main/java/model/syncManager/ContractSyncManagerImpl.java b/src/main/java/model/syncManager/ContractSyncManagerImpl.java index cc94f71e..96d5bd4b 100644 --- a/src/main/java/model/syncManager/ContractSyncManagerImpl.java +++ b/src/main/java/model/syncManager/ContractSyncManagerImpl.java @@ -6,12 +6,13 @@ import model.validator.EntityValidator; public class ContractSyncManagerImpl extends AbstractSyncManager implements ContractSyncManager { - public ContractSyncManagerImpl() { - super(); - this.initialisation("persistence", ContractEntity.class); - } - @Override - protected EntityValidator getAdaptedValidator() { - return ValidatorFactory.createContractValidator(); - } + public ContractSyncManagerImpl() { + super(); + this.initialisation("persistence", ContractEntity.class); + } + + @Override + protected EntityValidator getAdaptedValidator() { + return ValidatorFactory.createContractValidator(); + } } diff --git a/src/main/java/model/syncManager/ItemSyncManagerImpl.java b/src/main/java/model/syncManager/ItemSyncManagerImpl.java index beb9782b..f104e2db 100644 --- a/src/main/java/model/syncManager/ItemSyncManagerImpl.java +++ b/src/main/java/model/syncManager/ItemSyncManagerImpl.java @@ -7,12 +7,13 @@ public class ItemSyncManagerImpl extends AbstractSyncManager implements ItemSyncManager { - public ItemSyncManagerImpl() { - super(); - this.initialisation("persistence", Item.class); - } - @Override - protected EntityValidator getAdaptedValidator() { - return ValidatorFactory.createItemValidator(); - } + public ItemSyncManagerImpl() { + super(); + this.initialisation("persistence", Item.class); + } + + @Override + protected EntityValidator getAdaptedValidator() { + return ValidatorFactory.createItemValidator(); + } } diff --git a/src/main/java/model/syncManager/MessageSyncManagerImpl.java b/src/main/java/model/syncManager/MessageSyncManagerImpl.java index 38ff60f8..3227dec1 100644 --- a/src/main/java/model/syncManager/MessageSyncManagerImpl.java +++ b/src/main/java/model/syncManager/MessageSyncManagerImpl.java @@ -7,14 +7,14 @@ public class MessageSyncManagerImpl extends AbstractSyncManager implements MessageSyncManager { - public MessageSyncManagerImpl() { - super(); - this.initialisation("persistence", Message.class); - } + public MessageSyncManagerImpl() { + super(); + this.initialisation("persistence", Message.class); + } - @Override - protected EntityValidator getAdaptedValidator() { - return ValidatorFactory.createMessageValidator(); - } + @Override + protected EntityValidator getAdaptedValidator() { + return ValidatorFactory.createMessageValidator(); + } } diff --git a/src/main/java/model/syncManager/UserSyncManagerImpl.java b/src/main/java/model/syncManager/UserSyncManagerImpl.java index 2eff2c24..16e04ed8 100644 --- a/src/main/java/model/syncManager/UserSyncManagerImpl.java +++ b/src/main/java/model/syncManager/UserSyncManagerImpl.java @@ -1,7 +1,5 @@ package model.syncManager; -import java.util.Collection; - import crypt.api.hashs.Hasher; import crypt.factories.HasherFactory; import model.api.UserSyncManager; @@ -9,30 +7,32 @@ import model.factory.ValidatorFactory; import model.validator.EntityValidator; -public class UserSyncManagerImpl extends AbstractSyncManager implements UserSyncManager{ - public UserSyncManagerImpl() { - super(); - this.initialisation("persistence", User.class); - } +import java.util.Collection; + +public class UserSyncManagerImpl extends AbstractSyncManager implements UserSyncManager { + public UserSyncManagerImpl() { + super(); + this.initialisation("persistence", User.class); + } - @Override - public User getUser(String username, String password) { - Collection users = this.findAllByAttribute("nick", username); - for(User u: users) { - Hasher hasher = HasherFactory.createDefaultHasher(); - hasher.setSalt(u.getSalt()); - //check if passwords are the sames - String hash1 = new String(u.getPasswordHash()); - String hash2 = new String(hasher.getHash(password.getBytes())); - if(hash1.equals(hash2)) { - return u; - } - } - return null; - } + @Override + public User getUser(String username, String password) { + Collection users = this.findAllByAttribute("nick", username); + for (User u : users) { + Hasher hasher = HasherFactory.createDefaultHasher(); + hasher.setSalt(u.getSalt()); + //check if passwords are the sames + String hash1 = new String(u.getPasswordHash()); + String hash2 = new String(hasher.getHash(password.getBytes())); + if (hash1.equals(hash2)) { + return u; + } + } + return null; + } - @Override - protected EntityValidator getAdaptedValidator() { - return ValidatorFactory.createUserValidator(); - } + @Override + protected EntityValidator getAdaptedValidator() { + return ValidatorFactory.createUserValidator(); + } } diff --git a/src/main/java/model/validator/EntityValidator.java b/src/main/java/model/validator/EntityValidator.java index 6b6161f8..5c949fb9 100644 --- a/src/main/java/model/validator/EntityValidator.java +++ b/src/main/java/model/validator/EntityValidator.java @@ -1,35 +1,35 @@ package model.validator; -import java.util.Set; +import model.api.EntityValidation; import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; +import java.util.Set; -import model.api.EntityValidation; +public class EntityValidator implements EntityValidation { + protected Entity entity = null; + private Set> violations = null; + private Validator validator = null; -public class EntityValidator implements EntityValidation{ - protected Entity entity = null; - private Set> violations = null; - private Validator validator = null; - @Override - public void setEntity(Entity entity) { - this.entity = entity; - ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); - validator = factory.getValidator(); - violations = validator.validate(this.entity); - } + @Override + public void setEntity(Entity entity) { + this.entity = entity; + ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); + validator = factory.getValidator(); + violations = validator.validate(this.entity); + } - @Override - public boolean validate() { - if(entity == null) return false; - return violations.size() == 0; - } + @Override + public boolean validate() { + if (entity == null) return false; + return violations.size() == 0; + } - @Override - public Set> getViolations() { - return violations; - } + @Override + public Set> getViolations() { + return violations; + } } diff --git a/src/main/java/model/validator/ItemValidator.java b/src/main/java/model/validator/ItemValidator.java index bcc7a3c5..461530a6 100644 --- a/src/main/java/model/validator/ItemValidator.java +++ b/src/main/java/model/validator/ItemValidator.java @@ -5,23 +5,23 @@ import crypt.impl.signatures.ElGamalSignature; import model.entity.Item; -public class ItemValidator extends EntityValidator{ +public class ItemValidator extends EntityValidator { - @SuppressWarnings("unused") - private Signer signer = null; + @SuppressWarnings("unused") + private Signer signer = null; - public void setSigner(Signer signer) { - this.signer = signer; - } + public void setSigner(Signer signer) { + this.signer = signer; + } - @Override - public boolean validate() { - return super.validate() && validateSignature(); - } + @Override + public boolean validate() { + return super.validate() && validateSignature(); + } - private boolean validateSignature() { - /*if(signer == null) throw new RuntimeException("no signer were setteld"); + private boolean validateSignature() { + /*if(signer == null) throw new RuntimeException("no signer were setteld"); return false;*/ - return true; - } + return true; + } } diff --git a/src/main/java/model/validator/UserValidator.java b/src/main/java/model/validator/UserValidator.java index 078791db..3f88ece9 100644 --- a/src/main/java/model/validator/UserValidator.java +++ b/src/main/java/model/validator/UserValidator.java @@ -3,6 +3,6 @@ import model.entity.User; -public class UserValidator extends EntityValidator{ - +public class UserValidator extends EntityValidator { + } diff --git a/src/main/java/network/api/EstablisherService.java b/src/main/java/network/api/EstablisherService.java index c1b6c30f..80a789ee 100644 --- a/src/main/java/network/api/EstablisherService.java +++ b/src/main/java/network/api/EstablisherService.java @@ -1,81 +1,78 @@ /** - * + * */ package network.api; -import java.util.HashMap; - import crypt.api.key.AsymKey; import network.api.service.Service; import network.impl.messages.EstablisherMessage; +import java.util.HashMap; + /** * @author soriano - * */ -public interface EstablisherService extends Service -{ - - public static final String NAME = "establisher"; - - - /** - * Encapsulate contract sending (using either Message or Advertisement) - * @param title : event title - * @param data : data sent - * @param senderId : sender id - * @param uris : receiving peers uris, if null : uses Advertisement, otherwise uses Messages - * @param peer : the sending peer - */ - public > void sendContract(String title, String data, String senderId, Peer peer, HashMap uris); - - /** - * Send a "Message" (synchrone) - * @param title - * Message title - * @param who - * An id (the name the receiver will put a listener on) - * @param sourceId - * The user id of the sender - * @param contract - * Content of the message - * @param uris - * Receivers location - * @return - * sent contract - */ - public EstablisherMessage sendContract(String title, String who, String sourceId, String contract, String ...uris); - - /** - * Send an EstablisherAdvertisement (asynchrone) - * @param title : advertisement title - * @param data : data to be sent - * @param sourceKey : identifier of the sender - * @param peer : peer from which it is sent - */ - public void sendContract(String title, String data, String sourceKey, Peer peer); +public interface EstablisherService extends Service { + + public static final String NAME = "establisher"; + + + /** + * Encapsulate contract sending (using either Message or Advertisement) + * + * @param title : event title + * @param data : data sent + * @param senderId : sender id + * @param uris : receiving peers uris, if null : uses Advertisement, otherwise uses Messages + * @param peer : the sending peer + */ + public > void sendContract(String title, String data, String senderId, Peer peer, HashMap uris); + + /** + * Send a "Message" (synchrone) + * + * @param title Message title + * @param who An id (the name the receiver will put a listener on) + * @param sourceId The user id of the sender + * @param contract Content of the message + * @param uris Receivers location + * @return sent contract + */ + public EstablisherMessage sendContract(String title, String who, String sourceId, String contract, String... uris); + + /** + * Send an EstablisherAdvertisement (asynchrone) + * + * @param title : advertisement title + * @param data : data to be sent + * @param sourceKey : identifier of the sender + * @param peer : peer from which it is sent + */ + public void sendContract(String title, String data, String sourceKey, Peer peer); + + + /** + * Encapsulate listening system + * + * @param field : field to be matched with @param value + * @param listenerId : an id to listen on and to be able to remove the listener + * @param l : listener notified upon receiving data + * @param useMessage : if true -> use Messages, else use Advertisement + */ + public void setListener(final String field, final String value, String listenerId, final EstablisherServiceListener l, boolean useMessage); + + /** + * Add an advertisement listener and search in already sent adverts + * + * @param field : field to be matched with @param value + * @param listenerId : Id to be able to remove the listener + * @param l : listener notified when advert received + */ + public void listens(String field, String value, String listenerId, EstablisherServiceListener l); + + /* + * Remove the previously set listener + */ + public void removeListener(String listenerId); - - - /** - * Encapsulate listening system - * @param field : field to be matched with @param value - * @param listenerId : an id to listen on and to be able to remove the listener - * @param l : listener notified upon receiving data - * @param useMessage : if true -> use Messages, else use Advertisement - */ - public void setListener(final String field, final String value, String listenerId, final EstablisherServiceListener l, boolean useMessage); - /** - * Add an advertisement listener and search in already sent adverts - * @param field : field to be matched with @param value - * @param listenerId : Id to be able to remove the listener - * @param l : listener notified when advert received - */ - public void listens(String field, String value, String listenerId, EstablisherServiceListener l); - - /* - * Remove the previously set listener - */ - public void removeListener(String listenerId); - } diff --git a/src/main/java/network/api/EstablisherServiceListener.java b/src/main/java/network/api/EstablisherServiceListener.java index 68841342..5e0518f5 100644 --- a/src/main/java/network/api/EstablisherServiceListener.java +++ b/src/main/java/network/api/EstablisherServiceListener.java @@ -3,12 +3,13 @@ import java.util.EventListener; public interface EstablisherServiceListener extends EventListener { - - /** - * Notify when the establisher receives an EstablisherAdvertisement or a Message - * @param title : message title - * @param data : content - * @param senderKey : id for sender - */ - public void notify(String title, String data, String senderKey); + + /** + * Notify when the establisher receives an EstablisherAdvertisement or a Message + * + * @param title : message title + * @param data : content + * @param senderKey : id for sender + */ + public void notify(String title, String data, String senderKey); } diff --git a/src/main/java/network/api/ItemRequestService.java b/src/main/java/network/api/ItemRequestService.java index d2ae3fe6..5f55b2ee 100644 --- a/src/main/java/network/api/ItemRequestService.java +++ b/src/main/java/network/api/ItemRequestService.java @@ -2,15 +2,16 @@ import network.api.service.Service; -public interface ItemRequestService extends Service{ - /** - * Send items request - * @param title item title - * @param who sender - * @param uris target peers - */ - public void sendRequest(String title, String who, String ...uris); - - public static final String NAME = "itemsSender"; - +public interface ItemRequestService extends Service { + public static final String NAME = "itemsSender"; + + /** + * Send items request + * + * @param title item title + * @param who sender + * @param uris target peers + */ + public void sendRequest(String title, String who, String... uris); + } diff --git a/src/main/java/network/api/ItemService.java b/src/main/java/network/api/ItemService.java index 2756200b..77821d85 100644 --- a/src/main/java/network/api/ItemService.java +++ b/src/main/java/network/api/ItemService.java @@ -2,6 +2,6 @@ import network.api.service.Service; -public interface ItemService extends Service{ - public static final String NAME = "items"; +public interface ItemService extends Service { + public static final String NAME = "items"; } diff --git a/src/main/java/network/api/MessageRequestService.java b/src/main/java/network/api/MessageRequestService.java index d93eca1b..e5bfd16f 100644 --- a/src/main/java/network/api/MessageRequestService.java +++ b/src/main/java/network/api/MessageRequestService.java @@ -2,26 +2,28 @@ import network.api.service.Service; -public interface MessageRequestService extends Service{ - - public static final String NAME = "messagesSender"; - - /** - * Send messages request - * @param receiverId message receiver ID - * @param who sender - * @param uris target peers - */ - public void sendRequest(String receiverId, String who, String ...uris); +public interface MessageRequestService extends Service { - - /** - * Send messages request - * @param senderId message sender ID - * @param receiverId message receiver ID - * @param who sender - * @param uris target peers - */ - public void sendRequest(String senderId, String receiverId, String who, String ...uris); + public static final String NAME = "messagesSender"; + + /** + * Send messages request + * + * @param receiverId message receiver ID + * @param who sender + * @param uris target peers + */ + public void sendRequest(String receiverId, String who, String... uris); + + + /** + * Send messages request + * + * @param senderId message sender ID + * @param receiverId message receiver ID + * @param who sender + * @param uris target peers + */ + public void sendRequest(String senderId, String receiverId, String who, String... uris); } diff --git a/src/main/java/network/api/MessageService.java b/src/main/java/network/api/MessageService.java index 94fae146..73160e62 100644 --- a/src/main/java/network/api/MessageService.java +++ b/src/main/java/network/api/MessageService.java @@ -2,6 +2,6 @@ import network.api.service.Service; -public interface MessageService extends Service{ - public static final String NAME = "messages"; +public interface MessageService extends Service { + public static final String NAME = "messages"; } diff --git a/src/main/java/network/api/Messages.java b/src/main/java/network/api/Messages.java index 636909df..10a79bcd 100644 --- a/src/main/java/network/api/Messages.java +++ b/src/main/java/network/api/Messages.java @@ -1,24 +1,27 @@ package network.api; public interface Messages { - /** - * Get message content by this name (field) - * @param name - * @return - */ - public String getMessage(String name); - - /** - * Get all the messages fields - * @return - */ - public String[] getNames(); - - /** - * Set the receiver of the messages - * @param who - */ - public void setWho(String who); - - public String getWho(); + /** + * Get message content by this name (field) + * + * @param name + * @return + */ + public String getMessage(String name); + + /** + * Get all the messages fields + * + * @return + */ + public String[] getNames(); + + public String getWho(); + + /** + * Set the receiver of the messages + * + * @param who + */ + public void setWho(String who); } diff --git a/src/main/java/network/api/Node.java b/src/main/java/network/api/Node.java index 00ff61e1..f55a7ed6 100644 --- a/src/main/java/network/api/Node.java +++ b/src/main/java/network/api/Node.java @@ -1,47 +1,51 @@ package network.api; -import java.io.IOException; - import net.jxta.exception.PeerGroupException; +import java.io.IOException; + /** * Network Node interface. Handle P2P server. - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public interface Node { - /** - * Initialize peer to peer node. - * @param cacheFolder relative path to the cache folder. The folder will be created if it doesn't exist. - * @param name peer name. - * @param persistant save configuration on drive if true - * @throws IOException cacheFolder read/write error. - */ - public void initialize(String cacheFolder, String name, boolean persistant) throws IOException; - - /** - * Return if the Node instance is correctly initalized. - * @return true if initialized, otherwise false - */ - public boolean isInitialized(); - - /** - * Start the P2P server. - * @param port the listening port. - * @throws RuntimeException the init method was not called before starting server - * @throws PeerGroupException : Peer group failed to initialized - * @throws IOException : cacheFolder read/write error. - */ - public void start(int port) throws RuntimeException, IOException, PeerGroupException; - - /** - * Return true if the server is succesfully started - * @return true if server started - */ - public boolean isStarted(); - - /** - * Stop the P2P network - */ - public void stop(); + /** + * Initialize peer to peer node. + * + * @param cacheFolder relative path to the cache folder. The folder will be created if it doesn't exist. + * @param name peer name. + * @param persistant save configuration on drive if true + * @throws IOException cacheFolder read/write error. + */ + public void initialize(String cacheFolder, String name, boolean persistant) throws IOException; + + /** + * Return if the Node instance is correctly initalized. + * + * @return true if initialized, otherwise false + */ + public boolean isInitialized(); + + /** + * Start the P2P server. + * + * @param port the listening port. + * @throws RuntimeException the init method was not called before starting server + * @throws PeerGroupException : Peer group failed to initialized + * @throws IOException : cacheFolder read/write error. + */ + public void start(int port) throws RuntimeException, IOException, PeerGroupException; + + /** + * Return true if the server is succesfully started + * + * @return true if server started + */ + public boolean isStarted(); + + /** + * Stop the P2P network + */ + public void stop(); } diff --git a/src/main/java/network/api/Peer.java b/src/main/java/network/api/Peer.java index f935e923..2f0697ba 100644 --- a/src/main/java/network/api/Peer.java +++ b/src/main/java/network/api/Peer.java @@ -1,64 +1,70 @@ package network.api; -import java.io.IOException; -import java.util.Collection; - import net.jxta.exception.PeerGroupException; import network.api.service.InvalidServiceException; import network.api.service.Service; +import java.io.IOException; +import java.util.Collection; + /** * Interface for the whole peer - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public interface Peer { - /** - * Starts the peer - * @param cache cache folder - * @param port listening port - * @throws IOException - * @throws RuntimeException - * @throws PeerGroupException - */ - public void start(String cache, int port, String ...ips) throws IOException, PeerGroupException, RuntimeException; - - /** - * Stop the server - */ - public void stop(); - - /** - * Should return this Peer public IP address - * @return a String that represent an IP address - */ - public String getIp(); - - /** - * Get a collection of all services supported by this peer - * @return - */ - public Collection getServices(); - - /** - * Get a service by its name - * @param name The service's name - * @return The Service - */ - public Service getService(String name); - - /** - * Add a service to this Peer - * @param service - * @throws InvalidServiceException : the service is not a valid service - */ - public void addService(Service service) throws InvalidServiceException; - - /** - * Return a string representation of the peer id (uri) - * @return - */ - public String getUri(); - - public void bootstrap(String ...ips); + /** + * Starts the peer + * + * @param cache cache folder + * @param port listening port + * @throws IOException + * @throws RuntimeException + * @throws PeerGroupException + */ + public void start(String cache, int port, String... ips) throws IOException, PeerGroupException, RuntimeException; + + /** + * Stop the server + */ + public void stop(); + + /** + * Should return this Peer public IP address + * + * @return a String that represent an IP address + */ + public String getIp(); + + /** + * Get a collection of all services supported by this peer + * + * @return + */ + public Collection getServices(); + + /** + * Get a service by its name + * + * @param name The service's name + * @return The Service + */ + public Service getService(String name); + + /** + * Add a service to this Peer + * + * @param service + * @throws InvalidServiceException : the service is not a valid service + */ + public void addService(Service service) throws InvalidServiceException; + + /** + * Return a string representation of the peer id (uri) + * + * @return + */ + public String getUri(); + + public void bootstrap(String... ips); } diff --git a/src/main/java/network/api/Search.java b/src/main/java/network/api/Search.java index 17afd5b5..79e4a7ed 100644 --- a/src/main/java/network/api/Search.java +++ b/src/main/java/network/api/Search.java @@ -1,11 +1,12 @@ package network.api; -import java.util.Collection; - import network.api.advertisement.Advertisement; import network.api.service.Service; +import java.util.Collection; + public interface Search { - public void initialize(Service s); - public Collection search(String attribute, String value); + public void initialize(Service s); + + public Collection search(String attribute, String value); } diff --git a/src/main/java/network/api/SearchListener.java b/src/main/java/network/api/SearchListener.java index 6ad6c1a7..550aa9d7 100644 --- a/src/main/java/network/api/SearchListener.java +++ b/src/main/java/network/api/SearchListener.java @@ -1,19 +1,20 @@ package network.api; -import java.util.Collection; - import network.api.advertisement.Advertisement; +import java.util.Collection; + /** * Search interface for advertisement - * @author Julien Prudhomme * * @param Type of advertisement searched + * @author Julien Prudhomme */ -public interface SearchListener { - /** - * Call to notify one or more object are found - * @param result the advertisement found. - */ - public void notify(Collection result); +public interface SearchListener { + /** + * Call to notify one or more object are found + * + * @param result the advertisement found. + */ + public void notify(Collection result); } diff --git a/src/main/java/network/api/ServiceListener.java b/src/main/java/network/api/ServiceListener.java index d8cfc8e1..cb4d3435 100644 --- a/src/main/java/network/api/ServiceListener.java +++ b/src/main/java/network/api/ServiceListener.java @@ -4,13 +4,14 @@ /** * Interface for services listeners - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public interface ServiceListener extends EventListener { - /** - * Notify a service listener that messages were received - * @param messages - */ - public void notify(Messages messages); + /** + * Notify a service listener that messages were received + * + * @param messages + */ + public void notify(Messages messages); } diff --git a/src/main/java/network/api/UserRequestService.java b/src/main/java/network/api/UserRequestService.java index 6f317e34..7f5ae459 100644 --- a/src/main/java/network/api/UserRequestService.java +++ b/src/main/java/network/api/UserRequestService.java @@ -1,16 +1,16 @@ package network.api; +import network.api.service.Service; + import java.math.BigInteger; -import network.api.service.Service; +public interface UserRequestService extends Service { + + public static final String NAME = "usersSender"; + + public void sendRequest(String nickName, String who, String... targetPeers); + + public void sendRequest(String id, String nickName, String who, String... targetPeers); -public interface UserRequestService extends Service{ - - public static final String NAME = "usersSender"; - - public void sendRequest(String nickName, String who, String ...targetPeers); - - public void sendRequest(String id, String nickName, String who, String ...targetPeers); - - public void sendRequest(String nickName,BigInteger pbkey, String who, String ...targetPeers); + public void sendRequest(String nickName, BigInteger pbkey, String who, String... targetPeers); } diff --git a/src/main/java/network/api/UserService.java b/src/main/java/network/api/UserService.java index 43212884..63751176 100644 --- a/src/main/java/network/api/UserService.java +++ b/src/main/java/network/api/UserService.java @@ -2,6 +2,6 @@ import network.api.service.Service; -public interface UserService extends Service{ - public static final String NAME = "users"; +public interface UserService extends Service { + public static final String NAME = "users"; } diff --git a/src/main/java/network/api/advertisement/Advertisement.java b/src/main/java/network/api/advertisement/Advertisement.java index 84b537b5..0e3545ac 100644 --- a/src/main/java/network/api/advertisement/Advertisement.java +++ b/src/main/java/network/api/advertisement/Advertisement.java @@ -1,64 +1,69 @@ package network.api.advertisement; - -import org.jdom2.Document; import crypt.api.signatures.Signable; import network.api.Peer; import network.api.service.Service; +import org.jdom2.Document; /** * Advertise a feature on a {@link Service} + * * @param signature's type - * @see Signable * @author Julien Prudhomme - * + * @see Signable */ public interface Advertisement { - /** - * Get the advertisement name - * @return the advertisement's name - */ - public String getName(); - - /** - * Get the advertisement type - * @return - */ - public String getAdvertisementType(); - - /** - * Publish this advertisement on the network - * @see Peer - * @param peer - */ - public void publish(Peer peer); - - /** - - * Initialize this advertisement with an xml document - * @param doc - */ - public void initialize(Document doc); - - /** - * Generate an xml document describing this advertisement - * @return - */ - public Document getDocument(); - - /** - * Get a string array of field that are used for indexing this advertisement - * @return - */ - public String[] getIndexFields(); - - /** - * Get the peer id (URI) source of the advertisement - * @return - */ - public String getSourceURI(); - - public void setSourceURI(String uri); - + /** + * Get the advertisement name + * + * @return the advertisement's name + */ + public String getName(); + + /** + * Get the advertisement type + * + * @return + */ + public String getAdvertisementType(); + + /** + * Publish this advertisement on the network + * + * @param peer + * @see Peer + */ + public void publish(Peer peer); + + /** + * Initialize this advertisement with an xml document + * + * @param doc + */ + public void initialize(Document doc); + + /** + * Generate an xml document describing this advertisement + * + * @return + */ + public Document getDocument(); + + /** + * Get a string array of field that are used for indexing this advertisement + * + * @return + */ + public String[] getIndexFields(); + + /** + * Get the peer id (URI) source of the advertisement + * + * @return + */ + public String getSourceURI(); + + public void setSourceURI(String uri); + } diff --git a/src/main/java/network/api/advertisement/EstablisherAdvertisementInterface.java b/src/main/java/network/api/advertisement/EstablisherAdvertisementInterface.java index cebc8732..2ce2cffc 100644 --- a/src/main/java/network/api/advertisement/EstablisherAdvertisementInterface.java +++ b/src/main/java/network/api/advertisement/EstablisherAdvertisementInterface.java @@ -1,14 +1,17 @@ package network.api.advertisement; -public interface EstablisherAdvertisementInterface extends Advertisement{ - - public String getTitle(); - public void setTitle(String title); - - public String getContract(); - public void setContract(String contract); - - // Gives the sender public key (useful to sigma protocols) - public String getKey(); - public void setKey(String publicKey); +public interface EstablisherAdvertisementInterface extends Advertisement { + + public String getTitle(); + + public void setTitle(String title); + + public String getContract(); + + public void setContract(String contract); + + // Gives the sender public key (useful to sigma protocols) + public String getKey(); + + public void setKey(String publicKey); } diff --git a/src/main/java/network/api/advertisement/ItemAdvertisementInterface.java b/src/main/java/network/api/advertisement/ItemAdvertisementInterface.java index fc36141e..84c2969b 100644 --- a/src/main/java/network/api/advertisement/ItemAdvertisementInterface.java +++ b/src/main/java/network/api/advertisement/ItemAdvertisementInterface.java @@ -1,6 +1,7 @@ package network.api.advertisement; -public interface ItemAdvertisementInterface extends Advertisement{ - public String getTitle(); - public void setTitle(String title); +public interface ItemAdvertisementInterface extends Advertisement { + public String getTitle(); + + public void setTitle(String title); } diff --git a/src/main/java/network/api/advertisement/MessageAdvertisementInterface.java b/src/main/java/network/api/advertisement/MessageAdvertisementInterface.java index ba779839..89ee769c 100644 --- a/src/main/java/network/api/advertisement/MessageAdvertisementInterface.java +++ b/src/main/java/network/api/advertisement/MessageAdvertisementInterface.java @@ -2,12 +2,12 @@ public interface MessageAdvertisementInterface extends Advertisement { - public String getSenderId(); + public String getSenderId(); - public void setSenderId(String senderId); + public void setSenderId(String senderId); - public String getReceiverId(); + public String getReceiverId(); - public void setReceiverId(String receiverId); + public void setReceiverId(String receiverId); } diff --git a/src/main/java/network/api/advertisement/PeerAdvertisementInterface.java b/src/main/java/network/api/advertisement/PeerAdvertisementInterface.java index 13eda3da..529d1e78 100644 --- a/src/main/java/network/api/advertisement/PeerAdvertisementInterface.java +++ b/src/main/java/network/api/advertisement/PeerAdvertisementInterface.java @@ -1,5 +1,5 @@ package network.api.advertisement; -public interface PeerAdvertisementInterface extends Advertisement{ +public interface PeerAdvertisementInterface extends Advertisement { } diff --git a/src/main/java/network/api/advertisement/UserAdvertisementInterface.java b/src/main/java/network/api/advertisement/UserAdvertisementInterface.java index 720f1d1c..2c8cec7b 100644 --- a/src/main/java/network/api/advertisement/UserAdvertisementInterface.java +++ b/src/main/java/network/api/advertisement/UserAdvertisementInterface.java @@ -1,13 +1,13 @@ package network.api.advertisement; -public interface UserAdvertisementInterface extends Advertisement{ +public interface UserAdvertisementInterface extends Advertisement { - public String getNick(); + public String getNick(); - public void setNick(String nick); + public void setNick(String nick); - public String getPbkey(); + public String getPbkey(); + + public void setPbkey(String pbkey); - public void setPbkey(String pbkey); - } diff --git a/src/main/java/network/api/annotation/AdvertisementAttribute.java b/src/main/java/network/api/annotation/AdvertisementAttribute.java index 93f22760..b1e75ffb 100644 --- a/src/main/java/network/api/annotation/AdvertisementAttribute.java +++ b/src/main/java/network/api/annotation/AdvertisementAttribute.java @@ -7,27 +7,30 @@ /** * Define an attribute to be key/value of an {@link Advertisement} - * @author Julien Prudhomme * + * @author Julien Prudhomme */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD }) +@Target({ElementType.FIELD}) public @interface AdvertisementAttribute { - /** - * The attribute is enabled and is part of the final advertisement - * @return - */ - public boolean enabled() default true; - - /** - * The attribute is indexed - * @return - */ - public boolean indexed() default false; - - /** - * The attribute participate for the signature - * @return - */ - public boolean signable() default true; + /** + * The attribute is enabled and is part of the final advertisement + * + * @return + */ + public boolean enabled() default true; + + /** + * The attribute is indexed + * + * @return + */ + public boolean indexed() default false; + + /** + * The attribute participate for the signature + * + * @return + */ + public boolean signable() default true; } diff --git a/src/main/java/network/api/annotation/MessageElement.java b/src/main/java/network/api/annotation/MessageElement.java index 712ffaba..4fc5925e 100644 --- a/src/main/java/network/api/annotation/MessageElement.java +++ b/src/main/java/network/api/annotation/MessageElement.java @@ -7,15 +7,16 @@ /** * Declare a field that is a message field - * @author Julien Prudhomme * + * @author Julien Prudhomme */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD }) +@Target({ElementType.FIELD}) public @interface MessageElement { - /** - * Name of the field - * @return - */ - public String value(); + /** + * Name of the field + * + * @return + */ + public String value(); } diff --git a/src/main/java/network/api/annotation/ServiceName.java b/src/main/java/network/api/annotation/ServiceName.java index 3139b108..574defe2 100644 --- a/src/main/java/network/api/annotation/ServiceName.java +++ b/src/main/java/network/api/annotation/ServiceName.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -@Target({ ElementType.TYPE }) +@Target({ElementType.TYPE}) /** * Define which service use an advertisement * @author Julien Prudhomme @@ -13,5 +13,5 @@ */ @Retention(RetentionPolicy.RUNTIME) public @interface ServiceName { - String name(); + String name(); } diff --git a/src/main/java/network/api/service/InvalidServiceException.java b/src/main/java/network/api/service/InvalidServiceException.java index 7f912551..357de7e0 100644 --- a/src/main/java/network/api/service/InvalidServiceException.java +++ b/src/main/java/network/api/service/InvalidServiceException.java @@ -2,9 +2,9 @@ public class InvalidServiceException extends Exception { - private static final long serialVersionUID = 1L; - - public InvalidServiceException(String message) { - super(message); - } + private static final long serialVersionUID = 1L; + + public InvalidServiceException(String message) { + super(message); + } } diff --git a/src/main/java/network/api/service/Service.java b/src/main/java/network/api/service/Service.java index 8dd250fc..dae82af0 100644 --- a/src/main/java/network/api/service/Service.java +++ b/src/main/java/network/api/service/Service.java @@ -11,67 +11,74 @@ * Service running on a peer. Can handle advertisements. * The service should be added on a {@link Peer} via {@link Peer#addService(Service)} * The peer will call {@link Service#initAndStart(Peer)} - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public interface Service { - - /** - * Service's name. It's used to identify the service and retrieve it via {@link Peer#getService(String)} - * @return the service name. - */ - public String getName(); - - /** - * Search features on this service. The results will be notified on a {@link SearchListener} - * @param sl a search listener - */ - public void search(String attribute, String value, SearchListener sl); - - /** - * Publish an {@link Advertisement} on this service - * @param adv - */ - public void publishAdvertisement(Advertisement adv); - - /** - * Init and starts this service for this peer - * This method should me called by a {@link Peer} instance - * when added via {@link Peer#addService(Service)} - * @param peer the peer that serve that service - * @throws InvalidServiceException : the service is not a valid service. - */ - public void initAndStart(Peer peer) throws InvalidServiceException; - - /** - * Add a listener to this service - * @param l the listener - * @param who can be null - only who match will be notified - */ - public void addListener(ServiceListener l, String who); - - - public void removeListener(String who); - - /** - * Add a listener for advertisement on this service - * @param l the listener - */ - public void addAdvertisementListener(DiscoveryListener l); - - public void removeAdvertisementListener(DiscoveryListener l); - - /** - * Send messages to several peer (uris) - * @param messages - * @param uris - */ - public void sendMessages(Messages messages, String ...uris); + + /** + * Service's name. It's used to identify the service and retrieve it via {@link Peer#getService(String)} + * + * @return the service name. + */ + public String getName(); + + /** + * Search features on this service. The results will be notified on a {@link SearchListener} + * + * @param sl a search listener + */ + public void search(String attribute, String value, SearchListener sl); + + /** + * Publish an {@link Advertisement} on this service + * + * @param adv + */ + public void publishAdvertisement(Advertisement adv); + + /** + * Init and starts this service for this peer + * This method should me called by a {@link Peer} instance + * when added via {@link Peer#addService(Service)} + * + * @param peer the peer that serve that service + * @throws InvalidServiceException : the service is not a valid service. + */ + public void initAndStart(Peer peer) throws InvalidServiceException; + + /** + * Add a listener to this service + * + * @param l the listener + * @param who can be null - only who match will be notified + */ + public void addListener(ServiceListener l, String who); + + + public void removeListener(String who); + + /** + * Add a listener for advertisement on this service + * + * @param l the listener + */ + public void addAdvertisementListener(DiscoveryListener l); + + public void removeAdvertisementListener(DiscoveryListener l); + + /** + * Send messages to several peer (uris) + * + * @param messages + * @param uris + */ + public void sendMessages(Messages messages, String... uris); /* - * Add a listener for advertisement on this service + * Add a listener for advertisement on this service * @param l the listener */ - //public void addAdvertisementListener(DiscoveryListener l); + //public void addAdvertisementListener(DiscoveryListener l); } diff --git a/src/main/java/network/factories/AdvertisementFactory.java b/src/main/java/network/factories/AdvertisementFactory.java index 3bc22689..cdd70dff 100644 --- a/src/main/java/network/factories/AdvertisementFactory.java +++ b/src/main/java/network/factories/AdvertisementFactory.java @@ -1,32 +1,26 @@ package network.factories; -import network.api.advertisement.EstablisherAdvertisementInterface; -import network.api.advertisement.ItemAdvertisementInterface; -import network.api.advertisement.MessageAdvertisementInterface; -import network.api.advertisement.PeerAdvertisementInterface; -import network.api.advertisement.UserAdvertisementInterface; -import network.impl.advertisement.EstablisherAdvertisement; -import network.impl.advertisement.ItemAdvertisement; -import network.impl.advertisement.MessageAdvertisement; -import network.impl.advertisement.PeerAdvertisement; -import network.impl.advertisement.UserAdvertisement; +import network.api.advertisement.*; +import network.impl.advertisement.*; public class AdvertisementFactory { - public static ItemAdvertisementInterface createItemAdvertisement() { - return new ItemAdvertisement(); - } - - public static UserAdvertisementInterface createUserAdvertisement() { - return new UserAdvertisement(); - } - - public static PeerAdvertisementInterface createPeerAdvertisement() { - return new PeerAdvertisement(); - } - public static EstablisherAdvertisementInterface createEstablisherAdvertisement() { - return new EstablisherAdvertisement(); - } - public static MessageAdvertisementInterface createMessageAdvertisement() { - return new MessageAdvertisement(); - } + public static ItemAdvertisementInterface createItemAdvertisement() { + return new ItemAdvertisement(); + } + + public static UserAdvertisementInterface createUserAdvertisement() { + return new UserAdvertisement(); + } + + public static PeerAdvertisementInterface createPeerAdvertisement() { + return new PeerAdvertisement(); + } + + public static EstablisherAdvertisementInterface createEstablisherAdvertisement() { + return new EstablisherAdvertisement(); + } + + public static MessageAdvertisementInterface createMessageAdvertisement() { + return new MessageAdvertisement(); + } } diff --git a/src/main/java/network/factories/PeerFactory.java b/src/main/java/network/factories/PeerFactory.java index 7dae43e3..8bea6779 100644 --- a/src/main/java/network/factories/PeerFactory.java +++ b/src/main/java/network/factories/PeerFactory.java @@ -1,75 +1,67 @@ package network.factories; -import java.util.Random; -import java.util.logging.Level; -import java.util.logging.Logger; - import controller.Application; -import controller.tools.LoggerUtilities; import net.jxta.document.AdvertisementFactory; import network.api.Peer; import network.api.service.InvalidServiceException; import network.api.service.Service; -import network.impl.jxta.AdvertisementBridge; -import network.impl.jxta.AdvertisementInstanciator; -import network.impl.jxta.JxtaEstablisherService; -import network.impl.jxta.JxtaItemService; -import network.impl.jxta.JxtaItemsSenderService; -import network.impl.jxta.JxtaMessageSenderService; -import network.impl.jxta.JxtaMessageService; -import network.impl.jxta.JxtaPeer; -import network.impl.jxta.JxtaUserService; -import network.impl.jxta.JxtaUsersSenderService; +import network.impl.jxta.*; + +import java.util.Random; +import java.util.logging.Level; +import java.util.logging.Logger; /** * {@link Peer} factory - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public class PeerFactory { - - /** - * create the default implementation of {@link Peer} - * @return a {@link Peer} - */ - public static Peer createDefaultPeer() { - return createJxtaPeer(); - } - - /** - * Create a the default implementation of {@link Peer} and start it - * @return an initialized and started {@link Peer} - */ - public static Peer createDefaultAndStartPeer() { - Peer p = createAndStartPeer("jxta", ".peercache", 9578); - - try { - System.out.println("\n START Services \n"); - - Service userService = new JxtaUserService(); - userService.initAndStart(p); - - Service usersSender = new JxtaUsersSenderService(); - usersSender.initAndStart(p); - - Service itemService = new JxtaItemService(); - itemService.initAndStart(p); - - Service itemsSender = new JxtaItemsSenderService(); - itemsSender.initAndStart(p); - - Service messageService = new JxtaMessageService(); - messageService.initAndStart(p); - - Service messagesSender = new JxtaMessageSenderService(); - messagesSender.initAndStart(p); - - Service establisherService = new JxtaEstablisherService(); - establisherService.initAndStart(p); - - } catch (InvalidServiceException e) { - throw new RuntimeException(e); - } + + /** + * create the default implementation of {@link Peer} + * + * @return a {@link Peer} + */ + public static Peer createDefaultPeer() { + return createJxtaPeer(); + } + + /** + * Create a the default implementation of {@link Peer} and start it + * + * @return an initialized and started {@link Peer} + */ + public static Peer createDefaultAndStartPeer() { + Peer p = createAndStartPeer("jxta", ".peercache", 9578); + + try { + System.out.println("\n START Services \n"); + + Service userService = new JxtaUserService(); + userService.initAndStart(p); + + Service usersSender = new JxtaUsersSenderService(); + usersSender.initAndStart(p); + + Service itemService = new JxtaItemService(); + itemService.initAndStart(p); + + Service itemsSender = new JxtaItemsSenderService(); + itemsSender.initAndStart(p); + + Service messageService = new JxtaMessageService(); + messageService.initAndStart(p); + + Service messagesSender = new JxtaMessageSenderService(); + messagesSender.initAndStart(p); + + Service establisherService = new JxtaEstablisherService(); + establisherService.initAndStart(p); + + } catch (InvalidServiceException e) { + throw new RuntimeException(e); + } // Service itemService = new JxtaItemService(); // Service establisherService = new JxtaEstablisherService(); // @@ -80,86 +72,93 @@ public static Peer createDefaultAndStartPeer() { // // TODO manage the exception // LoggerUtilities.logStackTrace(e); // } - return p; - } - - - public static Peer createDefaultAndStartPeerForTest() { - return createDefaultAndStartPeerForTest(Application.jxtaPort, Application.rdvPeerIds); - } - - public static Peer createDefaultAndStartPeerForTest(int port, String[] rdvPeerIds) { - Random r = new Random(); - String cache = ".peercache" + r.nextInt(10000); - //int port = 9800 + r.nextInt(100); - System.out.println("jxta will run on port " + port); - Peer p = createAndStartPeer("jxta", cache, port, rdvPeerIds); - - try { - System.out.println("\n START Services \n"); - - Service userService = new JxtaUserService(); - userService.initAndStart(p); - - Service usersSender = new JxtaUsersSenderService(); - usersSender.initAndStart(p); - - Service itemService = new JxtaItemService(); - itemService.initAndStart(p); - - Service itemsSender = new JxtaItemsSenderService(); - itemsSender.initAndStart(p); - - Service messageService = new JxtaMessageService(); - messageService.initAndStart(p); - - Service messagesSender = new JxtaMessageSenderService(); - messagesSender.initAndStart(p); - - Service establisherService = new JxtaEstablisherService(); - establisherService.initAndStart(p); - - } catch (InvalidServiceException e) { - throw new RuntimeException(e); - } - return p; - } - - /** - * Create a Jxta implementation of {@link Peer} - * @return a {@link JxtaPeer} - */ - public static JxtaPeer createJxtaPeer(){ - return createJxtaPeer(Application.jxtaPort); - } - public static JxtaPeer createJxtaPeer(int port) { - Logger.getLogger("net.jxta").setLevel(Level.SEVERE); - AdvertisementBridge i = new AdvertisementBridge(); - AdvertisementFactory.registerAdvertisementInstance(i.getAdvType(), new AdvertisementInstanciator(i)); - return new JxtaPeer(port); - } - - - public static Peer createAndStartPeer(String impl, String tmpFolder, int port){ - return createAndStartPeer(impl, tmpFolder, port, Application.rdvPeerIds); - } - /** - * Create, initialize, and start a {@link JxtaPeer} - * @return an initialized and started {@link Peer} - */ - public static Peer createAndStartPeer(String impl, String tmpFolder, int port, String[] rdvPeerIds){ - Peer peer; - switch(impl) { - case "jxta": peer = createJxtaPeer(port); break; - default: throw new RuntimeException(impl + "doesn't exist"); - } - try { - - peer.start(tmpFolder, port, rdvPeerIds); - - } catch (Exception e) { - throw new RuntimeException(e); - } - return peer; - } + return p; + } + + + public static Peer createDefaultAndStartPeerForTest() { + return createDefaultAndStartPeerForTest(Application.jxtaPort, Application.rdvPeerIds); + } + + public static Peer createDefaultAndStartPeerForTest(int port, String[] rdvPeerIds) { + Random r = new Random(); + String cache = ".peercache" + r.nextInt(10000); + //int port = 9800 + r.nextInt(100); + System.out.println("jxta will run on port " + port); + Peer p = createAndStartPeer("jxta", cache, port, rdvPeerIds); + + try { + System.out.println("\n START Services \n"); + + Service userService = new JxtaUserService(); + userService.initAndStart(p); + + Service usersSender = new JxtaUsersSenderService(); + usersSender.initAndStart(p); + + Service itemService = new JxtaItemService(); + itemService.initAndStart(p); + + Service itemsSender = new JxtaItemsSenderService(); + itemsSender.initAndStart(p); + + Service messageService = new JxtaMessageService(); + messageService.initAndStart(p); + + Service messagesSender = new JxtaMessageSenderService(); + messagesSender.initAndStart(p); + + Service establisherService = new JxtaEstablisherService(); + establisherService.initAndStart(p); + + } catch (InvalidServiceException e) { + throw new RuntimeException(e); + } + return p; + } + + /** + * Create a Jxta implementation of {@link Peer} + * + * @return a {@link JxtaPeer} + */ + public static JxtaPeer createJxtaPeer() { + return createJxtaPeer(Application.jxtaPort); + } + + public static JxtaPeer createJxtaPeer(int port) { + Logger.getLogger("net.jxta").setLevel(Level.SEVERE); + AdvertisementBridge i = new AdvertisementBridge(); + AdvertisementFactory.registerAdvertisementInstance(i.getAdvType(), new AdvertisementInstanciator(i)); + return new JxtaPeer(port); + } + + + public static Peer createAndStartPeer(String impl, String tmpFolder, int port) { + return createAndStartPeer(impl, tmpFolder, port, Application.rdvPeerIds); + } + + /** + * Create, initialize, and start a {@link JxtaPeer} + * + * @return an initialized and started {@link Peer} + */ + public static Peer createAndStartPeer(String impl, String tmpFolder, int port, String[] rdvPeerIds) { + Peer peer; + switch (impl) { + case "jxta": + peer = createJxtaPeer(port); + break; + default: + throw new RuntimeException(impl + "doesn't exist"); + } + try { + + peer.start(tmpFolder, port, rdvPeerIds); + + } catch (Exception e) { + throw new RuntimeException(e); + } + return peer; + } } diff --git a/src/main/java/network/factories/ServiceFactory.java b/src/main/java/network/factories/ServiceFactory.java index 66c63c59..1ea5c547 100644 --- a/src/main/java/network/factories/ServiceFactory.java +++ b/src/main/java/network/factories/ServiceFactory.java @@ -4,7 +4,7 @@ import network.impl.jxta.JxtaItemsSenderService; public class ServiceFactory { - public ItemRequestService createItemRequestService() { - return new JxtaItemsSenderService(); - } + public ItemRequestService createItemRequestService() { + return new JxtaItemsSenderService(); + } } diff --git a/src/main/java/network/impl/AbstractAdvertisement.java b/src/main/java/network/impl/AbstractAdvertisement.java index 7bdc1c41..318357fd 100644 --- a/src/main/java/network/impl/AbstractAdvertisement.java +++ b/src/main/java/network/impl/AbstractAdvertisement.java @@ -1,25 +1,24 @@ package network.impl; -import java.lang.reflect.Field; -import java.util.ArrayList; - -import org.jdom2.Document; -import org.jdom2.Element; - import network.api.Peer; import network.api.advertisement.Advertisement; import network.api.annotation.AdvertisementAttribute; import network.api.annotation.ServiceName; +import org.jdom2.Document; +import org.jdom2.Element; + +import java.lang.reflect.Field; +import java.util.ArrayList; -public abstract class AbstractAdvertisement implements Advertisement{ +public abstract class AbstractAdvertisement implements Advertisement { - protected String sourceURI = null; - - - /** - * {@inheritDoc} - */ - /*@Override + protected String sourceURI = null; + + + /** + * {@inheritDoc} + */ + /*@Override public byte[] getHashableData() { ArrayList data = new ArrayList<>(); for(Field field: this.getClass().getDeclaredFields()) { @@ -52,108 +51,108 @@ public byte[] getHashableData() { return res; }*/ - /** - * {@inheritDoc} - */ - @Override - public abstract String getName(); - - /** - * {@inheritDoc} - */ - @Override - public abstract String getAdvertisementType(); - - /** - * {@inheritDoc} - */ - @Override - public void publish(Peer peer) { - ServiceName name = this.getClass().getAnnotation(ServiceName.class); - if(name == null) { - throw new RuntimeException("No service name defined for this class"); - } - peer.getService(name.name()).publishAdvertisement(this); - } - - /** - * {@inheritDoc} - */ - @Override - public void initialize(Document doc) { - Element root = doc.getRootElement(); - for(Element e: root.getChildren()) { - try { - Field field = this.getClass().getDeclaredField(e.getName()); - field.setAccessible(true); - AdvertisementAttribute a = field.getAnnotation(AdvertisementAttribute.class); - if(a != null && a.enabled()) { - field.set(this, e.getValue()); - } else { - throw new NoSuchFieldException(); - } - field.setAccessible(false); - } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e1) { - System.err.println("Field " + e.getName() + "not found. Is it annoted ?"); - e1.printStackTrace(); - } - - } - } - - /** - * {@inheritDoc} - */ - @Override - public Document getDocument() { - Element root = new Element(this.getName()); - - Element el = new Element("advertisementClass"); - el.addContent(getClass().getCanonicalName()); - root.addContent(el); - - for(Field field : this.getClass().getDeclaredFields()) { - field.setAccessible(true); - AdvertisementAttribute a = field.getAnnotation(AdvertisementAttribute.class); - if(a != null && a.enabled()) { - Element e = new Element(field.getName()); - root.addContent(e); - try { - e.addContent((String) field.get(this)); - } catch (IllegalArgumentException | IllegalAccessException e1) { - e1.printStackTrace(); - } - } - field.setAccessible(false); - } - return new Document(root); - } - - /** - * {@inheritDoc} - */ - @Override - public String[] getIndexFields() { - ArrayList indexes = new ArrayList<>(); - for(Field field : this.getClass().getDeclaredFields()) { - field.setAccessible(true); - AdvertisementAttribute a = field.getAnnotation(AdvertisementAttribute.class); - if(a != null && a.enabled() && a.indexed()) { - indexes.add(field.getName()); - } - field.setAccessible(false); - } - return indexes.toArray(new String[1]); - } - - @Override - public String getSourceURI() { - return sourceURI; - } - - @Override - public void setSourceURI(String uri) { - this.sourceURI = uri; - } - + /** + * {@inheritDoc} + */ + @Override + public abstract String getName(); + + /** + * {@inheritDoc} + */ + @Override + public abstract String getAdvertisementType(); + + /** + * {@inheritDoc} + */ + @Override + public void publish(Peer peer) { + ServiceName name = this.getClass().getAnnotation(ServiceName.class); + if (name == null) { + throw new RuntimeException("No service name defined for this class"); + } + peer.getService(name.name()).publishAdvertisement(this); + } + + /** + * {@inheritDoc} + */ + @Override + public void initialize(Document doc) { + Element root = doc.getRootElement(); + for (Element e : root.getChildren()) { + try { + Field field = this.getClass().getDeclaredField(e.getName()); + field.setAccessible(true); + AdvertisementAttribute a = field.getAnnotation(AdvertisementAttribute.class); + if (a != null && a.enabled()) { + field.set(this, e.getValue()); + } else { + throw new NoSuchFieldException(); + } + field.setAccessible(false); + } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e1) { + System.err.println("Field " + e.getName() + "not found. Is it annoted ?"); + e1.printStackTrace(); + } + + } + } + + /** + * {@inheritDoc} + */ + @Override + public Document getDocument() { + Element root = new Element(this.getName()); + + Element el = new Element("advertisementClass"); + el.addContent(getClass().getCanonicalName()); + root.addContent(el); + + for (Field field : this.getClass().getDeclaredFields()) { + field.setAccessible(true); + AdvertisementAttribute a = field.getAnnotation(AdvertisementAttribute.class); + if (a != null && a.enabled()) { + Element e = new Element(field.getName()); + root.addContent(e); + try { + e.addContent((String) field.get(this)); + } catch (IllegalArgumentException | IllegalAccessException e1) { + e1.printStackTrace(); + } + } + field.setAccessible(false); + } + return new Document(root); + } + + /** + * {@inheritDoc} + */ + @Override + public String[] getIndexFields() { + ArrayList indexes = new ArrayList<>(); + for (Field field : this.getClass().getDeclaredFields()) { + field.setAccessible(true); + AdvertisementAttribute a = field.getAnnotation(AdvertisementAttribute.class); + if (a != null && a.enabled() && a.indexed()) { + indexes.add(field.getName()); + } + field.setAccessible(false); + } + return indexes.toArray(new String[1]); + } + + @Override + public String getSourceURI() { + return sourceURI; + } + + @Override + public void setSourceURI(String uri) { + this.sourceURI = uri; + } + } diff --git a/src/main/java/network/impl/MessagesGeneric.java b/src/main/java/network/impl/MessagesGeneric.java index 4ea12c2c..1c97bcf7 100644 --- a/src/main/java/network/impl/MessagesGeneric.java +++ b/src/main/java/network/impl/MessagesGeneric.java @@ -1,36 +1,36 @@ package network.impl; +import network.api.Messages; + import java.util.HashMap; -import network.api.Messages; +public class MessagesGeneric implements Messages { + + private HashMap fields = new HashMap<>(); + + + @Override + public String getMessage(String name) { + return fields.get(name); + } + + @Override + public String[] getNames() { + return fields.keySet().toArray(new String[1]); + } + + @Override + public String getWho() { + return getMessage("WHO"); + } + + @Override + public void setWho(String who) { + addField("WHO", who); + } -public class MessagesGeneric implements Messages{ - - private HashMap fields = new HashMap<>(); - - - @Override - public String getMessage(String name) { - return fields.get(name); - } - - @Override - public String[] getNames() { - return fields.keySet().toArray(new String[1]); - } - - @Override - public void setWho(String who) { - addField("WHO", who); - } - - @Override - public String getWho() { - return getMessage("WHO"); - } - - public void addField(String name, String value) { - fields.put(name, value); - } + public void addField(String name, String value) { + fields.put(name, value); + } } diff --git a/src/main/java/network/impl/MessagesImpl.java b/src/main/java/network/impl/MessagesImpl.java index bf79f3ef..0969a73c 100644 --- a/src/main/java/network/impl/MessagesImpl.java +++ b/src/main/java/network/impl/MessagesImpl.java @@ -1,59 +1,59 @@ package network.impl; -import java.lang.reflect.Field; -import java.util.ArrayList; - import controller.tools.LoggerUtilities; import network.api.Messages; import network.api.annotation.MessageElement; -public class MessagesImpl implements Messages{ - - private String who; - - @Override - public String getMessage(String name) { - if(name.equals("WHO")) return who; - for(Field f : this.getClass().getDeclaredFields()) { - f.setAccessible(true); - MessageElement m = f.getAnnotation(MessageElement.class); - if(m != null && m.value().equals(name)) { - try { - return (String) f.get(this); - } catch (IllegalArgumentException | IllegalAccessException e) { - // TODO Auto-generated catch block - LoggerUtilities.logStackTrace(e); - } - } - f.setAccessible(false); - } - throw new RuntimeException("field doesn't exist !"); - } - - @Override - public String[] getNames() { - ArrayList names = new ArrayList<>(); - - for(Field f : this.getClass().getDeclaredFields()) { - f.setAccessible(true); - MessageElement m = f.getAnnotation(MessageElement.class); - if(m != null) { - names.add(m.value()); - } - f.setAccessible(false); - } - names.add("WHO"); - return names.toArray(new String[1]); - } - - @Override - public void setWho(String who) { - this.who = who; - } - - @Override - public String getWho() { - return who; - } +import java.lang.reflect.Field; +import java.util.ArrayList; + +public class MessagesImpl implements Messages { + + private String who; + + @Override + public String getMessage(String name) { + if (name.equals("WHO")) return who; + for (Field f : this.getClass().getDeclaredFields()) { + f.setAccessible(true); + MessageElement m = f.getAnnotation(MessageElement.class); + if (m != null && m.value().equals(name)) { + try { + return (String) f.get(this); + } catch (IllegalArgumentException | IllegalAccessException e) { + // TODO Auto-generated catch block + LoggerUtilities.logStackTrace(e); + } + } + f.setAccessible(false); + } + throw new RuntimeException("field doesn't exist !"); + } + + @Override + public String[] getNames() { + ArrayList names = new ArrayList<>(); + + for (Field f : this.getClass().getDeclaredFields()) { + f.setAccessible(true); + MessageElement m = f.getAnnotation(MessageElement.class); + if (m != null) { + names.add(m.value()); + } + f.setAccessible(false); + } + names.add("WHO"); + return names.toArray(new String[1]); + } + + @Override + public String getWho() { + return who; + } + + @Override + public void setWho(String who) { + this.who = who; + } } diff --git a/src/main/java/network/impl/advertisement/EstablisherAdvertisement.java b/src/main/java/network/impl/advertisement/EstablisherAdvertisement.java index 76e502a5..ef1db13d 100644 --- a/src/main/java/network/impl/advertisement/EstablisherAdvertisement.java +++ b/src/main/java/network/impl/advertisement/EstablisherAdvertisement.java @@ -6,66 +6,66 @@ import network.impl.AbstractAdvertisement; @ServiceName(name = "establisher") -public class EstablisherAdvertisement extends AbstractAdvertisement implements EstablisherAdvertisementInterface{ - - @AdvertisementAttribute(indexed = true) - private String title; - - - @AdvertisementAttribute(enabled = true) - private String contract; - - @AdvertisementAttribute(enabled = true) - private String key; - - // Sender userid - private String userid; - - @Override - public String getName() { - return "contractEstablisher"; - } - - @Override - public String getAdvertisementType() { - return null; - } - - @Override - public String getTitle() { - return title; - } - - @Override - public void setTitle(String title) { - this.title = title; - } - - @Override - public String getContract() { - return contract; - } - - @Override - public void setContract(String c) { - this.contract = c; - } - - @Override - public String getKey(){ - return key; - } - - @Override - public void setKey(String publicKey){ - this.key = publicKey; - } - - public String getUserid() { - return userid; - } - - public void setUserid(String u) { - this.userid = u; - } +public class EstablisherAdvertisement extends AbstractAdvertisement implements EstablisherAdvertisementInterface { + + @AdvertisementAttribute(indexed = true) + private String title; + + + @AdvertisementAttribute(enabled = true) + private String contract; + + @AdvertisementAttribute(enabled = true) + private String key; + + // Sender userid + private String userid; + + @Override + public String getName() { + return "contractEstablisher"; + } + + @Override + public String getAdvertisementType() { + return null; + } + + @Override + public String getTitle() { + return title; + } + + @Override + public void setTitle(String title) { + this.title = title; + } + + @Override + public String getContract() { + return contract; + } + + @Override + public void setContract(String c) { + this.contract = c; + } + + @Override + public String getKey() { + return key; + } + + @Override + public void setKey(String publicKey) { + this.key = publicKey; + } + + public String getUserid() { + return userid; + } + + public void setUserid(String u) { + this.userid = u; + } } diff --git a/src/main/java/network/impl/advertisement/ItemAdvertisement.java b/src/main/java/network/impl/advertisement/ItemAdvertisement.java index 1bc89cfb..00e1ddfe 100644 --- a/src/main/java/network/impl/advertisement/ItemAdvertisement.java +++ b/src/main/java/network/impl/advertisement/ItemAdvertisement.java @@ -1,6 +1,5 @@ package network.impl.advertisement; -import network.api.Peer; import network.api.advertisement.ItemAdvertisementInterface; import network.api.annotation.AdvertisementAttribute; import network.api.annotation.ServiceName; @@ -8,33 +7,33 @@ /** * Advertisement for a peer that host an item - * @author Julien Prudhomme * * @param + * @author Julien Prudhomme */ @ServiceName(name = "items") -public class ItemAdvertisement extends AbstractAdvertisement implements ItemAdvertisementInterface{ +public class ItemAdvertisement extends AbstractAdvertisement implements ItemAdvertisementInterface { + + @AdvertisementAttribute(indexed = true) + private String title; + + @Override + public String getName() { + return "item"; + } + + @Override + public String getAdvertisementType() { + return null; + } - @AdvertisementAttribute(indexed = true) - private String title; - - @Override - public String getName() { - return "item"; - } + @Override + public String getTitle() { + return title; + } - @Override - public String getAdvertisementType() { - return null; - } - - @Override - public String getTitle() { - return title; - } - - @Override - public void setTitle(String title) { - this.title = title; - } + @Override + public void setTitle(String title) { + this.title = title; + } } diff --git a/src/main/java/network/impl/advertisement/MessageAdvertisement.java b/src/main/java/network/impl/advertisement/MessageAdvertisement.java index b1eda189..0c286e53 100644 --- a/src/main/java/network/impl/advertisement/MessageAdvertisement.java +++ b/src/main/java/network/impl/advertisement/MessageAdvertisement.java @@ -2,56 +2,52 @@ import network.api.advertisement.MessageAdvertisementInterface; import network.api.annotation.AdvertisementAttribute; -import network.api.annotation.MessageElement; import network.api.annotation.ServiceName; import network.impl.AbstractAdvertisement; /** * Advertisement for a peer that host an message - * @author Julien Prudhomme * * @param + * @author Julien Prudhomme */ @ServiceName(name = "messages") -public class MessageAdvertisement extends AbstractAdvertisement implements MessageAdvertisementInterface{ - - - @AdvertisementAttribute(indexed = true) - private String senderId; - - @AdvertisementAttribute(indexed = true) - private String receiverId; - - - public String getSenderId() { - return senderId; - } - - public void setSenderId(String senderId) { - this.senderId = senderId; - } - - public String getReceiverId() { - return receiverId; - } - - public void setReceiverId(String receiverId) { - this.receiverId = receiverId; - } - - @Override - public String getName() { - return "message"; - } - - @Override - public String getAdvertisementType() { - // TODO Auto-generated method stub - return null; - } - - - - - +public class MessageAdvertisement extends AbstractAdvertisement implements MessageAdvertisementInterface { + + + @AdvertisementAttribute(indexed = true) + private String senderId; + + @AdvertisementAttribute(indexed = true) + private String receiverId; + + + public String getSenderId() { + return senderId; + } + + public void setSenderId(String senderId) { + this.senderId = senderId; + } + + public String getReceiverId() { + return receiverId; + } + + public void setReceiverId(String receiverId) { + this.receiverId = receiverId; + } + + @Override + public String getName() { + return "message"; + } + + @Override + public String getAdvertisementType() { + // TODO Auto-generated method stub + return null; + } + + } diff --git a/src/main/java/network/impl/advertisement/PeerAdvertisement.java b/src/main/java/network/impl/advertisement/PeerAdvertisement.java index 010e83a0..ecec7daf 100644 --- a/src/main/java/network/impl/advertisement/PeerAdvertisement.java +++ b/src/main/java/network/impl/advertisement/PeerAdvertisement.java @@ -4,20 +4,20 @@ import network.api.annotation.AdvertisementAttribute; import network.impl.AbstractAdvertisement; -public class PeerAdvertisement extends AbstractAdvertisement implements PeerAdvertisementInterface{ - - @AdvertisementAttribute - private String publicKey; - - @Override - public String getName() { - return "peer"; - } +public class PeerAdvertisement extends AbstractAdvertisement implements PeerAdvertisementInterface { - @Override - public String getAdvertisementType() { - // TODO Auto-generated method stub - return null; - } + @AdvertisementAttribute + private String publicKey; + + @Override + public String getName() { + return "peer"; + } + + @Override + public String getAdvertisementType() { + // TODO Auto-generated method stub + return null; + } } diff --git a/src/main/java/network/impl/advertisement/UserAdvertisement.java b/src/main/java/network/impl/advertisement/UserAdvertisement.java index 0113fbc3..7f0a3e00 100644 --- a/src/main/java/network/impl/advertisement/UserAdvertisement.java +++ b/src/main/java/network/impl/advertisement/UserAdvertisement.java @@ -7,45 +7,44 @@ import network.impl.AbstractAdvertisement; @ServiceName(name = "users") -public class UserAdvertisement extends AbstractAdvertisement implements UserAdvertisementInterface{ - - @AdvertisementAttribute(indexed = true) - private String nick; - - @AdvertisementAttribute(indexed = true) - private String pbkey; - - @Override - public String getName() { - return "user"; - } - - public String getNick() { - return nick; - } - - public void setNick(String nick) { - this.nick = nick; - } - - public String getPbkey() { - return pbkey; - } - - public void setPbkey(String pbkey) { - this.pbkey = pbkey; - } - - @Override - public String getAdvertisementType() { - return null; - } - - @Override - public void publish(Peer peer) { - super.publish(peer); - } - - - +public class UserAdvertisement extends AbstractAdvertisement implements UserAdvertisementInterface { + + @AdvertisementAttribute(indexed = true) + private String nick; + + @AdvertisementAttribute(indexed = true) + private String pbkey; + + @Override + public String getName() { + return "user"; + } + + public String getNick() { + return nick; + } + + public void setNick(String nick) { + this.nick = nick; + } + + public String getPbkey() { + return pbkey; + } + + public void setPbkey(String pbkey) { + this.pbkey = pbkey; + } + + @Override + public String getAdvertisementType() { + return null; + } + + @Override + public void publish(Peer peer) { + super.publish(peer); + } + + } diff --git a/src/main/java/network/impl/jxta/AdvertisementBridge.java b/src/main/java/network/impl/jxta/AdvertisementBridge.java index 8b00cc4c..67558b79 100644 --- a/src/main/java/network/impl/jxta/AdvertisementBridge.java +++ b/src/main/java/network/impl/jxta/AdvertisementBridge.java @@ -1,117 +1,114 @@ package network.impl.jxta; +import controller.tools.LoggerUtilities; +import net.jxta.document.*; +import net.jxta.id.ID; +import org.jdom2.Element; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Enumeration; -import org.jdom2.Element; +public class AdvertisementBridge extends Advertisement { -import controller.tools.LoggerUtilities; -import net.jxta.document.Advertisement; -import net.jxta.document.Attributable; -import net.jxta.document.Document; -import net.jxta.document.MimeMediaType; -import net.jxta.document.StructuredDocument; -import net.jxta.document.StructuredDocumentFactory; -import net.jxta.document.TextElement; -import net.jxta.id.ID; + private network.api.advertisement.Advertisement adv; + + public AdvertisementBridge() { + } -public class AdvertisementBridge extends Advertisement{ + public AdvertisementBridge(network.api.advertisement.Advertisement adv) { + super(); + this.adv = adv; + } - private network.api.advertisement.Advertisement adv; - - public AdvertisementBridge() { } - - public AdvertisementBridge(network.api.advertisement.Advertisement adv) { - super(); - this.adv = adv; - } - - /** - * Create a new AdvertisementBridge instance initialized with a Jxta xml root element. - * @param root - */ - public AdvertisementBridge(@SuppressWarnings("rawtypes") net.jxta.document.Element root) { - super(); - @SuppressWarnings("rawtypes") - TextElement doc = (TextElement) root; - @SuppressWarnings("rawtypes") - TextElement className = (TextElement) doc.getChildren("advertisementClass").nextElement(); - try { - //try to find the class used for this advertisement - Class adv = Class.forName(className.getValue()); - Constructor cons = adv.getConstructor(); - this.adv = (network.api.advertisement.Advertisement) cons.newInstance(); - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | - InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - LoggerUtilities.logStackTrace(e); - } - Element rootElement = new Element("root"); - @SuppressWarnings("rawtypes") - Enumeration elements = doc.getChildren(); - while(elements.hasMoreElements()) { - @SuppressWarnings("rawtypes") - TextElement elem = (TextElement) elements.nextElement(); - if(elem.getName().equals("advertisementClass")) { - continue; - } - Element e = new Element(elem.getName()); //convert into a Jdom element. - e.addContent(elem.getValue()); - rootElement.addContent(e); + /** + * Create a new AdvertisementBridge instance initialized with a Jxta xml root element. + * + * @param root + */ + public AdvertisementBridge(@SuppressWarnings("rawtypes") net.jxta.document.Element root) { + super(); + @SuppressWarnings("rawtypes") + TextElement doc = (TextElement) root; + @SuppressWarnings("rawtypes") + TextElement className = (TextElement) doc.getChildren("advertisementClass").nextElement(); + try { + //try to find the class used for this advertisement + Class adv = Class.forName(className.getValue()); + Constructor cons = adv.getConstructor(); + this.adv = (network.api.advertisement.Advertisement) cons.newInstance(); + } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | + InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { + LoggerUtilities.logStackTrace(e); + } + Element rootElement = new Element("root"); + @SuppressWarnings("rawtypes") + Enumeration elements = doc.getChildren(); + while (elements.hasMoreElements()) { + @SuppressWarnings("rawtypes") + TextElement elem = (TextElement) elements.nextElement(); + if (elem.getName().equals("advertisementClass")) { + continue; + } + Element e = new Element(elem.getName()); //convert into a Jdom element. + e.addContent(elem.getValue()); + rootElement.addContent(e); } this.adv.initialize(new org.jdom2.Document(rootElement)); - } - - /** - * {@inheritDoc} - * @param asMimeType - * @return - */ - @SuppressWarnings("unchecked") - @Override - public Document getDocument(MimeMediaType asMimeType) { - @SuppressWarnings("rawtypes") - StructuredDocument adv = StructuredDocumentFactory.newStructuredDocument(asMimeType, getAdvType()); - if (adv instanceof Attributable) { + } + + /** + * {@inheritDoc} + * + * @param asMimeType + * @return + */ + @SuppressWarnings("unchecked") + @Override + public Document getDocument(MimeMediaType asMimeType) { + @SuppressWarnings("rawtypes") + StructuredDocument adv = StructuredDocumentFactory.newStructuredDocument(asMimeType, getAdvType()); + if (adv instanceof Attributable) { ((Attributable) adv).addAttribute("xmlns:jxta", "http://jxta.org"); } - - for(Element e : this.adv.getDocument().getRootElement().getChildren()) { - @SuppressWarnings("rawtypes") - net.jxta.document.Element e1 = adv.createElement(e.getName(), e.getValue()); - adv.appendChild(e1); - } - return adv; - } - /** - * {@inheritDoc} - * @return - */ - @Override - public ID getID() { - // TODO see if we generate id for advs - return null; - } + for (Element e : this.adv.getDocument().getRootElement().getChildren()) { + @SuppressWarnings("rawtypes") + net.jxta.document.Element e1 = adv.createElement(e.getName(), e.getValue()); + adv.appendChild(e1); + } + return adv; + } + + /** + * {@inheritDoc} + * + * @return + */ + @Override + public ID getID() { + // TODO see if we generate id for advs + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String[] getIndexFields() { + if (adv == null) { + throw new RuntimeException("Adv is null"); + } + return adv.getIndexFields(); + } + + @Override + public String getAdvType() { + return "jxta:" + this.getClass().getName(); + } - /** - * {@inheritDoc} - */ - @Override - public String[] getIndexFields() { - if(adv == null) { - throw new RuntimeException("Adv is null"); - } - return adv.getIndexFields(); - } - - @Override - public String getAdvType() { - return "jxta:" + this.getClass().getName(); - } + public network.api.advertisement.Advertisement getAdvertisement() { + return adv; + } - public network.api.advertisement.Advertisement getAdvertisement() { - return adv; - } - } diff --git a/src/main/java/network/impl/jxta/AdvertisementInstanciator.java b/src/main/java/network/impl/jxta/AdvertisementInstanciator.java index 113b5099..787a9dac 100644 --- a/src/main/java/network/impl/jxta/AdvertisementInstanciator.java +++ b/src/main/java/network/impl/jxta/AdvertisementInstanciator.java @@ -9,44 +9,44 @@ * This class is a wrapper to construct an Instantiator for our Advertisements * Once the AdvertisementInstanciator registered to JXTA, JXTA can construct a received * advertisement automatically - * @author Prudhomme Julien * + * @author Prudhomme Julien */ -public class AdvertisementInstanciator implements Instantiator{ - - private Class advClass; - private String advType; - - public AdvertisementInstanciator(Advertisement advClass) { - this.advClass = advClass.getClass(); - this.advType = advClass.getAdvType(); - } - - @Override - public String getAdvertisementType() { - return advType; - } +public class AdvertisementInstanciator implements Instantiator { + + private Class advClass; + private String advType; + + public AdvertisementInstanciator(Advertisement advClass) { + this.advClass = advClass.getClass(); + this.advType = advClass.getAdvType(); + } + + @Override + public String getAdvertisementType() { + return advType; + } - @Override - public Advertisement newInstance() { - try { - return advClass.newInstance(); - } catch (InstantiationException e) { - LoggerUtilities.logStackTrace(e); - } catch (IllegalAccessException e) { - LoggerUtilities.logStackTrace(e); - } - return null; - } + @Override + public Advertisement newInstance() { + try { + return advClass.newInstance(); + } catch (InstantiationException e) { + LoggerUtilities.logStackTrace(e); + } catch (IllegalAccessException e) { + LoggerUtilities.logStackTrace(e); + } + return null; + } - @SuppressWarnings("rawtypes") - @Override - public Advertisement newInstance(Element root) { - try { - return advClass.getConstructor(Element.class).newInstance(root); - } catch (Exception e) { - LoggerUtilities.logStackTrace(e); - } - return null; - } + @SuppressWarnings("rawtypes") + @Override + public Advertisement newInstance(Element root) { + try { + return advClass.getConstructor(Element.class).newInstance(root); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } + return null; + } } \ No newline at end of file diff --git a/src/main/java/network/impl/jxta/JxtaAdvertisement.java b/src/main/java/network/impl/jxta/JxtaAdvertisement.java index af45a53c..793dad75 100644 --- a/src/main/java/network/impl/jxta/JxtaAdvertisement.java +++ b/src/main/java/network/impl/jxta/JxtaAdvertisement.java @@ -1,68 +1,67 @@ package network.impl.jxta; +import net.jxta.document.MimeMediaType; +import network.api.Peer; +import network.api.advertisement.Advertisement; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.jdom2.Document; import org.jdom2.output.XMLOutputter; -import net.jxta.document.MimeMediaType; -import network.api.Peer; -import network.api.advertisement.Advertisement; - -public class JxtaAdvertisement implements Advertisement{ +public class JxtaAdvertisement implements Advertisement { static private Logger log = LogManager.getLogger(JxtaAdvertisement.class); - private Advertisement adv; - - - public JxtaAdvertisement(Advertisement adv) { - log.info("Adv : \n" + new XMLOutputter().outputString(adv.getDocument())); - this.adv = adv; - } - - @Override - public String getName() { - return adv.getName(); - } + private Advertisement adv; + + + public JxtaAdvertisement(Advertisement adv) { + log.info("Adv : \n" + new XMLOutputter().outputString(adv.getDocument())); + this.adv = adv; + } + + @Override + public String getName() { + return adv.getName(); + } + + @Override + public String getAdvertisementType() { + return "jxta:" + getName(); + } - @Override - public String getAdvertisementType() { - return "jxta:" + getName(); - } - - public AdvertisementBridge getJxtaAdvertisementBridge() { - log.info(new AdvertisementBridge(this).getDocument(MimeMediaType.XML_DEFAULTENCODING)); - return new AdvertisementBridge(this); - } + public AdvertisementBridge getJxtaAdvertisementBridge() { + log.info(new AdvertisementBridge(this).getDocument(MimeMediaType.XML_DEFAULTENCODING)); + return new AdvertisementBridge(this); + } - @Override - public void publish(Peer peer) { - adv.publish(peer); - } + @Override + public void publish(Peer peer) { + adv.publish(peer); + } - @Override - public void initialize(Document doc) { - adv.initialize(doc); - } + @Override + public void initialize(Document doc) { + adv.initialize(doc); + } - @Override - public Document getDocument() { - return adv.getDocument(); - } + @Override + public Document getDocument() { + return adv.getDocument(); + } - @Override - public String[] getIndexFields() { - return adv.getIndexFields(); - } + @Override + public String[] getIndexFields() { + return adv.getIndexFields(); + } - @Override - public String getSourceURI() { - return adv.getSourceURI(); - } + @Override + public String getSourceURI() { + return adv.getSourceURI(); + } - @Override - public void setSourceURI(String uri) { - adv.setSourceURI(uri); - } + @Override + public void setSourceURI(String uri) { + adv.setSourceURI(uri); + } } diff --git a/src/main/java/network/impl/jxta/JxtaEstablisherService.java b/src/main/java/network/impl/jxta/JxtaEstablisherService.java index b11cbd06..708efff7 100644 --- a/src/main/java/network/impl/jxta/JxtaEstablisherService.java +++ b/src/main/java/network/impl/jxta/JxtaEstablisherService.java @@ -1,212 +1,199 @@ package network.impl.jxta; -import java.io.IOException; -import java.util.Collection; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.concurrent.ConcurrentHashMap; - import crypt.api.key.AsymKey; import net.jxta.discovery.DiscoveryEvent; import net.jxta.discovery.DiscoveryListener; import net.jxta.discovery.DiscoveryService; import net.jxta.pipe.PipeMsgEvent; -import network.api.EstablisherService; -import network.api.EstablisherServiceListener; -import network.api.Messages; -import network.api.Peer; -import network.api.SearchListener; -import network.api.ServiceListener; +import network.api.*; import network.api.advertisement.EstablisherAdvertisementInterface; import network.factories.AdvertisementFactory; import network.impl.advertisement.EstablisherAdvertisement; import network.impl.messages.EstablisherMessage; +import java.io.IOException; +import java.util.Collection; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; + /** * @author Nathanaël EON - * */ -public class JxtaEstablisherService extends JxtaService implements EstablisherService{ - public static final String NAME = "establisher"; - - private ConcurrentHashMap advertisementListeners; - // Hashmap of localListeners - private ConcurrentHashMap establisherServiceListeners; - - // Local listener (to be able to notify local users connected if this peer send an advertisement) - private class ListenerWithParam{ - public final String param; - public final EstablisherServiceListener listener; - - public ListenerWithParam(String p, EstablisherServiceListener l){ - this.param = p; - this.listener = l; - } - } - - - - public JxtaEstablisherService (){ - this.name = NAME; - advertisementListeners = new ConcurrentHashMap(); - establisherServiceListeners = new ConcurrentHashMap(); - } - - - - /* - * Encapsulate contract sending, through Advertisement or Messages - * If uris == null & peer != null => Use Advertisements - * Else if uris != null => Use messages - * - * Careful, we send on the listener : title + receiverPublicKey - * If you use this system, you must set the listener according to this - */ - @Override - public > void sendContract(String title, String data, String senderK, Peer peer, HashMap uris){ - // Using an Advertisement - if (uris == null && peer != null){ - this.sendContract(title, data, senderK, peer); - } - // Using a Message - else if(uris != null){ - for (Key u : uris.keySet()){ - this.sendContract(title, - title + u.getPublicKey().toString(), - senderK, - data, - uris.get(u)); - } - } - } - - // Send a message - @Override - public EstablisherMessage sendContract(String title, String who, String sourceId, String contract, String... peerURIs) - { - EstablisherMessage m = new EstablisherMessage(); - m.setTitle(title); - m.setWho(who); - m.setSourceId(sourceId); - m.setSource(this.peerUri); - m.setContract(contract); - this.sendMessages(m, peerURIs); - return m; - } - - // Send an advertisement - @Override - public void sendContract(String title, String data, String sourceKey, Peer peer){ - EstablisherAdvertisementInterface cadv = AdvertisementFactory.createEstablisherAdvertisement(); - cadv.setTitle(title); - cadv.setContract(data); - cadv.setKey(sourceKey); - cadv.publish(peer); - // Notify local listeners of an event - for (ListenerWithParam l : establisherServiceListeners.values()){ - if (l.param == null || l.param.equals(title)) - l.listener.notify(title, data, sourceKey); - } - } - - - - /** - * Method called when a message is caught in the pipe - */ - @Override - public void pipeMsgEvent(PipeMsgEvent event) { - super.pipeMsgEvent(event); - } - - - - /* - * Encapsulate listener adding - */ - public void setListener(final String field, final String value, String listenerId, final EstablisherServiceListener l, boolean useMessage){ - if (useMessage){ - // Set a Message listener - this.addListener(new ServiceListener() { - @Override - public void notify(Messages messages) { - if (messages.getMessage(field).equals(value)){ - l.notify(messages.getMessage("title"), messages.getMessage("contract"), messages.getMessage("sourceId")); - } - } - }, listenerId); - }else{ - // Set an Advertisement - this.listens(field, value, listenerId, l); - } - } - - // Advertisement listener - @Override - public void listens(final String field, final String value, String listenerId, final EstablisherServiceListener l){ - - // Create the synchrone listener - DiscoveryListener dl = new DiscoveryListener(){ - @Override - public void discoveryEvent(DiscoveryEvent event){ - Enumeration adverts = event.getResponse().getAdvertisements(); - while (adverts.hasMoreElements()){ - AdvertisementBridge adv = (AdvertisementBridge) adverts.nextElement(); - if (adv.getAdvertisement().getClass().equals(EstablisherAdvertisement.class)){ - EstablisherAdvertisementInterface c = (EstablisherAdvertisementInterface) adv.getAdvertisement(); - // If the field on which to listen is the title, then we check its validity - if (!field.equals("title") || c.getTitle().equals(value)) - l.notify(c.getTitle(), c.getContract(), c.getKey()); - } - } - } - }; - this.addAdvertisementListener(dl); - - // Search in remote adverts - this.search(field, value, new SearchListener() { - @Override - public void notify(Collection adverts) { - for(EstablisherAdvertisementInterface adv : adverts) { - l.notify(adv.getTitle(), adv.getContract(), adv.getKey()); - } - } - }); - - // Search in local adverts - try { - Enumeration adverts = pg.getDiscoveryService().getLocalAdvertisements(DiscoveryService.ADV, field, value); - while (adverts.hasMoreElements()){ - AdvertisementBridge adv = (AdvertisementBridge) adverts.nextElement(); - if (adv.getAdvertisement().getClass().equals(EstablisherAdvertisement.class)){ - EstablisherAdvertisementInterface c = (EstablisherAdvertisementInterface) adv.getAdvertisement(); - // If the field on which to listen is the title, then we check its validity - if (!field.equals("title") || c.getTitle().equals(value)){ - l.notify(c.getTitle(), c.getContract(), c.getKey()); - } - } - } - } catch (IOException e) { - e.printStackTrace(); - } - - // Add listeners in the hashmap to be able to delete it and enable it - establisherServiceListeners.put(listenerId, new ListenerWithParam(value, l)); - advertisementListeners.put(listenerId, dl); - }; - - // Remove any listener (message and Advertisement) with the given id - @Override - public void removeListener(String listenerId){ - if (advertisementListeners.containsKey(listenerId)){ - this.removeAdvertisementListener(advertisementListeners.get(listenerId)); - advertisementListeners.remove(listenerId); - } - if (establisherServiceListeners.containsKey(listenerId)){ - establisherServiceListeners.remove(listenerId); - }else{ - super.removeListener(listenerId); - } - } - +public class JxtaEstablisherService extends JxtaService implements EstablisherService { + public static final String NAME = "establisher"; + + private ConcurrentHashMap advertisementListeners; + // Hashmap of localListeners + private ConcurrentHashMap establisherServiceListeners; + + public JxtaEstablisherService() { + this.name = NAME; + advertisementListeners = new ConcurrentHashMap(); + establisherServiceListeners = new ConcurrentHashMap(); + } + + /* + * Encapsulate contract sending, through Advertisement or Messages + * If uris == null & peer != null => Use Advertisements + * Else if uris != null => Use messages + * + * Careful, we send on the listener : title + receiverPublicKey + * If you use this system, you must set the listener according to this + */ + @Override + public > void sendContract(String title, String data, String senderK, Peer peer, HashMap uris) { + // Using an Advertisement + if (uris == null && peer != null) { + this.sendContract(title, data, senderK, peer); + } + // Using a Message + else if (uris != null) { + for (Key u : uris.keySet()) { + this.sendContract(title, + title + u.getPublicKey().toString(), + senderK, + data, + uris.get(u)); + } + } + } + + // Send a message + @Override + public EstablisherMessage sendContract(String title, String who, String sourceId, String contract, String... peerURIs) { + EstablisherMessage m = new EstablisherMessage(); + m.setTitle(title); + m.setWho(who); + m.setSourceId(sourceId); + m.setSource(this.peerUri); + m.setContract(contract); + this.sendMessages(m, peerURIs); + return m; + } + + // Send an advertisement + @Override + public void sendContract(String title, String data, String sourceKey, Peer peer) { + EstablisherAdvertisementInterface cadv = AdvertisementFactory.createEstablisherAdvertisement(); + cadv.setTitle(title); + cadv.setContract(data); + cadv.setKey(sourceKey); + cadv.publish(peer); + // Notify local listeners of an event + for (ListenerWithParam l : establisherServiceListeners.values()) { + if (l.param == null || l.param.equals(title)) + l.listener.notify(title, data, sourceKey); + } + } + + /** + * Method called when a message is caught in the pipe + */ + @Override + public void pipeMsgEvent(PipeMsgEvent event) { + super.pipeMsgEvent(event); + } + + /* + * Encapsulate listener adding + */ + public void setListener(final String field, final String value, String listenerId, final EstablisherServiceListener l, boolean useMessage) { + if (useMessage) { + // Set a Message listener + this.addListener(new ServiceListener() { + @Override + public void notify(Messages messages) { + if (messages.getMessage(field).equals(value)) { + l.notify(messages.getMessage("title"), messages.getMessage("contract"), messages.getMessage("sourceId")); + } + } + }, listenerId); + } else { + // Set an Advertisement + this.listens(field, value, listenerId, l); + } + } + + // Advertisement listener + @Override + public void listens(final String field, final String value, String listenerId, final EstablisherServiceListener l) { + + // Create the synchrone listener + DiscoveryListener dl = new DiscoveryListener() { + @Override + public void discoveryEvent(DiscoveryEvent event) { + Enumeration adverts = event.getResponse().getAdvertisements(); + while (adverts.hasMoreElements()) { + AdvertisementBridge adv = (AdvertisementBridge) adverts.nextElement(); + if (adv.getAdvertisement().getClass().equals(EstablisherAdvertisement.class)) { + EstablisherAdvertisementInterface c = (EstablisherAdvertisementInterface) adv.getAdvertisement(); + // If the field on which to listen is the title, then we check its validity + if (!field.equals("title") || c.getTitle().equals(value)) + l.notify(c.getTitle(), c.getContract(), c.getKey()); + } + } + } + }; + this.addAdvertisementListener(dl); + + // Search in remote adverts + this.search(field, value, new SearchListener() { + @Override + public void notify(Collection adverts) { + for (EstablisherAdvertisementInterface adv : adverts) { + l.notify(adv.getTitle(), adv.getContract(), adv.getKey()); + } + } + }); + + // Search in local adverts + try { + Enumeration adverts = pg.getDiscoveryService().getLocalAdvertisements(DiscoveryService.ADV, field, value); + while (adverts.hasMoreElements()) { + AdvertisementBridge adv = (AdvertisementBridge) adverts.nextElement(); + if (adv.getAdvertisement().getClass().equals(EstablisherAdvertisement.class)) { + EstablisherAdvertisementInterface c = (EstablisherAdvertisementInterface) adv.getAdvertisement(); + // If the field on which to listen is the title, then we check its validity + if (!field.equals("title") || c.getTitle().equals(value)) { + l.notify(c.getTitle(), c.getContract(), c.getKey()); + } + } + } + } catch (IOException e) { + e.printStackTrace(); + } + + // Add listeners in the hashmap to be able to delete it and enable it + establisherServiceListeners.put(listenerId, new ListenerWithParam(value, l)); + advertisementListeners.put(listenerId, dl); + } + + // Remove any listener (message and Advertisement) with the given id + @Override + public void removeListener(String listenerId) { + if (advertisementListeners.containsKey(listenerId)) { + this.removeAdvertisementListener(advertisementListeners.get(listenerId)); + advertisementListeners.remove(listenerId); + } + if (establisherServiceListeners.containsKey(listenerId)) { + establisherServiceListeners.remove(listenerId); + } else { + super.removeListener(listenerId); + } + } + + ; + + // Local listener (to be able to notify local users connected if this peer send an advertisement) + private class ListenerWithParam { + public final String param; + public final EstablisherServiceListener listener; + + public ListenerWithParam(String p, EstablisherServiceListener l) { + this.param = p; + this.listener = l; + } + } + } diff --git a/src/main/java/network/impl/jxta/JxtaItemService.java b/src/main/java/network/impl/jxta/JxtaItemService.java index 86d64348..04c8dd76 100644 --- a/src/main/java/network/impl/jxta/JxtaItemService.java +++ b/src/main/java/network/impl/jxta/JxtaItemService.java @@ -3,14 +3,16 @@ import network.api.ItemService; import network.api.SearchListener; -public class JxtaItemService extends JxtaService implements ItemService{ - public static final String NAME = "items"; - public JxtaItemService() { - this.name = NAME; - } - @Override - public void search(String attribute, String value, SearchListener sl) { - super.search(attribute, value, sl); - } - +public class JxtaItemService extends JxtaService implements ItemService { + public static final String NAME = "items"; + + public JxtaItemService() { + this.name = NAME; + } + + @Override + public void search(String attribute, String value, SearchListener sl) { + super.search(attribute, value, sl); + } + } diff --git a/src/main/java/network/impl/jxta/JxtaItemsSenderService.java b/src/main/java/network/impl/jxta/JxtaItemsSenderService.java index 6f813c6a..a3911d02 100644 --- a/src/main/java/network/impl/jxta/JxtaItemsSenderService.java +++ b/src/main/java/network/impl/jxta/JxtaItemsSenderService.java @@ -1,9 +1,6 @@ package network.impl.jxta; -import java.util.Collection; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import model.entity.Item; import model.syncManager.ItemSyncManagerImpl; @@ -13,48 +10,51 @@ import network.impl.MessagesGeneric; import network.impl.messages.RequestItemMessage; -public class JxtaItemsSenderService extends JxtaService implements ItemRequestService{ - public static final String NAME = "itemsSender"; - - public JxtaItemsSenderService() { - this.name = NAME; - } - - private Messages getResponseMessage(Messages msg) { - MessagesGeneric m = new MessagesGeneric(); - - m.addField("type", "response"); - m.setWho(msg.getWho()); - ItemSyncManagerImpl im = new ItemSyncManagerImpl(); - Collection items = im.findAllByAttribute("title", msg.getMessage("title")); - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - m.addField("items", json.toJson(items)); - - im.close(); - return m; - } - - @Override - public void sendRequest(String title, String who, String ...peerURIs) { - - RequestItemMessage m = new RequestItemMessage(); - m.setTitle(title); - m.setWho(who); - m.setSource(this.peerUri); - this.sendMessages(m, peerURIs); - } - - @Override - public void pipeMsgEvent(PipeMsgEvent event) { - - Messages message = toMessages(event.getMessage()); - - if(message.getMessage("type").equals("response")) { - super.pipeMsgEvent(event); - return; - } - - this.sendMessages(getResponseMessage(message), message.getMessage("source")); - - } +import java.util.Collection; + +public class JxtaItemsSenderService extends JxtaService implements ItemRequestService { + public static final String NAME = "itemsSender"; + + public JxtaItemsSenderService() { + this.name = NAME; + } + + private Messages getResponseMessage(Messages msg) { + MessagesGeneric m = new MessagesGeneric(); + + m.addField("type", "response"); + m.setWho(msg.getWho()); + ItemSyncManagerImpl im = new ItemSyncManagerImpl(); + Collection items = im.findAllByAttribute("title", msg.getMessage("title")); + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + m.addField("items", json.toJson(items)); + + im.close(); + return m; + } + + @Override + public void sendRequest(String title, String who, String... peerURIs) { + + RequestItemMessage m = new RequestItemMessage(); + m.setTitle(title); + m.setWho(who); + m.setSource(this.peerUri); + this.sendMessages(m, peerURIs); + } + + @Override + public void pipeMsgEvent(PipeMsgEvent event) { + + Messages message = toMessages(event.getMessage()); + + if (message.getMessage("type").equals("response")) { + super.pipeMsgEvent(event); + return; + } + + this.sendMessages(getResponseMessage(message), message.getMessage("source")); + + } } diff --git a/src/main/java/network/impl/jxta/JxtaMessageSenderService.java b/src/main/java/network/impl/jxta/JxtaMessageSenderService.java index e7077069..36751f4b 100644 --- a/src/main/java/network/impl/jxta/JxtaMessageSenderService.java +++ b/src/main/java/network/impl/jxta/JxtaMessageSenderService.java @@ -1,13 +1,6 @@ package network.impl.jxta; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Hashtable; - -import javax.print.attribute.standard.RequestingUserName; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import model.api.MessageSyncManager; import model.entity.Message; @@ -18,82 +11,86 @@ import network.impl.MessagesGeneric; import network.impl.messages.RequestMessageUserMessage; -public class JxtaMessageSenderService extends JxtaService implements MessageRequestService{ - - public static final String NAME = "messagesSender"; - - public JxtaMessageSenderService() { - this.name = NAME; - } - - @Override - public void sendRequest(String receiverId, String who, String ...uris) { - - RequestMessageUserMessage m = new RequestMessageUserMessage(); - - m.setSenderId(receiverId); - - m.setReceiverId(receiverId); - - m.setWho(who); - - m.setSource(this.peerUri); - - this.sendMessages(m, uris); - } - - @Override - public void sendRequest(String senderId, String receiverId, String who, String ...uris) { - - RequestMessageUserMessage m = new RequestMessageUserMessage(); - - m.setSenderId(senderId); - - m.setReceiverId(receiverId); - - m.setWho(who); - - m.setSource(this.peerUri); - - this.sendMessages(m, uris); - } - - private Messages getResponseMessage(Messages msg) { - - MessagesGeneric m = new MessagesGeneric(); - - m.setWho(msg.getWho()); - - m.addField("type", "response"); - - MessageSyncManager em = SyncManagerFactory.createMessageSyncManager(); - - ArrayList messages = new ArrayList<>(); - - messages.addAll(em.findAllByAttribute("senderId", msg.getMessage("senderId"))); - messages.addAll(em.findAllByAttribute("receiverId", msg.getMessage("receiverId"))); - - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - - m.addField("messages", json.toJson(messages)); - - em.close(); - - return m; - } - - - @Override - public void pipeMsgEvent(PipeMsgEvent event) { - - Messages message = toMessages(event.getMessage()); - - if(message.getMessage("type").equals("response")) { - - super.pipeMsgEvent(event); - return; - } - - this.sendMessages(getResponseMessage(message), message.getMessage("source")); - } +import java.util.ArrayList; +import java.util.Collection; + +public class JxtaMessageSenderService extends JxtaService implements MessageRequestService { + + public static final String NAME = "messagesSender"; + + public JxtaMessageSenderService() { + this.name = NAME; + } + + @Override + public void sendRequest(String receiverId, String who, String... uris) { + + RequestMessageUserMessage m = new RequestMessageUserMessage(); + + m.setSenderId(receiverId); + + m.setReceiverId(receiverId); + + m.setWho(who); + + m.setSource(this.peerUri); + + this.sendMessages(m, uris); + } + + @Override + public void sendRequest(String senderId, String receiverId, String who, String... uris) { + + RequestMessageUserMessage m = new RequestMessageUserMessage(); + + m.setSenderId(senderId); + + m.setReceiverId(receiverId); + + m.setWho(who); + + m.setSource(this.peerUri); + + this.sendMessages(m, uris); + } + + private Messages getResponseMessage(Messages msg) { + + MessagesGeneric m = new MessagesGeneric(); + + m.setWho(msg.getWho()); + + m.addField("type", "response"); + + MessageSyncManager em = SyncManagerFactory.createMessageSyncManager(); + + ArrayList messages = new ArrayList<>(); + + messages.addAll(em.findAllByAttribute("senderId", msg.getMessage("senderId"))); + messages.addAll(em.findAllByAttribute("receiverId", msg.getMessage("receiverId"))); + + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + + m.addField("messages", json.toJson(messages)); + + em.close(); + + return m; + } + + + @Override + public void pipeMsgEvent(PipeMsgEvent event) { + + Messages message = toMessages(event.getMessage()); + + if (message.getMessage("type").equals("response")) { + + super.pipeMsgEvent(event); + return; + } + + this.sendMessages(getResponseMessage(message), message.getMessage("source")); + } } diff --git a/src/main/java/network/impl/jxta/JxtaMessageService.java b/src/main/java/network/impl/jxta/JxtaMessageService.java index 3be161ce..27d744eb 100644 --- a/src/main/java/network/impl/jxta/JxtaMessageService.java +++ b/src/main/java/network/impl/jxta/JxtaMessageService.java @@ -3,18 +3,18 @@ import network.api.SearchListener; import network.api.UserService; -public class JxtaMessageService extends JxtaService implements UserService{ - - public static final String NAME = "messages"; - - public JxtaMessageService() { - this.name = NAME; - } - - @Override - public void search(String attribute, String value, SearchListener sl) { - super.search(attribute, value, sl); - } - - +public class JxtaMessageService extends JxtaService implements UserService { + + public static final String NAME = "messages"; + + public JxtaMessageService() { + this.name = NAME; + } + + @Override + public void search(String attribute, String value, SearchListener sl) { + super.search(attribute, value, sl); + } + + } diff --git a/src/main/java/network/impl/jxta/JxtaNode.java b/src/main/java/network/impl/jxta/JxtaNode.java index 384d029e..52a3ef27 100644 --- a/src/main/java/network/impl/jxta/JxtaNode.java +++ b/src/main/java/network/impl/jxta/JxtaNode.java @@ -1,8 +1,5 @@ package network.impl.jxta; -import java.io.File; -import java.io.IOException; - import controller.Application; import controller.tools.LoggerUtilities; import net.jxta.exception.PeerGroupException; @@ -15,189 +12,192 @@ import network.api.Node; import network.utils.IpChecker; +import java.io.File; +import java.io.IOException; + /** * Default JXTA Node implementation. Represent the server node. * When successfully started, yield an Advertisement that represent this node. - * @see Node + * * @author Julien Prudhomme + * @see Node */ -public class JxtaNode implements Node{ - - private int port; - - public JxtaNode(){ - this.port = Application.jxtaPort; - } - public JxtaNode(int port){ - this.port = port; - } - - private NetworkManager networkManager = null; - private boolean initialized = false; - private PeerGroup defaultPeerGroup = null; - - @Override - public void initialize(String cacheFolder, String name, boolean persistant) throws IOException { - File configFile = new File("." + System.getProperty("file.separator") + cacheFolder); /* file used by the networkManager */ - networkManager = initializeNetworkManager(configFile, name, persistant); - //no errors - initialized = true; - } - - public NetworkManager getNetworkManager() { - return networkManager; - } - - @Override - public boolean isInitialized() { - return initialized; - } - - @Override - public void start(int port) throws IOException, PeerGroupException { - if(!initialized) { - throw new RuntimeException("Node must be initalized before start call"); - } - try { - NetworkConfigurator configurator = networkManager.getConfigurator(); - configurator.setTcpPort(port); - configurator.setHttpPort(port + 1); - PeerGroup pg = networkManager.startNetwork(); - pg.startApp(new String[0]); - //Switch to rendez vous mode if possible, check every 60 secs - //pg.getRendezVousService().setAutoStart(true,15*1000); - pg.getRendezVousService().setAutoStart(true); - - } catch (IOException e) { - throw(e); - } catch (PeerGroupException e) { - throw new PeerGroupException("error while creating main peer group", e); - } - - createDefaultGroup(); - - } - - @Override - public boolean isStarted() { - return isInitialized() && networkManager.isStarted(); - } - - /** - * Initialize the network manager - * @param configFile - * @param peerName - * @param persistant - * @return - * @throws IOException - */ - private NetworkManager initializeNetworkManager(File configFile, String peerName, boolean persistant) throws IOException { - NetworkManager manager = null; - NetworkConfigurator configurator = null; - manager = new NetworkManager(NetworkManager.ConfigMode.RENDEZVOUS, peerName, configFile.toURI()); /* Setting network */ - configurator = manager.getConfigurator(); /* Getting configurator for future tweaks */ +public class JxtaNode implements Node { + + private int port; + private NetworkManager networkManager = null; + private boolean initialized = false; + private PeerGroup defaultPeerGroup = null; + public JxtaNode() { + this.port = Application.jxtaPort; + } + public JxtaNode(int port) { + this.port = port; + } + + @Override + public void initialize(String cacheFolder, String name, boolean persistant) throws IOException { + File configFile = new File("." + System.getProperty("file.separator") + cacheFolder); /* file used by the networkManager */ + networkManager = initializeNetworkManager(configFile, name, persistant); + //no errors + initialized = true; + } + + public NetworkManager getNetworkManager() { + return networkManager; + } + + @Override + public boolean isInitialized() { + return initialized; + } + + @Override + public void start(int port) throws IOException, PeerGroupException { + if (!initialized) { + throw new RuntimeException("Node must be initalized before start call"); + } + try { + NetworkConfigurator configurator = networkManager.getConfigurator(); + configurator.setTcpPort(port); + configurator.setHttpPort(port + 1); + PeerGroup pg = networkManager.startNetwork(); + pg.startApp(new String[0]); + //Switch to rendez vous mode if possible, check every 60 secs + //pg.getRendezVousService().setAutoStart(true,15*1000); + pg.getRendezVousService().setAutoStart(true); + + } catch (IOException e) { + throw (e); + } catch (PeerGroupException e) { + throw new PeerGroupException("error while creating main peer group", e); + } + + createDefaultGroup(); + + } + + @Override + public boolean isStarted() { + return isInitialized() && networkManager.isStarted(); + } + + /** + * Initialize the network manager + * + * @param configFile + * @param peerName + * @param persistant + * @return + * @throws IOException + */ + private NetworkManager initializeNetworkManager(File configFile, String peerName, boolean persistant) throws IOException { + NetworkManager manager = null; + NetworkConfigurator configurator = null; + manager = new NetworkManager(NetworkManager.ConfigMode.RENDEZVOUS, peerName, configFile.toURI()); /* Setting network */ + configurator = manager.getConfigurator(); /* Getting configurator for future tweaks */ configurator.setTcpEnabled(true); configurator.setHttpEnabled(true); configurator.setTcpIncoming(true); configurator.setHttpIncoming(true); configurator.setHttpOutgoing(true); configurator.setTcpOutgoing(true); - + configurator.setUseMulticast(true); - configurator.setTcpInterfaceAddress("0.0.0.0"); - configurator.setUseMulticast(true); - - try { - - configurator.setTcpPublicAddress(IpChecker.getIp()+":" + this.port, false); - - } catch (Exception e) { - // TODO Auto-generated catch block - LoggerUtilities.logStackTrace(e); - } - configurator.setHttpInterfaceAddress("0.0.0.0"); - try { - - configurator.setHttpPublicAddress(IpChecker.getIp()+":" + (this.port+1), false); - - } catch (Exception e) { - // TODO Auto-generated catch block - LoggerUtilities.logStackTrace(e); - } - + configurator.setTcpInterfaceAddress("0.0.0.0"); + configurator.setUseMulticast(true); + + try { + + configurator.setTcpPublicAddress(IpChecker.getIp() + ":" + this.port, false); + + } catch (Exception e) { + // TODO Auto-generated catch block + LoggerUtilities.logStackTrace(e); + } + configurator.setHttpInterfaceAddress("0.0.0.0"); + try { + + configurator.setHttpPublicAddress(IpChecker.getIp() + ":" + (this.port + 1), false); + + } catch (Exception e) { + // TODO Auto-generated catch block + LoggerUtilities.logStackTrace(e); + } + configurator.setTcpEndPort(-1); configurator.setTcpStartPort(-1); - - + + configurator.setName("SXPeerGroup"); configurator.setDescription("SXP default peer group"); configurator.setPrincipal("SXP peer group"); manager.setConfigPersistent(persistant); - return manager; - } - - @Override - public void stop() { - if(networkManager == null) { - throw new RuntimeException("Serveur was not started !"); - } - networkManager.stopNetwork(); - } - - protected PeerGroup getDefaultPeerGroup() { - return this.defaultPeerGroup; - } - - private PeerGroupID generatePeerGroupID(PeerGroupID parent, String peerGroupName) { - return IDFactory.newPeerGroupID(PeerGroupID.defaultNetPeerGroupID, peerGroupName.getBytes()); - } - - private void createDefaultGroup() { - try { - PeerGroup netpeerGroup = networkManager.getNetPeerGroup(); - - ModuleImplAdvertisement madv = null; - try { - madv = netpeerGroup.getAllPurposePeerGroupImplAdvertisement(); - } catch(Exception e) { - LoggerUtilities.logStackTrace(e); - } - - defaultPeerGroup = netpeerGroup.newGroup(this.generatePeerGroupID(netpeerGroup.getPeerGroupID(), "SXP group"), - madv, "SXP group", "SXP group", true); - defaultPeerGroup.startApp(new String[0]); - - //defaultPeerGroup.getRendezVousService().setAutoStart(true, 15*1000); - defaultPeerGroup.getRendezVousService().setAutoStart(true); - - } catch (PeerGroupException e) { - System.err.println("impossible to create default group"); - LoggerUtilities.logStackTrace(e); - System.exit(-1); - } catch (Exception e) { - LoggerUtilities.logStackTrace(e); - } - System.out.println("Group created !"); - } - - protected PeerGroup createGroup(final String name) { - ModuleImplAdvertisement mAdv = null; - PeerGroup temp = null; - System.out.println("creating new group .."); - try { - mAdv = defaultPeerGroup.getAllPurposePeerGroupImplAdvertisement(); - temp = defaultPeerGroup.newGroup(generatePeerGroupID(defaultPeerGroup.getPeerGroupID(), name), mAdv, name, name, true); /* creating & publishing the group */ - getDefaultPeerGroup().getDiscoveryService().remotePublish(temp.getPeerGroupAdvertisement()); - temp.startApp(new String[0]); - //temp.getRendezVousService().setAutoStart(true, 15*1000); - temp.getRendezVousService().setAutoStart(true); - } catch (Exception e) { - LoggerUtilities.logStackTrace(e); - } /* Getting the advertisement of implemented modules */ - return temp; - } - - public String getPeerId() { - return this.defaultPeerGroup.getPeerID().toURI().toString(); - } + return manager; + } + + @Override + public void stop() { + if (networkManager == null) { + throw new RuntimeException("Serveur was not started !"); + } + networkManager.stopNetwork(); + } + + protected PeerGroup getDefaultPeerGroup() { + return this.defaultPeerGroup; + } + + private PeerGroupID generatePeerGroupID(PeerGroupID parent, String peerGroupName) { + return IDFactory.newPeerGroupID(PeerGroupID.defaultNetPeerGroupID, peerGroupName.getBytes()); + } + + private void createDefaultGroup() { + try { + PeerGroup netpeerGroup = networkManager.getNetPeerGroup(); + + ModuleImplAdvertisement madv = null; + try { + madv = netpeerGroup.getAllPurposePeerGroupImplAdvertisement(); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } + + defaultPeerGroup = netpeerGroup.newGroup(this.generatePeerGroupID(netpeerGroup.getPeerGroupID(), "SXP group"), + madv, "SXP group", "SXP group", true); + defaultPeerGroup.startApp(new String[0]); + + //defaultPeerGroup.getRendezVousService().setAutoStart(true, 15*1000); + defaultPeerGroup.getRendezVousService().setAutoStart(true); + + } catch (PeerGroupException e) { + System.err.println("impossible to create default group"); + LoggerUtilities.logStackTrace(e); + System.exit(-1); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } + System.out.println("Group created !"); + } + + protected PeerGroup createGroup(final String name) { + ModuleImplAdvertisement mAdv = null; + PeerGroup temp = null; + System.out.println("creating new group .."); + try { + mAdv = defaultPeerGroup.getAllPurposePeerGroupImplAdvertisement(); + temp = defaultPeerGroup.newGroup(generatePeerGroupID(defaultPeerGroup.getPeerGroupID(), name), mAdv, name, name, true); /* creating & publishing the group */ + getDefaultPeerGroup().getDiscoveryService().remotePublish(temp.getPeerGroupAdvertisement()); + temp.startApp(new String[0]); + //temp.getRendezVousService().setAutoStart(true, 15*1000); + temp.getRendezVousService().setAutoStart(true); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } /* Getting the advertisement of implemented modules */ + return temp; + } + + public String getPeerId() { + return this.defaultPeerGroup.getPeerID().toURI().toString(); + } } \ No newline at end of file diff --git a/src/main/java/network/impl/jxta/JxtaPeer.java b/src/main/java/network/impl/jxta/JxtaPeer.java index 438e3ace..dd1d8c9b 100644 --- a/src/main/java/network/impl/jxta/JxtaPeer.java +++ b/src/main/java/network/impl/jxta/JxtaPeer.java @@ -1,84 +1,78 @@ package network.impl.jxta; -import java.io.IOException; -import java.net.URI; -import java.util.Collection; -import java.util.HashMap; - import controller.tools.LoggerUtilities; -import net.jxta.discovery.DiscoveryEvent; -import net.jxta.discovery.DiscoveryListener; -import net.jxta.discovery.DiscoveryService; -import net.jxta.endpoint.EndpointAddress; -import net.jxta.endpoint.EndpointService; -import net.jxta.endpoint.Message; import net.jxta.exception.PeerGroupException; -import net.jxta.peergroup.PeerGroup; import net.jxta.platform.NetworkManager; import network.api.Peer; import network.api.service.InvalidServiceException; import network.api.service.Service; import network.utils.IpChecker; -public class JxtaPeer implements Peer{ - - private JxtaNode node; - private HashMap services; - - /** - * Create a new Peer (Jxta implementation) - */ - public JxtaPeer() { - node = new JxtaNode(); - services = new HashMap<>(); - } - public JxtaPeer(int port) { - node = new JxtaNode(port); - services = new HashMap<>(); - } - - @Override - public void start(String cache, int port, String ...bootstrap) throws IOException, PeerGroupException, RuntimeException { - node.initialize(cache, "sxp peer", true); - this.bootstrap(bootstrap); - node.start(port); - } - - @Override - public void stop() { - node.stop(); - } - - @Override - public String getIp() { - try { - return IpChecker.getIp(); - } catch (Exception e) { - LoggerUtilities.logStackTrace(e); - } - return null; - } - - @Override - public Collection getServices() { - return services.values(); - } - - @Override - public Service getService(String name) { - return services.get(name); - } - - @Override - public void addService(Service service) throws InvalidServiceException { - if (service.getName() == null || service.getName().isEmpty()){ - throw new InvalidServiceException("Service name is empty"); - } - JxtaService s = (JxtaService) service; - services.put(service.getName(), service); - s.setPeerGroup(node.createGroup(service.getName())); - } - +import java.io.IOException; +import java.net.URI; +import java.util.Collection; +import java.util.HashMap; + +public class JxtaPeer implements Peer { + + private JxtaNode node; + private HashMap services; + + /** + * Create a new Peer (Jxta implementation) + */ + public JxtaPeer() { + node = new JxtaNode(); + services = new HashMap<>(); + } + + public JxtaPeer(int port) { + node = new JxtaNode(port); + services = new HashMap<>(); + } + + @Override + public void start(String cache, int port, String... bootstrap) throws IOException, PeerGroupException, RuntimeException { + node.initialize(cache, "sxp peer", true); + this.bootstrap(bootstrap); + node.start(port); + } + + @Override + public void stop() { + node.stop(); + } + + @Override + public String getIp() { + try { + return IpChecker.getIp(); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } + return null; + } + + @Override + public Collection getServices() { + return services.values(); + } + + @Override + public Service getService(String name) { + return services.get(name); + } + + @Override + public void addService(Service service) throws InvalidServiceException { + if (service.getName() == null || service.getName().isEmpty()) { + throw new InvalidServiceException("Service name is empty"); + } + JxtaService s = (JxtaService) service; + services.put(service.getName(), service); + s.setPeerGroup(node.createGroup(service.getName())); + } + // public static void main(String[] args) { // JxtaPeer peer = new JxtaPeer(); // try { @@ -89,26 +83,26 @@ public void addService(Service service) throws InvalidServiceException { // } // } - @Override - public String getUri() { - return node.getPeerId(); - } - - @Override - public void bootstrap(String... ips) { - NetworkManager networkManager = node.getNetworkManager(); - for(String ip : ips) { - URI theSeed = URI.create(ip); - - try { - System.out.println("server added :" + theSeed); - networkManager.getConfigurator().addSeedRendezvous(theSeed); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - } - } - - - } + @Override + public String getUri() { + return node.getPeerId(); + } + + @Override + public void bootstrap(String... ips) { + NetworkManager networkManager = node.getNetworkManager(); + for (String ip : ips) { + URI theSeed = URI.create(ip); + + try { + System.out.println("server added :" + theSeed); + networkManager.getConfigurator().addSeedRendezvous(theSeed); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + } + } + + + } } diff --git a/src/main/java/network/impl/jxta/JxtaService.java b/src/main/java/network/impl/jxta/JxtaService.java index 841d5306..254bc674 100644 --- a/src/main/java/network/impl/jxta/JxtaService.java +++ b/src/main/java/network/impl/jxta/JxtaService.java @@ -1,16 +1,5 @@ package network.impl.jxta; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; - -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; - import controller.tools.LoggerUtilities; import net.jxta.discovery.DiscoveryEvent; import net.jxta.discovery.DiscoveryListener; @@ -23,11 +12,7 @@ import net.jxta.id.IDFactory; import net.jxta.peer.PeerID; import net.jxta.peergroup.PeerGroup; -import net.jxta.pipe.OutputPipe; -import net.jxta.pipe.PipeID; -import net.jxta.pipe.PipeMsgEvent; -import net.jxta.pipe.PipeMsgListener; -import net.jxta.pipe.PipeService; +import net.jxta.pipe.*; import net.jxta.protocol.PipeAdvertisement; import network.api.Messages; import network.api.Peer; @@ -37,207 +22,217 @@ import network.api.service.InvalidServiceException; import network.api.service.Service; import network.impl.MessagesGeneric; -import network.impl.advertisement.ItemAdvertisement; -import network.impl.advertisement.UserAdvertisement; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; /** * This is the Jxta implementation of {@link Service} - * @see Peer - * @author Julien Prudhomme * + * @author Julien Prudhomme + * @see Peer */ -public class JxtaService implements Service, DiscoveryListener, PipeMsgListener{ - @SuppressWarnings("unused") - private final static Logger log = LogManager.getLogger(JxtaService.class); - - protected PeerGroup pg = null; - private SearchListener currentSl; - protected String name; - protected String peerUri = null; - protected HashMap listeners = new HashMap<>(); - - /** - * {@inheritDoc} - */ - @Override - public String getName() { - return name; - } - - - /** - * {@inheritDoc} - */ - @Override - public void publishAdvertisement(Advertisement adv) { - JxtaAdvertisement jxtaAdv = new JxtaAdvertisement(adv); - try { - pg.getDiscoveryService().publish(jxtaAdv.getJxtaAdvertisementBridge()); - pg.getDiscoveryService().remotePublish(jxtaAdv.getJxtaAdvertisementBridge()); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - throw new RuntimeException(e); - } - } - - /** - * {@inheritDoc} - * @throws InvalidServiceException - */ - @Override - public void initAndStart(Peer peer) throws RuntimeException, InvalidServiceException{ - if(!(peer instanceof JxtaPeer)) { - throw new RuntimeException("Need a Jxta Peer to run a Jxta service"); - } - JxtaPeer jxtaPeer = (JxtaPeer) peer; - jxtaPeer.addService(this); - peerUri = peer.getUri(); - - createInputPipe(); - } - - private void createInputPipe() { - try { - pg.getPipeService().createInputPipe(getAdvertisement(), this); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - throw new RuntimeException(e); - } - } - - protected void setPeerGroup(PeerGroup pg) { - this.pg = pg; - } - - /** - * {@inheritDoc} - */ - @SuppressWarnings("unchecked") - @Override - public void search(String attribute, String value, SearchListener sl) { - this.currentSl = (SearchListener) sl; - pg.getDiscoveryService().getRemoteAdvertisements(null, DiscoveryService.ADV, attribute, value, 10, this); - } - - /** - * {@inheritDoc} - */ - @Override - public void discoveryEvent(DiscoveryEvent event) { - Enumeration advs = event.getResponse().getAdvertisements(); - ArrayList advertisements = new ArrayList<>(); - while(advs.hasMoreElements()) { - AdvertisementBridge adv = (AdvertisementBridge) advs.nextElement(); - Advertisement fadv = adv.getAdvertisement(); - fadv.setSourceURI("urn:jxta:" + event.getSource().toString().substring(7)); - - advertisements.add(adv.getAdvertisement()); - } - currentSl.notify(advertisements); - } - - /** - * Create a simple advertisement for the pipes' class. - * @return - */ - protected PipeAdvertisement getAdvertisement() { - return getPipeAdvertisement(IDFactory - .newPipeID(pg.getPeerGroupID(), this.getClass().getName().getBytes()), false); - } - - protected PipeAdvertisement getPipeAdvertisement(PipeID id, boolean is_multicast) { - PipeAdvertisement adv = (PipeAdvertisement )AdvertisementFactory. - newAdvertisement(PipeAdvertisement.getAdvertisementType()); +public class JxtaService implements Service, DiscoveryListener, PipeMsgListener { + @SuppressWarnings("unused") + private final static Logger log = LogManager.getLogger(JxtaService.class); + + protected PeerGroup pg = null; + protected String name; + protected String peerUri = null; + protected HashMap listeners = new HashMap<>(); + private SearchListener currentSl; + + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return name; + } + + + /** + * {@inheritDoc} + */ + @Override + public void publishAdvertisement(Advertisement adv) { + JxtaAdvertisement jxtaAdv = new JxtaAdvertisement(adv); + try { + pg.getDiscoveryService().publish(jxtaAdv.getJxtaAdvertisementBridge()); + pg.getDiscoveryService().remotePublish(jxtaAdv.getJxtaAdvertisementBridge()); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + throw new RuntimeException(e); + } + } + + /** + * {@inheritDoc} + * + * @throws InvalidServiceException + */ + @Override + public void initAndStart(Peer peer) throws RuntimeException, InvalidServiceException { + if (!(peer instanceof JxtaPeer)) { + throw new RuntimeException("Need a Jxta Peer to run a Jxta service"); + } + JxtaPeer jxtaPeer = (JxtaPeer) peer; + jxtaPeer.addService(this); + peerUri = peer.getUri(); + + createInputPipe(); + } + + private void createInputPipe() { + try { + pg.getPipeService().createInputPipe(getAdvertisement(), this); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + throw new RuntimeException(e); + } + } + + protected void setPeerGroup(PeerGroup pg) { + this.pg = pg; + } + + /** + * {@inheritDoc} + */ + @SuppressWarnings("unchecked") + @Override + public void search(String attribute, String value, SearchListener sl) { + this.currentSl = (SearchListener) sl; + pg.getDiscoveryService().getRemoteAdvertisements(null, DiscoveryService.ADV, attribute, value, 10, this); + } + + /** + * {@inheritDoc} + */ + @Override + public void discoveryEvent(DiscoveryEvent event) { + Enumeration advs = event.getResponse().getAdvertisements(); + ArrayList advertisements = new ArrayList<>(); + while (advs.hasMoreElements()) { + AdvertisementBridge adv = (AdvertisementBridge) advs.nextElement(); + Advertisement fadv = adv.getAdvertisement(); + fadv.setSourceURI("urn:jxta:" + event.getSource().toString().substring(7)); + + advertisements.add(adv.getAdvertisement()); + } + currentSl.notify(advertisements); + } + + /** + * Create a simple advertisement for the pipes' class. + * + * @return + */ + protected PipeAdvertisement getAdvertisement() { + return getPipeAdvertisement(IDFactory + .newPipeID(pg.getPeerGroupID(), this.getClass().getName().getBytes()), false); + } + + protected PipeAdvertisement getPipeAdvertisement(PipeID id, boolean is_multicast) { + PipeAdvertisement adv = (PipeAdvertisement) AdvertisementFactory. + newAdvertisement(PipeAdvertisement.getAdvertisementType()); adv.setPipeID(id); if (is_multicast) - adv.setType(PipeService.PropagateType); - else - adv.setType(PipeService.UnicastType); - - - adv.setName("Pipe_"+this.getName()); + adv.setType(PipeService.PropagateType); + else + adv.setType(PipeService.UnicastType); + + + adv.setName("Pipe_" + this.getName()); adv.setDescription("..."); return adv; } - protected Message toJxtaMessage(Messages m) { - Message msg = new Message(); - - for(String s: m.getNames()) { - msg.addMessageElement(new ByteArrayMessageElement(s, null, m.getMessage(s).getBytes(), null)); - } - - //msg.addMessageElement(new ByteArrayMessageElement("WHO", null, m.getWho().getBytes(), null)); - return msg; - } - - protected Messages toMessages(Message m) { - MessagesGeneric msg = new MessagesGeneric(); - ElementIterator it = m.getMessageElements(); - while(it.hasNext()) { - MessageElement e = it.next(); - if(e.getElementName().equals("WHO")) { - msg.setWho(new String(e.getBytes(true))); - } else { - msg.addField(e.getElementName(), new String(e.getBytes(true))); - } - } - return msg; - } - - - @Override - public void sendMessages(Messages messages, String... uris) { - - Message message = toJxtaMessage(messages); - HashSet to = new HashSet(); - for(String pidUri: uris) { - try { - PeerID pid = PeerID.create(new URI(pidUri)); - to.add(pid); - } catch (URISyntaxException e) { - LoggerUtilities.logStackTrace(e); - throw new RuntimeException(e); - } - } - try { - OutputPipe pipe = pg.getPipeService().createOutputPipe(getAdvertisement(), to, 3000); - pipe.send(message); - pipe.close(); - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - throw new RuntimeException(e); - } - } - - - @Override - public void pipeMsgEvent(PipeMsgEvent event) { - Messages m = toMessages(event.getMessage()); - if(listeners.get(m.getWho()) != null) { - listeners.get(m.getWho()).notify(m); - } - } - - - @Override - public void addListener(ServiceListener l, String who) { - listeners.put(who, l); - } - - @Override - public void removeListener(String who) { - listeners.remove(who); - } - - @Override - public void addAdvertisementListener(DiscoveryListener l){ - pg.getDiscoveryService().addDiscoveryListener(l); - } - - @Override - public void removeAdvertisementListener(DiscoveryListener l){ - pg.getDiscoveryService().removeDiscoveryListener(l); - } - + protected Message toJxtaMessage(Messages m) { + Message msg = new Message(); + + for (String s : m.getNames()) { + msg.addMessageElement(new ByteArrayMessageElement(s, null, m.getMessage(s).getBytes(), null)); + } + + //msg.addMessageElement(new ByteArrayMessageElement("WHO", null, m.getWho().getBytes(), null)); + return msg; + } + + protected Messages toMessages(Message m) { + MessagesGeneric msg = new MessagesGeneric(); + ElementIterator it = m.getMessageElements(); + while (it.hasNext()) { + MessageElement e = it.next(); + if (e.getElementName().equals("WHO")) { + msg.setWho(new String(e.getBytes(true))); + } else { + msg.addField(e.getElementName(), new String(e.getBytes(true))); + } + } + return msg; + } + + + @Override + public void sendMessages(Messages messages, String... uris) { + + Message message = toJxtaMessage(messages); + HashSet to = new HashSet(); + for (String pidUri : uris) { + try { + PeerID pid = PeerID.create(new URI(pidUri)); + to.add(pid); + } catch (URISyntaxException e) { + LoggerUtilities.logStackTrace(e); + throw new RuntimeException(e); + } + } + try { + OutputPipe pipe = pg.getPipeService().createOutputPipe(getAdvertisement(), to, 3000); + pipe.send(message); + pipe.close(); + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + throw new RuntimeException(e); + } + } + + + @Override + public void pipeMsgEvent(PipeMsgEvent event) { + Messages m = toMessages(event.getMessage()); + if (listeners.get(m.getWho()) != null) { + listeners.get(m.getWho()).notify(m); + } + } + + + @Override + public void addListener(ServiceListener l, String who) { + listeners.put(who, l); + } + + @Override + public void removeListener(String who) { + listeners.remove(who); + } + + @Override + public void addAdvertisementListener(DiscoveryListener l) { + pg.getDiscoveryService().addDiscoveryListener(l); + } + + @Override + public void removeAdvertisementListener(DiscoveryListener l) { + pg.getDiscoveryService().removeDiscoveryListener(l); + } + } diff --git a/src/main/java/network/impl/jxta/JxtaSyncSearch.java b/src/main/java/network/impl/jxta/JxtaSyncSearch.java index 67d761cb..1c2226e4 100644 --- a/src/main/java/network/impl/jxta/JxtaSyncSearch.java +++ b/src/main/java/network/impl/jxta/JxtaSyncSearch.java @@ -1,39 +1,39 @@ package network.impl.jxta; -import java.util.ArrayList; -import java.util.Collection; - import controller.tools.LoggerUtilities; import network.api.Search; import network.api.SearchListener; import network.api.advertisement.Advertisement; import network.api.service.Service; -public class JxtaSyncSearch implements Search, SearchListener{ - - private Service s; - private ArrayList results = new ArrayList<>(); - - @Override - public void initialize(Service s) { - this.s = s; - } - - @Override - public Collection search(String attribute, String value) { - s.search(attribute, value, this); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - LoggerUtilities.logStackTrace(e); - } - return results; - } - - @Override - public void notify(Collection result) { - results.addAll(result); - } +import java.util.ArrayList; +import java.util.Collection; + +public class JxtaSyncSearch implements Search, SearchListener { + + private Service s; + private ArrayList results = new ArrayList<>(); + + @Override + public void initialize(Service s) { + this.s = s; + } + + @Override + public Collection search(String attribute, String value) { + s.search(attribute, value, this); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + LoggerUtilities.logStackTrace(e); + } + return results; + } + + @Override + public void notify(Collection result) { + results.addAll(result); + } } diff --git a/src/main/java/network/impl/jxta/JxtaUserService.java b/src/main/java/network/impl/jxta/JxtaUserService.java index 812de93e..eb31ce57 100644 --- a/src/main/java/network/impl/jxta/JxtaUserService.java +++ b/src/main/java/network/impl/jxta/JxtaUserService.java @@ -3,15 +3,16 @@ import network.api.SearchListener; import network.api.UserService; -public class JxtaUserService extends JxtaService implements UserService{ - public static final String NAME = "users"; - public JxtaUserService() { - this.name = NAME; - } - - @Override - public void search(String attribute, String value, SearchListener sl) { - super.search(attribute, value, sl); - } - +public class JxtaUserService extends JxtaService implements UserService { + public static final String NAME = "users"; + + public JxtaUserService() { + this.name = NAME; + } + + @Override + public void search(String attribute, String value, SearchListener sl) { + super.search(attribute, value, sl); + } + } diff --git a/src/main/java/network/impl/jxta/JxtaUsersSenderService.java b/src/main/java/network/impl/jxta/JxtaUsersSenderService.java index c19ce510..6065f6a2 100644 --- a/src/main/java/network/impl/jxta/JxtaUsersSenderService.java +++ b/src/main/java/network/impl/jxta/JxtaUsersSenderService.java @@ -1,17 +1,6 @@ package network.impl.jxta; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Hashtable; -import java.util.Iterator; - -import javax.print.attribute.standard.RequestingUserName; - -import org.eclipse.persistence.internal.jpa.metadata.structures.ArrayAccessor; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import model.api.UserSyncManager; import model.entity.User; @@ -22,132 +11,138 @@ import network.impl.MessagesGeneric; import network.impl.messages.RequestUserMessage; -public class JxtaUsersSenderService extends JxtaService implements UserRequestService{ - - public static final String NAME = "usersSender"; - - public JxtaUsersSenderService() { - this.name = NAME; - } - - @Override - public void sendRequest(String nick, String who, String ... peerURIs) { - - RequestUserMessage m = new RequestUserMessage(); - - m.setNick(nick); - - m.setAttribute(""); - - m.setType("request"); - - m.setWho(who); - - m.setSource(this.peerUri); - - this.sendMessages(m, peerURIs); - } - - @Override - public void sendRequest(String id, String nick, String who, String... targetPeers) { - - RequestUserMessage m = new RequestUserMessage(); - - m.setNick(nick); - - m.setAttribute(id); - - m.setType("requestById"); - - m.setWho(who); - - m.setSource(this.peerUri); - - this.sendMessages(m, targetPeers); - } - - @Override - public void sendRequest(String nick, BigInteger pbkey,String who, String ... peerURIs) { - - RequestUserMessage m = new RequestUserMessage(); - - m.setNick(nick); - - m.setAttribute(String.valueOf(pbkey)); - - m.setType("requestByPbkey"); - - m.setWho(who); - - m.setSource(this.peerUri); - - this.sendMessages(m, peerURIs); - } - - private Messages getResponseMessage(Messages msg) { - - ArrayList resultat = new ArrayList<>(); - - MessagesGeneric m = new MessagesGeneric(); - - UserSyncManager em = SyncManagerFactory.createUserSyncManager(); - - m.setWho(msg.getWho()); - - m.addField("type", "response"); - - if(msg.getMessage("type").equals("request")){ - - resultat.addAll(em.findAllByAttribute("nick", msg.getMessage("nick"))); - - }else if(msg.getMessage("type").equals("requestById")){ - - Collection tmpList=em.findAllByAttribute("nick", msg.getMessage("nick")); - - for (Iterator iterator = tmpList.iterator(); iterator.hasNext();) { - User user = (User) iterator.next(); - - if(user.getId().equals(msg.getMessage("attribute"))){ - resultat.add(user); - } - } - - }else if(msg.getMessage("type").equals("requestByPbkey")){ - - Collection users = em.findAllByAttribute("nick", msg.getMessage("nick")); - - for (Iterator iterator = users.iterator(); iterator.hasNext();) { - User user = (User) iterator.next(); - if(user.getKey().getPublicKey().equals(new BigInteger(msg.getMessage("attribute"),16))){ - resultat.add(user); - break; //return first user with the same nickName and pbkey - } - } - - } - - em.close(); - - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - - m.addField("users", json.toJson(resultat)); - - return m; - } - - - @Override - public void pipeMsgEvent(PipeMsgEvent event) { - - Messages message = toMessages(event.getMessage()); - - if(message.getMessage("type").equals("response")) { - super.pipeMsgEvent(event); - return; - } - - this.sendMessages(getResponseMessage(message), message.getMessage("source")); - } - - +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +public class JxtaUsersSenderService extends JxtaService implements UserRequestService { + + public static final String NAME = "usersSender"; + + public JxtaUsersSenderService() { + this.name = NAME; + } + + @Override + public void sendRequest(String nick, String who, String... peerURIs) { + + RequestUserMessage m = new RequestUserMessage(); + + m.setNick(nick); + + m.setAttribute(""); + + m.setType("request"); + + m.setWho(who); + + m.setSource(this.peerUri); + + this.sendMessages(m, peerURIs); + } + + @Override + public void sendRequest(String id, String nick, String who, String... targetPeers) { + + RequestUserMessage m = new RequestUserMessage(); + + m.setNick(nick); + + m.setAttribute(id); + + m.setType("requestById"); + + m.setWho(who); + + m.setSource(this.peerUri); + + this.sendMessages(m, targetPeers); + } + + @Override + public void sendRequest(String nick, BigInteger pbkey, String who, String... peerURIs) { + + RequestUserMessage m = new RequestUserMessage(); + + m.setNick(nick); + + m.setAttribute(String.valueOf(pbkey)); + + m.setType("requestByPbkey"); + + m.setWho(who); + + m.setSource(this.peerUri); + + this.sendMessages(m, peerURIs); + } + + private Messages getResponseMessage(Messages msg) { + + ArrayList resultat = new ArrayList<>(); + + MessagesGeneric m = new MessagesGeneric(); + + UserSyncManager em = SyncManagerFactory.createUserSyncManager(); + + m.setWho(msg.getWho()); + + m.addField("type", "response"); + + if (msg.getMessage("type").equals("request")) { + + resultat.addAll(em.findAllByAttribute("nick", msg.getMessage("nick"))); + + } else if (msg.getMessage("type").equals("requestById")) { + + Collection tmpList = em.findAllByAttribute("nick", msg.getMessage("nick")); + + for (Iterator iterator = tmpList.iterator(); iterator.hasNext(); ) { + User user = (User) iterator.next(); + + if (user.getId().equals(msg.getMessage("attribute"))) { + resultat.add(user); + } + } + + } else if (msg.getMessage("type").equals("requestByPbkey")) { + + Collection users = em.findAllByAttribute("nick", msg.getMessage("nick")); + + for (Iterator iterator = users.iterator(); iterator.hasNext(); ) { + User user = (User) iterator.next(); + if (user.getKey().getPublicKey().equals(new BigInteger(msg.getMessage("attribute"), 16))) { + resultat.add(user); + break; //return first user with the same nickName and pbkey + } + } + + } + + em.close(); + + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + + m.addField("users", json.toJson(resultat)); + + return m; + } + + + @Override + public void pipeMsgEvent(PipeMsgEvent event) { + + Messages message = toMessages(event.getMessage()); + + if (message.getMessage("type").equals("response")) { + super.pipeMsgEvent(event); + return; + } + + this.sendMessages(getResponseMessage(message), message.getMessage("source")); + } + + } diff --git a/src/main/java/network/impl/messages/EstablisherMessage.java b/src/main/java/network/impl/messages/EstablisherMessage.java index cf4495c6..abcef9b0 100644 --- a/src/main/java/network/impl/messages/EstablisherMessage.java +++ b/src/main/java/network/impl/messages/EstablisherMessage.java @@ -4,57 +4,54 @@ import network.impl.MessagesImpl; /** - * * @author Nathanaël EON - * */ -public class EstablisherMessage extends MessagesImpl -{ - @MessageElement("title") - private String title; - - @MessageElement("sourceId") - private String sourceId; - - // Contains the current Uri of the peer who sent the message - @MessageElement("source") - private String sourceUri; - - @MessageElement("type") - private String type = "establisher"; - - @MessageElement("contract") - private String contract; - - - public void setTitle(String title) { - this.title = title; - } - public String getTitle() { - return title; - } - - - public void setSourceId(String sourceI) { - this.sourceId = sourceI; - } - public String getSourceId() { - return sourceId; - } - - - public void setSource(String source) { - this.sourceUri = source; - } - public String getSource() { - return sourceUri; - } - - - public String getContract() { - return contract; - } - public void setContract(String c) { - this.contract = c; - } +public class EstablisherMessage extends MessagesImpl { + @MessageElement("title") + private String title; + + @MessageElement("sourceId") + private String sourceId; + + // Contains the current Uri of the peer who sent the message + @MessageElement("source") + private String sourceUri; + + @MessageElement("type") + private String type = "establisher"; + + @MessageElement("contract") + private String contract; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getSourceId() { + return sourceId; + } + + public void setSourceId(String sourceI) { + this.sourceId = sourceI; + } + + public String getSource() { + return sourceUri; + } + + public void setSource(String source) { + this.sourceUri = source; + } + + public String getContract() { + return contract; + } + + public void setContract(String c) { + this.contract = c; + } } diff --git a/src/main/java/network/impl/messages/RequestItemMessage.java b/src/main/java/network/impl/messages/RequestItemMessage.java index cd0d4ea3..e9202471 100644 --- a/src/main/java/network/impl/messages/RequestItemMessage.java +++ b/src/main/java/network/impl/messages/RequestItemMessage.java @@ -3,30 +3,30 @@ import network.api.annotation.MessageElement; import network.impl.MessagesImpl; -public class RequestItemMessage extends MessagesImpl{ - @MessageElement("source") - private String sourceUri; - - @MessageElement("title") - private String title; - - @MessageElement("type") - private String type = "request"; - - public void setTitle(String title) { - this.title = title; - } - - public String getTitle() { - return title; - } - - public void setSource(String source) { - this.sourceUri = source; - } - - public String getSource() { - return sourceUri; - } - +public class RequestItemMessage extends MessagesImpl { + @MessageElement("source") + private String sourceUri; + + @MessageElement("title") + private String title; + + @MessageElement("type") + private String type = "request"; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getSource() { + return sourceUri; + } + + public void setSource(String source) { + this.sourceUri = source; + } + } diff --git a/src/main/java/network/impl/messages/RequestMessageUserMessage.java b/src/main/java/network/impl/messages/RequestMessageUserMessage.java index 359aa2d6..2b0a4c1c 100644 --- a/src/main/java/network/impl/messages/RequestMessageUserMessage.java +++ b/src/main/java/network/impl/messages/RequestMessageUserMessage.java @@ -3,46 +3,46 @@ import network.api.annotation.MessageElement; import network.impl.MessagesImpl; -public class RequestMessageUserMessage extends MessagesImpl{ - - @MessageElement("source") - private String sourceUri; - - @MessageElement("senderId") - private String senderId; - - @MessageElement("receiverId") - private String receiverId; - - @MessageElement("type") - private String type = "request"; - - public String getSenderId() { - return senderId; - } - - public void setSenderId(String senderId) { - this.senderId = senderId; - } - - public String getReceiverId() { - return receiverId; - } - - public void setReceiverId(String receiverId) { - this.receiverId = receiverId; - } - - public void setSource(String source) { - this.sourceUri = source; - } - - public String getSource() { - return sourceUri; - } - - public String getType() { - return type; - } +public class RequestMessageUserMessage extends MessagesImpl { + + @MessageElement("source") + private String sourceUri; + + @MessageElement("senderId") + private String senderId; + + @MessageElement("receiverId") + private String receiverId; + + @MessageElement("type") + private String type = "request"; + + public String getSenderId() { + return senderId; + } + + public void setSenderId(String senderId) { + this.senderId = senderId; + } + + public String getReceiverId() { + return receiverId; + } + + public void setReceiverId(String receiverId) { + this.receiverId = receiverId; + } + + public String getSource() { + return sourceUri; + } + + public void setSource(String source) { + this.sourceUri = source; + } + + public String getType() { + return type; + } } diff --git a/src/main/java/network/impl/messages/RequestUserMessage.java b/src/main/java/network/impl/messages/RequestUserMessage.java index 2c52aeff..312cac43 100644 --- a/src/main/java/network/impl/messages/RequestUserMessage.java +++ b/src/main/java/network/impl/messages/RequestUserMessage.java @@ -3,49 +3,49 @@ import network.api.annotation.MessageElement; import network.impl.MessagesImpl; -public class RequestUserMessage extends MessagesImpl{ - - @MessageElement("source") - private String sourceUri; - - @MessageElement("nick") - private String nick; - - @MessageElement("attribute") - private String attribute; - - @MessageElement("type") - private String type = "request"; - - public String getNick() { - return nick; - } - - public void setNick(String nick) { - this.nick = nick; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public void setSource(String source) { - this.sourceUri = source; - } - - public String getSource() { - return sourceUri; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } +public class RequestUserMessage extends MessagesImpl { + + @MessageElement("source") + private String sourceUri; + + @MessageElement("nick") + private String nick; + + @MessageElement("attribute") + private String attribute; + + @MessageElement("type") + private String type = "request"; + + public String getNick() { + return nick; + } + + public void setNick(String nick) { + this.nick = nick; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getSource() { + return sourceUri; + } + + public void setSource(String source) { + this.sourceUri = source; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } } diff --git a/src/main/java/network/utils/IpChecker.java b/src/main/java/network/utils/IpChecker.java index 327cac10..9515aaf0 100644 --- a/src/main/java/network/utils/IpChecker.java +++ b/src/main/java/network/utils/IpChecker.java @@ -1,40 +1,41 @@ -/* Copyright 2015 Pablo Arrighi, Sarah Boukris, Mehdi Chtiwi, - Michael Dubuis, Kevin Perrot, Julien Prudhomme. - - This file is part of SXP. - - SXP is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation, version 3. - - SXP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License along with SXP. - If not, see . */ +/* Copyright 2015 Pablo Arrighi, Sarah Boukris, Mehdi Chtiwi, + Michael Dubuis, Kevin Perrot, Julien Prudhomme. + + This file is part of SXP. + + SXP is free software: you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation, version 3. + + SXP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with SXP. + If not, see . */ package network.utils; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; - import controller.tools.LoggerUtilities; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; + /** * Retrieve net public IP address - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public class IpChecker { - /** - * Return public IP address. - * @return a string containing an IPv4 adress - * @throws Exception - */ + /** + * Return public IP address. + * + * @return a string containing an IPv4 adress + * @throws Exception + */ public static String getIp() throws Exception { URL whatismyip = new URL("http://checkip.amazonaws.com"); BufferedReader in = null; diff --git a/src/main/java/protocol/api/Establisher.java b/src/main/java/protocol/api/Establisher.java index b9f721f7..862c9f61 100644 --- a/src/main/java/protocol/api/Establisher.java +++ b/src/main/java/protocol/api/Establisher.java @@ -1,95 +1,98 @@ package protocol.api; -import java.util.ArrayList; -import java.util.HashMap; - import crypt.api.key.AsymKey; import crypt.api.signatures.Signer; import model.api.Status; import model.api.Wish; +import java.util.ArrayList; +import java.util.HashMap; + /** - * - * @author Nathanaël Eon - * - * @param Private/public key type - * @param Key type - * @param Signature type - * @param <_Signer> Signer instance + * @param Private/public key type + * @param Key type + * @param Signature type + * @param <_Signer> Signer instance * @param Contract Type + * @author Nathanaël Eon */ -public abstract class Establisher, Sign, _Signer extends Signer, ContractType extends EstablisherContract> { +public abstract class Establisher, Sign, _Signer extends Signer, ContractType extends EstablisherContract> { + + protected ArrayList listeners = new ArrayList(); + protected ContractType contract; + protected HashMap uris; + protected _Signer signer; + + /** + * Initialize the establisher with a contract + * + * @param c + */ + public abstract void initialize(ContractType c); + + /** + * Start establisher signature protocol + */ + public abstract void start(); + + + /** + * Get the contract to be signed + * + * @return + */ + public ContractType getContract() { + return contract; + } + + /** + * Get the current wish of the owner of this establisher + * + * @param w + */ + public Wish getWish() { + return contract.getWish(); + } + + /** + * Set the current wish of the owner of this establisher + * + * @param w + */ + public void setWish(Wish w) { + contract.setWish(w); + } + + /** + * Get the current status of the protocol + * + * @return + */ + public Status getStatus() { + return contract.getStatus(); + } + + public void setStatus(Status s) { + contract.setStatus(s); + notifyListeners(); + } + + /** + * Add a listener of establisher events + * + * @param l + */ + public void addListener(EstablisherListener l) { + listeners.add(l); + } - protected ArrayList listeners = new ArrayList(); - protected ContractType contract; - protected HashMap uris; - protected _Signer signer; - - /** - * Initialize the establisher with a contract - * @param c - */ - public abstract void initialize(ContractType c); - - /** - * Start establisher signature protocol - */ - public abstract void start(); - - - /** - * Get the contract to be signed - * @return - */ - public ContractType getContract(){ - return contract; - } - - - /** - * Set the current wish of the owner of this establisher - * @param w - */ - public void setWish(Wish w){ - contract.setWish(w); - } - - /** - * Get the current wish of the owner of this establisher - * @param w - */ - public Wish getWish(){ - return contract.getWish(); - } - - /** - * Get the current status of the protocol - * @return - */ - public Status getStatus(){ - return contract.getStatus(); - } - - public void setStatus(Status s){ - contract.setStatus(s); - notifyListeners(); - } - - /** - * Add a listener of establisher events - * @param l - */ - public void addListener(EstablisherListener l){ - listeners.add(l); - } - - /** - * Notify the listener of this establisher - */ - public void notifyListeners(){ - for (EstablisherListener l : listeners){ - l.establisherEvent(this.contract.getStatus()); - } - } + /** + * Notify the listener of this establisher + */ + public void notifyListeners() { + for (EstablisherListener l : listeners) { + l.establisherEvent(this.contract.getStatus()); + } + } } diff --git a/src/main/java/protocol/api/EstablisherContract.java b/src/main/java/protocol/api/EstablisherContract.java index c65f15ee..1091e3b5 100644 --- a/src/main/java/protocol/api/EstablisherContract.java +++ b/src/main/java/protocol/api/EstablisherContract.java @@ -10,88 +10,98 @@ /** * Contrat abstract class. A contrat typically contain parties (they had to sign) and clauses - * (purpose of the contrat). This contract will be used by establishers. An example of + * (purpose of the contrat). This contract will be used by establishers. An example of * contract : impl.sigma.SigmaContractAdapter * The hashable data should be the concatenation of parties and clauses data. - * @author Nathanaël Eon * - * @param Type of public/private key - * @param type of actors' key - * @param type of actors' signature + * @param Type of public/private key + * @param type of actors' key + * @param type of actors' signature * @param <_Signer> signer instance + * @author Nathanaël Eon */ -public abstract class EstablisherContract, Sign, _Signer extends Signer> implements Hashable{ - - protected ContractEntity contract; - - - /* - * Default getters and setters - */ - public Wish getWish(){ - return contract.getWish(); - } - public Status getStatus(){ - return contract.getStatus(); - } - public void setWish(Wish w){ - contract.setWish(w); - } - public void setStatus(Status s){ - contract.setStatus(s); - }; - - - /* - * Entity getter - */ - public ContractEntity getEntity(){ - return contract; - } - - - /** - * Add a signature to the contrat - * @param k public key who is signing - * @param s the signature - */ - public abstract void addSignature(Key k, Sign s); - - - /** - * Check if all parties have signed the contract. - * @return true if all parties signed the contract - */ - public abstract boolean isFinalized(); - - /** - * Verify that the provided contract is equivalent to this contrat - * (same parties and clauses) and this contrat signatures are correct - * (call {@link Contract#checkSignatures(Signer)} - * @param contrat an other contrat to check equality - * @return true if contract are the sames and all parties signed - */ - public abstract boolean checkContrat(EstablisherContract contrat); - - /** - * Tell if 2 contract are equal: same parties and same clauses. - * @param c An other contract - * @return True if contracts are the same - */ - public abstract boolean equals(EstablisherContract c); - - /** - * Returns a hash of the contract - */ - @Override - public abstract byte[] getHashableData(); - - /** - * Get the signature according to the private key - * @param signer - * @param k the private key - * @return - */ - public abstract Sign sign(_Signer signer, Key k); +public abstract class EstablisherContract, Sign, _Signer extends Signer> implements Hashable { + + protected ContractEntity contract; + + + /* + * Default getters and setters + */ + public Wish getWish() { + return contract.getWish(); + } + + public void setWish(Wish w) { + contract.setWish(w); + } + + public Status getStatus() { + return contract.getStatus(); + } + + public void setStatus(Status s) { + contract.setStatus(s); + } + + ; + + + /* + * Entity getter + */ + public ContractEntity getEntity() { + return contract; + } + + + /** + * Add a signature to the contrat + * + * @param k public key who is signing + * @param s the signature + */ + public abstract void addSignature(Key k, Sign s); + + + /** + * Check if all parties have signed the contract. + * + * @return true if all parties signed the contract + */ + public abstract boolean isFinalized(); + + /** + * Verify that the provided contract is equivalent to this contrat + * (same parties and clauses) and this contrat signatures are correct + * (call {@link Contract#checkSignatures(Signer)} + * + * @param contrat an other contrat to check equality + * @return true if contract are the sames and all parties signed + */ + public abstract boolean checkContrat(EstablisherContract contrat); + + /** + * Tell if 2 contract are equal: same parties and same clauses. + * + * @param c An other contract + * @return True if contracts are the same + */ + public abstract boolean equals(EstablisherContract c); + + /** + * Returns a hash of the contract + */ + @Override + public abstract byte[] getHashableData(); + + /** + * Get the signature according to the private key + * + * @param signer + * @param k the private key + * @return + */ + public abstract Sign sign(_Signer signer, Key k); } diff --git a/src/main/java/protocol/api/EstablisherListener.java b/src/main/java/protocol/api/EstablisherListener.java index 47803cc9..4d64befa 100644 --- a/src/main/java/protocol/api/EstablisherListener.java +++ b/src/main/java/protocol/api/EstablisherListener.java @@ -3,5 +3,5 @@ import model.api.Status; public interface EstablisherListener { - public void establisherEvent(Status s); + public void establisherEvent(Status s); } diff --git a/src/main/java/protocol/impl/SigmaEstablisher.java b/src/main/java/protocol/impl/SigmaEstablisher.java index c9f66cff..b661a5ad 100644 --- a/src/main/java/protocol/impl/SigmaEstablisher.java +++ b/src/main/java/protocol/impl/SigmaEstablisher.java @@ -1,15 +1,10 @@ package protocol.impl; -import java.math.BigInteger; -import java.util.HashMap; - import com.fasterxml.jackson.core.type.TypeReference; - -import crypt.impl.signatures.SigmaSigner; - import controller.Application; import controller.tools.JsonTools; +import crypt.impl.signatures.SigmaSigner; import model.api.Status; import model.api.Wish; import model.entity.ElGamalKey; @@ -24,119 +19,127 @@ import protocol.impl.sigma.steps.ProtocolSign; import protocol.impl.sigma.steps.ProtocolStep; +import java.math.BigInteger; +import java.util.HashMap; + -/** - * Establisher for sigma protocol +/** + * Establisher for sigma protocol * * @author Nathanaël EON */ public class SigmaEstablisher extends Establisher { - - // The service we'll use to send data - public EstablisherService establisherService =(EstablisherService) Application.getInstance().getPeer().getService(EstablisherService.NAME); - // The current peer - public Peer peer = Application.getInstance().getPeer(); - // The step called if something goes wrong - public ProtocolStep resolvingStep; - // Data that need to be restored if there is a peer-disconnection - // TODO implement correctly the data saving - public SigmaEstablisherData sigmaEstablisherData; - - // The signer Key - protected ElGamalKey senderK; - - /** - * Setup the signing protocol - * @param : elgamalkey (public and private) of the user - * @param : parties matching uri, if null, the protocol will be asynchronous - */ - public SigmaEstablisher(ElGamalKey senderK, HashMap uris){ - this.senderK = senderK; - - this.uris = uris; - - this.sigmaEstablisherData = new SigmaEstablisherData(); - this.sigmaEstablisherData.setUris(uris); - sigmaEstablisherData.setTrentKey(null); - } - - /** - * Constructor which start back from where it were (using establisherData) - * @param : data of the former establisher - * @param : key we use to sign contract - */ - public SigmaEstablisher(String establisherData, ElGamalKey senderK){ - JsonTools json = new JsonTools<>(new TypeReference(){}); - SigmaEstablisherData data = json.toEntity(establisherData); - this.contract = data.getContract(); - this.uris = data.getUris(); - this.sigmaEstablisherData = data; - } - - /** - * Initialize the protocol when a contract comes - * @param : contract to be signed - */ - @Override - public void initialize(SigmaContract c){ - this.sigmaEstablisherData.setContract(c); - contract = c; - - //Prepare the choosingTent step - sigmaEstablisherData.setProtocolStep( new ProtocolChooseTrent(this, senderK) ); - } - - /** - * Launch the protocol : tell everyone that the user is ready to sign (pressed signing button) - */ - @Override - public void start(){ - // Does only start if the status and the wish are ok - // It sends the list of users that can be TTP for us - if (getStatus() != Status.CANCELLED && getStatus() != Status.FINALIZED && getWish() == Wish.ACCEPT) - sigmaEstablisherData.getProtocolStep().sendMessage(); - } - - /** - * Setup trent with correct Key - * @param trentK - */ - public void setTrent(ElGamalKey trentK){ - contract.setTrentKey(trentK); - sigmaEstablisherData.setTrentKey(trentK); - } - - - // Put a listener on Trent in case something goes wrong - public void setListenerOnTrent(){ - setStatus(Status.SIGNING); - resolvingStep = new ProtocolResolve(this, - senderK); - sign(); - } - - /** - * The contract signing protocol - * TODO : Setup a timer that will trigger resolve() - */ - protected void sign(){ - sigmaEstablisherData.setProtocolStep(new ProtocolSign(this, senderK)); - sigmaEstablisherData.getProtocolStep().sendMessage(); - } - - /** - * Called if something goes wrong. - * It send Trent 5 informations : - * the round - * the uris of the parties - * the contract to be signed - * the encrypted (for Trent) claim - * the encrypted (for Trent) signed claim (we need to check signature) - * - * Trent resolve function is in Trent Class - */ - protected void resolve(){ - resolvingStep.sendMessage(); - } + + // The service we'll use to send data + public EstablisherService establisherService = (EstablisherService) Application.getInstance().getPeer().getService(EstablisherService.NAME); + // The current peer + public Peer peer = Application.getInstance().getPeer(); + // The step called if something goes wrong + public ProtocolStep resolvingStep; + // Data that need to be restored if there is a peer-disconnection + // TODO implement correctly the data saving + public SigmaEstablisherData sigmaEstablisherData; + + // The signer Key + protected ElGamalKey senderK; + + /** + * Setup the signing protocol + * + * @param : elgamalkey (public and private) of the user + * @param : parties matching uri, if null, the protocol will be asynchronous + */ + public SigmaEstablisher(ElGamalKey senderK, HashMap uris) { + this.senderK = senderK; + + this.uris = uris; + + this.sigmaEstablisherData = new SigmaEstablisherData(); + this.sigmaEstablisherData.setUris(uris); + sigmaEstablisherData.setTrentKey(null); + } + + /** + * Constructor which start back from where it were (using establisherData) + * + * @param : data of the former establisher + * @param : key we use to sign contract + */ + public SigmaEstablisher(String establisherData, ElGamalKey senderK) { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + SigmaEstablisherData data = json.toEntity(establisherData); + this.contract = data.getContract(); + this.uris = data.getUris(); + this.sigmaEstablisherData = data; + } + + /** + * Initialize the protocol when a contract comes + * + * @param : contract to be signed + */ + @Override + public void initialize(SigmaContract c) { + this.sigmaEstablisherData.setContract(c); + contract = c; + + //Prepare the choosingTent step + sigmaEstablisherData.setProtocolStep(new ProtocolChooseTrent(this, senderK)); + } + + /** + * Launch the protocol : tell everyone that the user is ready to sign (pressed signing button) + */ + @Override + public void start() { + // Does only start if the status and the wish are ok + // It sends the list of users that can be TTP for us + if (getStatus() != Status.CANCELLED && getStatus() != Status.FINALIZED && getWish() == Wish.ACCEPT) + sigmaEstablisherData.getProtocolStep().sendMessage(); + } + + /** + * Setup trent with correct Key + * + * @param trentK + */ + public void setTrent(ElGamalKey trentK) { + contract.setTrentKey(trentK); + sigmaEstablisherData.setTrentKey(trentK); + } + + + // Put a listener on Trent in case something goes wrong + public void setListenerOnTrent() { + setStatus(Status.SIGNING); + resolvingStep = new ProtocolResolve(this, + senderK); + sign(); + } + + /** + * The contract signing protocol + * TODO : Setup a timer that will trigger resolve() + */ + protected void sign() { + sigmaEstablisherData.setProtocolStep(new ProtocolSign(this, senderK)); + sigmaEstablisherData.getProtocolStep().sendMessage(); + } + + /** + * Called if something goes wrong. + * It send Trent 5 informations : + * the round + * the uris of the parties + * the contract to be signed + * the encrypted (for Trent) claim + * the encrypted (for Trent) signed claim (we need to check signature) + *

+ * Trent resolve function is in Trent Class + */ + protected void resolve() { + resolvingStep.sendMessage(); + } } diff --git a/src/main/java/protocol/impl/sigma/ElGamal.java b/src/main/java/protocol/impl/sigma/ElGamal.java index d3f398bd..d2891b86 100644 --- a/src/main/java/protocol/impl/sigma/ElGamal.java +++ b/src/main/java/protocol/impl/sigma/ElGamal.java @@ -15,141 +15,142 @@ If not, see . */ package protocol.impl.sigma; -import java.math.BigInteger; -import java.security.SecureRandom; - -import org.bouncycastle.crypto.params.ElGamalParameters; -import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters; -import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters; - import controller.tools.LoggerUtilities; import crypt.ElGamalEngineK; import crypt.impl.hashs.SHA256Hasher; import crypt.impl.signatures.ElGamalSignature; import model.entity.ElGamalKey; +import org.bouncycastle.crypto.params.ElGamalParameters; +import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters; +import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters; + +import java.math.BigInteger; +import java.security.SecureRandom; /** * This class is used for encryption, decryption, signs and verify signature. - * @author michael * + * @author michael */ -public class ElGamal { - - public SecureRandom random = new SecureRandom(); - - private ElGamalKey keys; - - - /** - * Constructor - * @param keys2 - */ - public ElGamal(ElGamalKey keys2){ - this.keys = keys2; - } - - /** - * Empty constructor - */ - public ElGamal(){} - - public void setKeys(ElGamalKey keys){ - this.keys = keys; - } - - /** - * To sign a message - * @param M - byte[] - */ - public ElGamalSignature getMessageSignature(byte[] M) - { - if(keys.getPrivateKey() == null) - //try { - throw new NullPointerException("Private key unknown"); - // } catch (Exception e) { - // LoggerUtilities.logStackTrace(e); - // } - BigInteger k; - BigInteger l; - BigInteger r; - BigInteger s; - - // BigInteger m = new BigInteger(Hasher.SHA256(M).getBytes()); - BigInteger m = new BigInteger(new SHA256Hasher().getHash(M)); - k = BigInteger.probablePrime(1023, random); - while(k.compareTo(BigInteger.ONE)<= 0 || k.gcd(keys.getP()).compareTo(BigInteger.ONE)!= 0 ) - { - k = BigInteger.probablePrime(1023, random); - } - l = k.modInverse(keys.getP().subtract(BigInteger.ONE)); - - r = keys.getG().modPow(k,keys.getP()); - s = l.multiply(m.subtract(r.multiply(keys.getPrivateKey())).mod(keys.getP().subtract(BigInteger.ONE))); - return new ElGamalSignature(r, s); - } - - /** - * To verify a signature - * @param M - byte[] - * @return true if the signature is from public Key, false else - */ - public boolean verifySignature(byte[] M, ElGamalSignature sign){ - try { - if(sign == null || sign.getR() == null || sign.getS() == null){ - throw new Exception("R or S unknown"); - } - if(keys.getPublicKey() == null){ - throw new Exception("Public key unknown"); - } - } catch(Exception e) { - LoggerUtilities.logStackTrace(e); - } - - - //BigInteger m = new BigInteger(Hasher.SHA256(M).getBytes()); - BigInteger m = new BigInteger(new SHA256Hasher().getHash(M)); - BigInteger v = keys.getG().modPow(m, keys.getP()); - BigInteger w = (keys.getPublicKey().modPow(sign.getR(), keys.getP()).multiply(sign.getR().modPow(sign.getS(), keys.getP())).mod(keys.getP())); - - return (v.equals(w)); - } - - - public byte[] encryptWithPublicKey(byte[] data) { - ElGamalParameters params = new ElGamalParameters(keys.getP(), keys.getG()); - ElGamalPublicKeyParameters pubKey = new ElGamalPublicKeyParameters(keys.getPublicKey(), params); - - ElGamalEngineK e = new ElGamalEngineK(); - e.init(true, pubKey); - return e.processBlock(data, 0, data.length) ; - } - - public ElGamalEncrypt encryptForContract(byte[] data) { - ElGamalParameters params = new ElGamalParameters(keys.getP(), keys.getG()); - ElGamalPublicKeyParameters pubKey = new ElGamalPublicKeyParameters(keys.getPublicKey(), params); - - ElGamalEngineK e = new ElGamalEngineK(); - e.init(true, pubKey); - byte[] m = e.processBlock(data, 0, data.length); - BigInteger k = e.getK(); - BigInteger u = keys.getG().modPow(k,keys.getP()); +public class ElGamal { + + public SecureRandom random = new SecureRandom(); + + private ElGamalKey keys; + + + /** + * Constructor + * + * @param keys2 + */ + public ElGamal(ElGamalKey keys2) { + this.keys = keys2; + } + + /** + * Empty constructor + */ + public ElGamal() { + } + + public void setKeys(ElGamalKey keys) { + this.keys = keys; + } + + /** + * To sign a message + * + * @param M - byte[] + */ + public ElGamalSignature getMessageSignature(byte[] M) { + if (keys.getPrivateKey() == null) + //try { + throw new NullPointerException("Private key unknown"); + // } catch (Exception e) { + // LoggerUtilities.logStackTrace(e); + // } + BigInteger k; + BigInteger l; + BigInteger r; + BigInteger s; + + // BigInteger m = new BigInteger(Hasher.SHA256(M).getBytes()); + BigInteger m = new BigInteger(new SHA256Hasher().getHash(M)); + k = BigInteger.probablePrime(1023, random); + while (k.compareTo(BigInteger.ONE) <= 0 || k.gcd(keys.getP()).compareTo(BigInteger.ONE) != 0) { + k = BigInteger.probablePrime(1023, random); + } + l = k.modInverse(keys.getP().subtract(BigInteger.ONE)); + + r = keys.getG().modPow(k, keys.getP()); + s = l.multiply(m.subtract(r.multiply(keys.getPrivateKey())).mod(keys.getP().subtract(BigInteger.ONE))); + return new ElGamalSignature(r, s); + } + + /** + * To verify a signature + * + * @param M - byte[] + * @return true if the signature is from public Key, false else + */ + public boolean verifySignature(byte[] M, ElGamalSignature sign) { + try { + if (sign == null || sign.getR() == null || sign.getS() == null) { + throw new Exception("R or S unknown"); + } + if (keys.getPublicKey() == null) { + throw new Exception("Public key unknown"); + } + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } + + + //BigInteger m = new BigInteger(Hasher.SHA256(M).getBytes()); + BigInteger m = new BigInteger(new SHA256Hasher().getHash(M)); + BigInteger v = keys.getG().modPow(m, keys.getP()); + BigInteger w = (keys.getPublicKey().modPow(sign.getR(), keys.getP()).multiply(sign.getR().modPow(sign.getS(), keys.getP())).mod(keys.getP())); + + return (v.equals(w)); + } + + + public byte[] encryptWithPublicKey(byte[] data) { + ElGamalParameters params = new ElGamalParameters(keys.getP(), keys.getG()); + ElGamalPublicKeyParameters pubKey = new ElGamalPublicKeyParameters(keys.getPublicKey(), params); + + ElGamalEngineK e = new ElGamalEngineK(); + e.init(true, pubKey); + return e.processBlock(data, 0, data.length); + } + + public ElGamalEncrypt encryptForContract(byte[] data) { + ElGamalParameters params = new ElGamalParameters(keys.getP(), keys.getG()); + ElGamalPublicKeyParameters pubKey = new ElGamalPublicKeyParameters(keys.getPublicKey(), params); + + ElGamalEngineK e = new ElGamalEngineK(); + e.init(true, pubKey); + byte[] m = e.processBlock(data, 0, data.length); + BigInteger k = e.getK(); + BigInteger u = keys.getG().modPow(k, keys.getP()); BigInteger v = (keys.getPublicKey().modPow(k, keys.getP()).multiply(new BigInteger(data))); - return new ElGamalEncrypt (u,v,k, m); - } - - - public byte[] decryptWithPrivateKey(byte[] data) { - ElGamalParameters params = new ElGamalParameters(keys.getP(), keys.getG()); - ElGamalPrivateKeyParameters privKey = new ElGamalPrivateKeyParameters(keys.getPrivateKey(), params); - - ElGamalEngineK e = new ElGamalEngineK(); - e.init(false, privKey); - - return e.processBlock(data, 0, data.length) ; - } - - - public void setAsymsKeys(ElGamalKey keys) { - this.keys = keys; - } + return new ElGamalEncrypt(u, v, k, m); + } + + + public byte[] decryptWithPrivateKey(byte[] data) { + ElGamalParameters params = new ElGamalParameters(keys.getP(), keys.getG()); + ElGamalPrivateKeyParameters privKey = new ElGamalPrivateKeyParameters(keys.getPrivateKey(), params); + + ElGamalEngineK e = new ElGamalEngineK(); + e.init(false, privKey); + + return e.processBlock(data, 0, data.length); + } + + + public void setAsymsKeys(ElGamalKey keys) { + this.keys = keys; + } } diff --git a/src/main/java/protocol/impl/sigma/ElGamalEncrypt.java b/src/main/java/protocol/impl/sigma/ElGamalEncrypt.java index 31122327..f7435bad 100644 --- a/src/main/java/protocol/impl/sigma/ElGamalEncrypt.java +++ b/src/main/java/protocol/impl/sigma/ElGamalEncrypt.java @@ -18,40 +18,42 @@ import java.math.BigInteger; public class ElGamalEncrypt { - private BigInteger u; - private BigInteger v; - private BigInteger k; // only for SigmaProtocol - private byte [] m; - /** - * Initialize the ElGamal signature with the right R & S - * @param r - * @param s - */ - public ElGamalEncrypt(BigInteger u, BigInteger v, BigInteger k, byte[] m) { - this.u = u; - this.v = v; - this.k = k; - this.m = m; - } - - public BigInteger getU() { - return u; - } - - public BigInteger getV() { - return v; - } - - public BigInteger getK() { - return k; - } - - public byte [] getM() { - return m; - } - - public void setM(byte [] m) { - this.m = m; - } - + private BigInteger u; + private BigInteger v; + private BigInteger k; // only for SigmaProtocol + private byte[] m; + + /** + * Initialize the ElGamal signature with the right R & S + * + * @param r + * @param s + */ + public ElGamalEncrypt(BigInteger u, BigInteger v, BigInteger k, byte[] m) { + this.u = u; + this.v = v; + this.k = k; + this.m = m; + } + + public BigInteger getU() { + return u; + } + + public BigInteger getV() { + return v; + } + + public BigInteger getK() { + return k; + } + + public byte[] getM() { + return m; + } + + public void setM(byte[] m) { + this.m = m; + } + } diff --git a/src/main/java/protocol/impl/sigma/Fabric.java b/src/main/java/protocol/impl/sigma/Fabric.java index f2c91542..97f8a3f1 100644 --- a/src/main/java/protocol/impl/sigma/Fabric.java +++ b/src/main/java/protocol/impl/sigma/Fabric.java @@ -15,109 +15,109 @@ If not, see . */ package protocol.impl.sigma; -import java.math.BigInteger; - import model.entity.ElGamalKey; import model.entity.sigma.Masks; import model.entity.sigma.ResEncrypt; import model.entity.sigma.ResponsesCCE; import model.entity.sigma.ResponsesSchnorr; +import java.math.BigInteger; + /** * this class is used for the PCS and especially for the OR * it's a fabric for challenge, Mask and Response good for the different check - * @author sarah * + * @author sarah */ public class Fabric { - /** - * fabric Challenge - * @param publicKeys - * @return - */ - private BigInteger FabricChallenge(ElGamalKey keys) - { - BigInteger c = Utils.rand(160, keys.getP()); - return c; - } - - /** - * fabric Response - * @param publicKeys - * @return - */ - private BigInteger FabricResponse(ElGamalKey keys) - { - BigInteger r = Utils.rand(160, keys.getP()); - return r; - } - - /** - * fabric a good Mask to send for the SchnorrProtocol - * @param c - * @param r - * @param publicKeys - * @return mask - */ - private Masks FabricMaskSchnorr(BigInteger c, BigInteger r,ElGamalKey keys) - { - BigInteger gPowr = keys.getG().modPow(r, keys.getP()); - BigInteger modInv = keys.getPublicKey().modPow(c, keys.getP()).modInverse(keys.getP()); - BigInteger a = gPowr.multiply(modInv); - Masks mask = new Masks(a,null); - return mask; - } - - /** - * response to have send for Schnorr - * @param publicKeys - * @return responseSchnorr - */ - public ResponsesSchnorr SendResponseSchnorrFabric(ElGamalKey keys) - { - BigInteger challenge = this.FabricChallenge( keys); - BigInteger response = this.FabricResponse(keys); - Masks mask = this.FabricMaskSchnorr(challenge, response,keys); - return new ResponsesSchnorr(mask,challenge,response); - } - - /** - * fabric a good Mask to send for the CCE - * @param c - * @param r - * @param res - * @param keys - * @return - */ - private Masks FabricMaskCCE(BigInteger c, BigInteger r, ResEncrypt res, ElGamalKey keys) - { - BigInteger gPowr = keys.getG().modPow(r, keys.getP()); - BigInteger modInv = res.getU().modPow(c, keys.getP()).modInverse(keys.getP()); - BigInteger a = gPowr.multiply(modInv); - - BigInteger pubPowr = keys.getPublicKey().modPow(r, keys.getP()); - BigInteger M = new BigInteger (res.getM()); - BigInteger vDivMPwc = res.getV().divide(M).modPow(c, keys.getP()); - BigInteger ModInv = vDivMPwc.modInverse(keys.getP()); - BigInteger aBis = pubPowr.multiply(ModInv); - - Masks mask = new Masks(a,aBis); - return mask; - } - - /** - * response to have send for CCE - * @param publicKeys - * @return responseCCE - */ - public ResponsesCCE SendResponseCCEFabric(ResEncrypt res,ElGamalKey keys) - { - BigInteger challenge = this.FabricChallenge( keys); - BigInteger response = this.FabricResponse(keys); - Masks mask = this.FabricMaskCCE(challenge, response,res,keys); - return new ResponsesCCE(mask,challenge,response); - } + /** + * fabric Challenge + * + * @param publicKeys + * @return + */ + private BigInteger FabricChallenge(ElGamalKey keys) { + BigInteger c = Utils.rand(160, keys.getP()); + return c; + } + + /** + * fabric Response + * + * @param publicKeys + * @return + */ + private BigInteger FabricResponse(ElGamalKey keys) { + BigInteger r = Utils.rand(160, keys.getP()); + return r; + } + + /** + * fabric a good Mask to send for the SchnorrProtocol + * + * @param c + * @param r + * @param publicKeys + * @return mask + */ + private Masks FabricMaskSchnorr(BigInteger c, BigInteger r, ElGamalKey keys) { + BigInteger gPowr = keys.getG().modPow(r, keys.getP()); + BigInteger modInv = keys.getPublicKey().modPow(c, keys.getP()).modInverse(keys.getP()); + BigInteger a = gPowr.multiply(modInv); + Masks mask = new Masks(a, null); + return mask; + } + + /** + * response to have send for Schnorr + * + * @param publicKeys + * @return responseSchnorr + */ + public ResponsesSchnorr SendResponseSchnorrFabric(ElGamalKey keys) { + BigInteger challenge = this.FabricChallenge(keys); + BigInteger response = this.FabricResponse(keys); + Masks mask = this.FabricMaskSchnorr(challenge, response, keys); + return new ResponsesSchnorr(mask, challenge, response); + } + + /** + * fabric a good Mask to send for the CCE + * + * @param c + * @param r + * @param res + * @param keys + * @return + */ + private Masks FabricMaskCCE(BigInteger c, BigInteger r, ResEncrypt res, ElGamalKey keys) { + BigInteger gPowr = keys.getG().modPow(r, keys.getP()); + BigInteger modInv = res.getU().modPow(c, keys.getP()).modInverse(keys.getP()); + BigInteger a = gPowr.multiply(modInv); + + BigInteger pubPowr = keys.getPublicKey().modPow(r, keys.getP()); + BigInteger M = new BigInteger(res.getM()); + BigInteger vDivMPwc = res.getV().divide(M).modPow(c, keys.getP()); + BigInteger ModInv = vDivMPwc.modInverse(keys.getP()); + BigInteger aBis = pubPowr.multiply(ModInv); + + Masks mask = new Masks(a, aBis); + return mask; + } + + /** + * response to have send for CCE + * + * @param publicKeys + * @return responseCCE + */ + public ResponsesCCE SendResponseCCEFabric(ResEncrypt res, ElGamalKey keys) { + BigInteger challenge = this.FabricChallenge(keys); + BigInteger response = this.FabricResponse(keys); + Masks mask = this.FabricMaskCCE(challenge, response, res, keys); + return new ResponsesCCE(mask, challenge, response); + } } diff --git a/src/main/java/protocol/impl/sigma/PCS.java b/src/main/java/protocol/impl/sigma/PCS.java index e33ffc18..595dca3c 100644 --- a/src/main/java/protocol/impl/sigma/PCS.java +++ b/src/main/java/protocol/impl/sigma/PCS.java @@ -1,162 +1,163 @@ package protocol.impl.sigma; -import java.math.BigInteger; -import java.util.HashMap; - import crypt.factories.SignerFactory; import crypt.impl.signatures.SigmaSigner; import model.entity.ElGamalKey; -import model.entity.sigma.And; -import model.entity.sigma.Masks; -import model.entity.sigma.Or; -import model.entity.sigma.ResEncrypt; -import model.entity.sigma.Responses; -import model.entity.sigma.ResponsesCCE; -import model.entity.sigma.ResponsesSchnorr; -import model.entity.sigma.SigmaSignature; +import model.entity.sigma.*; + +import java.math.BigInteger; +import java.util.HashMap; /** - * * @author Nathanaël EON */ public class PCS { - //The PCS (resEncrypt + Or) - public ResEncrypt res; - public Or pcs; - - //Elements used to create the PCS - private ElGamalKey trentK; - private Sender sender; - private And[] ands = new And[2]; - - - - /** - * Constructor - * @param s : sender keys - * @param r : receiver public key - * @param t : trent public key - */ - public PCS(Sender s, ElGamalKey t){ - setSender(s); - setTrentKeys(t); - setResEncrypt(sender.getResEncrypt()); - } - - - /** - * - */ - public Or getPcs(byte[] m, ElGamalKey r, boolean changeEncrypter){ - - // Encrypter is here for Trent to identify the sender - if (changeEncrypter){ - byte[] b = Sender.getIdentificationData(sender.getPublicKeys()); - res = sender.Encryption(b, this.trentK); - } - - // The message to be encrypted is m - createPcs(m, r); - return pcs; - } - - /** - * Checks the current pcs according to a message - */ - public boolean Verifies(byte[] m){ - if (pcs==null) {return false;} - return pcs.Verifies(m); - } - /** - * Checks a PCS according to a message - */ - public boolean Verifies(Or privateCS, byte[] m){ - if (privateCS==null) {return false;} - return privateCS.Verifies(m); - } - - - //setters - private void setPcs(Or privateCS){ - pcs = privateCS; - } - private void setSender(Sender s){ - sender = s; - } - private void setTrentKeys(ElGamalKey t){ - trentK=t; - } - private void setResEncrypt(ResEncrypt r){ - res = r; - - } - - - /** - * Create the PCS from what is in here - */ - private void createPcs(byte[] m, ElGamalKey receiverK){ - //Creates the Schnorr and CCE signature we will "AND" - //2 of them are fabricated - ResponsesSchnorr resSchnorr2 = sender.SendResponseSchnorrFabric(receiverK); - ResponsesCCE resCce2 = sender.SendResponseCCEFabric(res, trentK); - ResponsesCCE resCce1 = sender.SendResponseCCE(m, trentK); - - //Forge the last response using a special challenge (composition in the or) : - Masks mask = sender.SendMasksSchnorr(); - BigInteger c = sender.SendChallenge(mask, m); - BigInteger challenge = c.xor(resSchnorr2.getChallenge().xor(resCce1.getChallenge().xor(resCce2.getChallenge()))); - ResponsesSchnorr resSchnorr1 = sender.SendResponseSchnorr(mask, challenge); - - //Maps the responses with the right key (receiver for Schnorr, trent for CCE) - HashMap rK1 = new HashMap (); - rK1.put(resSchnorr1, sender.getPublicKeys()); - rK1.put(resCce1, trentK); - - HashMap rK2 = new HashMap (); - rK2.put(resSchnorr2, receiverK); - rK2.put(resCce2, trentK); - - //Create the arrays of responses and make the "ands" - Responses[] resp1={resSchnorr1,resCce1}; - Responses[] resp2={resSchnorr2,resCce2}; - - ands = new And[2]; - ands[0] = new And(rK1,res,resp1); - ands[1] = new And(rK2,res,resp2); - - //Make the PCS - Or o = new Or(mask.getA(), ands); - o.contract=m; - setPcs(o); - } - - - /** - * @param contract - * @return Signature on contract - */ - public SigmaSignature getClearSignature(SigmaContract contract, ElGamalKey r){ - SigmaSigner sig =SignerFactory.createSigmaSigner(); - sig.setKey(sender.getKeys()); - sig.setTrentK(this.trentK); - sig.setReceiverK(r); - return sig.sign(contract.getHashableData()); - } - - /** - * Check the authenticity of signature - * @param signature - * @param contract - * @param key - * @return - */ - public boolean verifySignature(SigmaSignature signature, SigmaSigner signer, SigmaContract contract){ - if (signature == null ){ - return false; - } - return signer.verify(contract.getHashableData(), signature); - } - + //The PCS (resEncrypt + Or) + public ResEncrypt res; + public Or pcs; + + //Elements used to create the PCS + private ElGamalKey trentK; + private Sender sender; + private And[] ands = new And[2]; + + + /** + * Constructor + * + * @param s : sender keys + * @param r : receiver public key + * @param t : trent public key + */ + public PCS(Sender s, ElGamalKey t) { + setSender(s); + setTrentKeys(t); + setResEncrypt(sender.getResEncrypt()); + } + + + /** + * + */ + public Or getPcs(byte[] m, ElGamalKey r, boolean changeEncrypter) { + + // Encrypter is here for Trent to identify the sender + if (changeEncrypter) { + byte[] b = Sender.getIdentificationData(sender.getPublicKeys()); + res = sender.Encryption(b, this.trentK); + } + + // The message to be encrypted is m + createPcs(m, r); + return pcs; + } + + /** + * Checks the current pcs according to a message + */ + public boolean Verifies(byte[] m) { + if (pcs == null) { + return false; + } + return pcs.Verifies(m); + } + + /** + * Checks a PCS according to a message + */ + public boolean Verifies(Or privateCS, byte[] m) { + if (privateCS == null) { + return false; + } + return privateCS.Verifies(m); + } + + + //setters + private void setPcs(Or privateCS) { + pcs = privateCS; + } + + private void setSender(Sender s) { + sender = s; + } + + private void setTrentKeys(ElGamalKey t) { + trentK = t; + } + + private void setResEncrypt(ResEncrypt r) { + res = r; + + } + + + /** + * Create the PCS from what is in here + */ + private void createPcs(byte[] m, ElGamalKey receiverK) { + //Creates the Schnorr and CCE signature we will "AND" + //2 of them are fabricated + ResponsesSchnorr resSchnorr2 = sender.SendResponseSchnorrFabric(receiverK); + ResponsesCCE resCce2 = sender.SendResponseCCEFabric(res, trentK); + ResponsesCCE resCce1 = sender.SendResponseCCE(m, trentK); + + //Forge the last response using a special challenge (composition in the or) : + Masks mask = sender.SendMasksSchnorr(); + BigInteger c = sender.SendChallenge(mask, m); + BigInteger challenge = c.xor(resSchnorr2.getChallenge().xor(resCce1.getChallenge().xor(resCce2.getChallenge()))); + ResponsesSchnorr resSchnorr1 = sender.SendResponseSchnorr(mask, challenge); + + //Maps the responses with the right key (receiver for Schnorr, trent for CCE) + HashMap rK1 = new HashMap(); + rK1.put(resSchnorr1, sender.getPublicKeys()); + rK1.put(resCce1, trentK); + + HashMap rK2 = new HashMap(); + rK2.put(resSchnorr2, receiverK); + rK2.put(resCce2, trentK); + + //Create the arrays of responses and make the "ands" + Responses[] resp1 = {resSchnorr1, resCce1}; + Responses[] resp2 = {resSchnorr2, resCce2}; + + ands = new And[2]; + ands[0] = new And(rK1, res, resp1); + ands[1] = new And(rK2, res, resp2); + + //Make the PCS + Or o = new Or(mask.getA(), ands); + o.contract = m; + setPcs(o); + } + + + /** + * @param contract + * @return Signature on contract + */ + public SigmaSignature getClearSignature(SigmaContract contract, ElGamalKey r) { + SigmaSigner sig = SignerFactory.createSigmaSigner(); + sig.setKey(sender.getKeys()); + sig.setTrentK(this.trentK); + sig.setReceiverK(r); + return sig.sign(contract.getHashableData()); + } + + /** + * Check the authenticity of signature + * + * @param signature + * @param contract + * @param key + * @return + */ + public boolean verifySignature(SigmaSignature signature, SigmaSigner signer, SigmaContract contract) { + if (signature == null) { + return false; + } + return signer.verify(contract.getHashableData(), signature); + } + } diff --git a/src/main/java/protocol/impl/sigma/Receiver.java b/src/main/java/protocol/impl/sigma/Receiver.java index 8f84cb69..5357a5c2 100644 --- a/src/main/java/protocol/impl/sigma/Receiver.java +++ b/src/main/java/protocol/impl/sigma/Receiver.java @@ -14,141 +14,137 @@ You should have received a copy of the GNU Lesser General Public License along with SXP. If not, see . */ package protocol.impl.sigma; + +import controller.tools.LoggerUtilities; +import model.entity.ElGamalKey; +import model.entity.sigma.*; + import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.HashMap; -import controller.tools.LoggerUtilities; -import model.entity.ElGamalKey; -import model.entity.sigma.And; -import model.entity.sigma.Masks; -import model.entity.sigma.Or; -import model.entity.sigma.ResEncrypt; -import model.entity.sigma.Responses; - /** * this class simulate the receiver but in the end all users have this class * the receiver verifies if all he is received is good or not - * @author sarah * + * @author sarah */ public class Receiver { - - /** - * Verify a single response - * @param response - * @param tKeys - * @param res - * @return Boolean - */ - public Boolean Verifies (Responses response, ElGamalKey tKeys, ResEncrypt res) - { - return response.Verifies(tKeys, res); - } - - /** - * Create the And response and Verify a And response - * @param or (for the condition in the verify method in An) - * @param rK - * @param resEncrypt - * @param responses - * @return - */ - public Boolean Verifies(Boolean or, HashMap rK,ResEncrypt resEncrypt, Responses ... responses) - { - And and = new And(rK, resEncrypt, responses); - return and.Verifies(or); - } - - /** - * Verify a And response - * @param and - * @param or (for the condition in the verify method in An) - * @return - */ - public Boolean Verifies(And and, Boolean or) - { - return and.Verifies(or); - } - - /** - * Verify a Or response - * @param a - * @param resEncrypt - * @param ands - * @return Boolean - */ - public Boolean Verifies(BigInteger a,ResEncrypt resEncrypt, And... ands ) - { - Or or = new Or(a, ands); - return or.Verifies(resEncrypt.getM()); - } - - /** - * Verify if challenge is fabricated (not in Or) - * @param challenge - * @param mask - * @param message - * @return Boolean - */ - - public Boolean VerifiesChallenge(BigInteger challenge,Masks mask, byte[] message) - { - BigInteger test; - byte[] buffer, resume; - MessageDigest hash_function = null; - - String tmp = new String(message).concat(mask.getA().toString()); - - buffer = tmp.getBytes(); - - try { - hash_function = MessageDigest.getInstance("SHA-256"); - } catch (NoSuchAlgorithmException e) { - LoggerUtilities.logStackTrace(e); - } - - resume = hash_function.digest(buffer); - test = new BigInteger(resume); - - return (challenge.equals(test)); - } - - /** - * Verifies the composability of challenges for the Or - * @param message - * @param a - * @param challenge - * @return Boolean - */ - public Boolean VerifiesChallenges(byte[] message, BigInteger a, ArrayList challenge) - { - byte[] buffer, resume; - MessageDigest hash_function = null; - - String tmp = (new String(message)).concat(a.toString()); - - buffer = tmp.getBytes(); - - try { - hash_function = MessageDigest.getInstance("SHA-256"); - } catch (NoSuchAlgorithmException e) { - LoggerUtilities.logStackTrace(e); - } - - resume = hash_function.digest(buffer); - BigInteger test = new BigInteger(resume); - - BigInteger challenges = BigInteger.ZERO; - for(BigInteger c : challenge) - challenges = challenges.xor(c); - - return (challenges.equals(test)); - } - - - + + /** + * Verify a single response + * + * @param response + * @param tKeys + * @param res + * @return Boolean + */ + public Boolean Verifies(Responses response, ElGamalKey tKeys, ResEncrypt res) { + return response.Verifies(tKeys, res); + } + + /** + * Create the And response and Verify a And response + * + * @param or (for the condition in the verify method in An) + * @param rK + * @param resEncrypt + * @param responses + * @return + */ + public Boolean Verifies(Boolean or, HashMap rK, ResEncrypt resEncrypt, Responses... responses) { + And and = new And(rK, resEncrypt, responses); + return and.Verifies(or); + } + + /** + * Verify a And response + * + * @param and + * @param or (for the condition in the verify method in An) + * @return + */ + public Boolean Verifies(And and, Boolean or) { + return and.Verifies(or); + } + + /** + * Verify a Or response + * + * @param a + * @param resEncrypt + * @param ands + * @return Boolean + */ + public Boolean Verifies(BigInteger a, ResEncrypt resEncrypt, And... ands) { + Or or = new Or(a, ands); + return or.Verifies(resEncrypt.getM()); + } + + /** + * Verify if challenge is fabricated (not in Or) + * + * @param challenge + * @param mask + * @param message + * @return Boolean + */ + + public Boolean VerifiesChallenge(BigInteger challenge, Masks mask, byte[] message) { + BigInteger test; + byte[] buffer, resume; + MessageDigest hash_function = null; + + String tmp = new String(message).concat(mask.getA().toString()); + + buffer = tmp.getBytes(); + + try { + hash_function = MessageDigest.getInstance("SHA-256"); + } catch (NoSuchAlgorithmException e) { + LoggerUtilities.logStackTrace(e); + } + + resume = hash_function.digest(buffer); + test = new BigInteger(resume); + + return (challenge.equals(test)); + } + + /** + * Verifies the composability of challenges for the Or + * + * @param message + * @param a + * @param challenge + * @return Boolean + */ + public Boolean VerifiesChallenges(byte[] message, BigInteger a, ArrayList challenge) { + byte[] buffer, resume; + MessageDigest hash_function = null; + + String tmp = (new String(message)).concat(a.toString()); + + buffer = tmp.getBytes(); + + try { + hash_function = MessageDigest.getInstance("SHA-256"); + } catch (NoSuchAlgorithmException e) { + LoggerUtilities.logStackTrace(e); + } + + resume = hash_function.digest(buffer); + BigInteger test = new BigInteger(resume); + + BigInteger challenges = BigInteger.ZERO; + for (BigInteger c : challenge) + challenges = challenges.xor(c); + + return (challenges.equals(test)); + } + + } diff --git a/src/main/java/protocol/impl/sigma/Sender.java b/src/main/java/protocol/impl/sigma/Sender.java index 28e7f2c6..216b3470 100644 --- a/src/main/java/protocol/impl/sigma/Sender.java +++ b/src/main/java/protocol/impl/sigma/Sender.java @@ -14,11 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with SXP. If not, see . */ package protocol.impl.sigma; -import java.math.BigInteger; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.util.HashMap; import controller.tools.LoggerUtilities; import model.entity.ElGamalKey; @@ -27,218 +22,224 @@ import model.entity.sigma.ResponsesCCE; import model.entity.sigma.ResponsesSchnorr; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.HashMap; + /** * this class simulate the sender but in the end all users have this class * the sender sends all we need in the protocol (mask, responses), and encrypt * the sender extend Fabric, he has to be able to fabricated mask, challenge and response for the composability - * @author sarah * + * @author sarah */ -public class Sender extends Fabric{ - - SecureRandom random = new SecureRandom(); - - - ElGamalKey keys; - private ElGamalEncrypt encrypt; - - private ResEncrypt resEncrypt; - - private HashMap eph = new HashMap(); - - /** - * Constructor - * publicKey and PrivateKey are fixed - * @param publicKeys - * @param privateKeyAs - */ - public Sender (ElGamalKey bobK) - { - // TODO Keys verifications ! - this.keys = bobK; - } - - - /** - * Create mask to need send for the Shnorr - * @return Masks - */ - public Masks SendMasksSchnorr() { - - BigInteger s, a; - s = Utils.rand(1024, keys.getP()); - a = keys.getG().modPow(s,keys.getP()); - - Masks mask = new Masks(a,null); - eph.put(mask, s); - - return mask; - } - - /** - * Create response to need send for the Shnorr - * @return response in bigInteger - */ - private BigInteger ResponseSchnorr(BigInteger challenge,Masks mask) - { - BigInteger response = (keys.getPrivateKey().multiply(challenge)).add(eph.get(mask)); - return response; - } - - /** - * Create responseSchnorr will send - * @return response in bigInteger - */ - public ResponsesSchnorr SendResponseSchnorr(byte[] message) - { - Masks mask = this.SendMasksSchnorr(); - BigInteger challenge = this.SendChallenge(mask, message); - BigInteger response = this.ResponseSchnorr(challenge, mask); - - return new ResponsesSchnorr(mask,challenge,response); - } - - /** - * Create responseSchnorr will send, with challenge fixed - * @return response in bigInteger - */ - public ResponsesSchnorr SendResponseSchnorr(byte[] message, BigInteger challenge) - { - Masks mask = this.SendMasksSchnorr(); - BigInteger response = this.ResponseSchnorr(challenge, mask); - - return new ResponsesSchnorr(mask,challenge,response); - } - - /** - * Create responseSchnorr will send, with challenge fixed - * @return response in bigInteger - */ - public ResponsesSchnorr SendResponseSchnorr(Masks mask, BigInteger challenge) - { - BigInteger response = this.ResponseSchnorr(challenge, mask); - - return new ResponsesSchnorr(mask,challenge,response); - } - - /** - * Create mask to need send for the CCE - * @return Masks - */ - private Masks SendMasksCCE(ElGamalKey tKeys) { - - BigInteger s, a, aBis; - s = Utils.rand(1024, tKeys.getP()); - - a = tKeys.getG().modPow(s,tKeys.getP()); - aBis = tKeys.getPublicKey().modPow(s, tKeys.getP()); - - Masks masks = new Masks(a,aBis); - eph.put(masks, s); - - return masks; - } - - /** - * Create response to need send for the CCE - * @return response in bigInteger - */ - private BigInteger ResponseCCE(BigInteger challenge, Masks mask) { - - BigInteger k = encrypt.getK(); - BigInteger response = (k.multiply(challenge)).add(eph.get(mask)); - return response; - } - - /** - * Create responseCCE will send - * @return response in bigInteger - */ - public ResponsesCCE SendResponseCCE(byte[] message, ElGamalKey tKeys) - { - Masks mask = this.SendMasksCCE(tKeys); - BigInteger challenge = this.SendChallenge(mask, message); - BigInteger response = this.ResponseCCE(challenge, mask); - - return new ResponsesCCE(mask,challenge,response); - } - - /** - * Create responseCCE will send, with challenge fixed - * @return response in bigInteger - */ - public ResponsesCCE SendResponseCCE(byte[] message, ElGamalKey tKeys, BigInteger challenge) - { - Masks mask = this.SendMasksCCE(tKeys); - BigInteger response = this.ResponseCCE(challenge, mask); - - return new ResponsesCCE(mask,challenge,response); - } - - /** - * in not interactiv method the challenge is build, but we don't provide its - * @param mask - * @param message - * @return BigInteger (challenge) - */ - public BigInteger SendChallenge(Masks mask, byte[] message) - { - BigInteger challenge; - byte[] buffer, resume; - MessageDigest hash_function = null; - - String tmp = (new String(message)).concat(mask.getA().toString()); - - buffer = tmp.getBytes(); - - try { - hash_function = MessageDigest.getInstance("SHA-256"); - } catch (NoSuchAlgorithmException e) { - LoggerUtilities.logStackTrace(e); - } - - resume = hash_function.digest(buffer); - challenge = new BigInteger(resume); - return challenge; - } - - - /** - * Encryption - * @param input - * @param tpublicKeyAs - * @param tKeys - * @return resEncrypt (result of encryption) - */ - public ResEncrypt Encryption(byte[] input, ElGamalKey tKeys) - { - ElGamal elGamal = new ElGamal(tKeys); - encrypt = elGamal.encryptForContract(input); - resEncrypt = new ResEncrypt(encrypt.getU(),encrypt.getV(), input); +public class Sender extends Fabric { + + SecureRandom random = new SecureRandom(); + + + ElGamalKey keys; + private ElGamalEncrypt encrypt; + + private ResEncrypt resEncrypt; + + private HashMap eph = new HashMap(); + + /** + * Constructor + * publicKey and PrivateKey are fixed + * + * @param publicKeys + * @param privateKeyAs + */ + public Sender(ElGamalKey bobK) { + // TODO Keys verifications ! + this.keys = bobK; + } + + // Returns a byte[] that is not too long for ElGamal + public static byte[] getIdentificationData(ElGamalKey k) { + String data = k.getPublicKey().toString(); + return data.substring(0, 125).getBytes(); + } + + /** + * Create mask to need send for the Shnorr + * + * @return Masks + */ + public Masks SendMasksSchnorr() { + + BigInteger s, a; + s = Utils.rand(1024, keys.getP()); + a = keys.getG().modPow(s, keys.getP()); + + Masks mask = new Masks(a, null); + eph.put(mask, s); + + return mask; + } + + /** + * Create response to need send for the Shnorr + * + * @return response in bigInteger + */ + private BigInteger ResponseSchnorr(BigInteger challenge, Masks mask) { + BigInteger response = (keys.getPrivateKey().multiply(challenge)).add(eph.get(mask)); + return response; + } + + /** + * Create responseSchnorr will send + * + * @return response in bigInteger + */ + public ResponsesSchnorr SendResponseSchnorr(byte[] message) { + Masks mask = this.SendMasksSchnorr(); + BigInteger challenge = this.SendChallenge(mask, message); + BigInteger response = this.ResponseSchnorr(challenge, mask); + + return new ResponsesSchnorr(mask, challenge, response); + } + + /** + * Create responseSchnorr will send, with challenge fixed + * + * @return response in bigInteger + */ + public ResponsesSchnorr SendResponseSchnorr(byte[] message, BigInteger challenge) { + Masks mask = this.SendMasksSchnorr(); + BigInteger response = this.ResponseSchnorr(challenge, mask); + + return new ResponsesSchnorr(mask, challenge, response); + } + + /** + * Create responseSchnorr will send, with challenge fixed + * + * @return response in bigInteger + */ + public ResponsesSchnorr SendResponseSchnorr(Masks mask, BigInteger challenge) { + BigInteger response = this.ResponseSchnorr(challenge, mask); + + return new ResponsesSchnorr(mask, challenge, response); + } + + /** + * Create mask to need send for the CCE + * + * @return Masks + */ + private Masks SendMasksCCE(ElGamalKey tKeys) { + + BigInteger s, a, aBis; + s = Utils.rand(1024, tKeys.getP()); + + a = tKeys.getG().modPow(s, tKeys.getP()); + aBis = tKeys.getPublicKey().modPow(s, tKeys.getP()); + + Masks masks = new Masks(a, aBis); + eph.put(masks, s); + + return masks; + } + + /** + * Create response to need send for the CCE + * + * @return response in bigInteger + */ + private BigInteger ResponseCCE(BigInteger challenge, Masks mask) { + + BigInteger k = encrypt.getK(); + BigInteger response = (k.multiply(challenge)).add(eph.get(mask)); + return response; + } + + /** + * Create responseCCE will send + * + * @return response in bigInteger + */ + public ResponsesCCE SendResponseCCE(byte[] message, ElGamalKey tKeys) { + Masks mask = this.SendMasksCCE(tKeys); + BigInteger challenge = this.SendChallenge(mask, message); + BigInteger response = this.ResponseCCE(challenge, mask); + + return new ResponsesCCE(mask, challenge, response); + } + + /** + * Create responseCCE will send, with challenge fixed + * + * @return response in bigInteger + */ + public ResponsesCCE SendResponseCCE(byte[] message, ElGamalKey tKeys, BigInteger challenge) { + Masks mask = this.SendMasksCCE(tKeys); + BigInteger response = this.ResponseCCE(challenge, mask); + + return new ResponsesCCE(mask, challenge, response); + } + + /** + * in not interactiv method the challenge is build, but we don't provide its + * + * @param mask + * @param message + * @return BigInteger (challenge) + */ + public BigInteger SendChallenge(Masks mask, byte[] message) { + BigInteger challenge; + byte[] buffer, resume; + MessageDigest hash_function = null; + + String tmp = (new String(message)).concat(mask.getA().toString()); + + buffer = tmp.getBytes(); + + try { + hash_function = MessageDigest.getInstance("SHA-256"); + } catch (NoSuchAlgorithmException e) { + LoggerUtilities.logStackTrace(e); + } + + resume = hash_function.digest(buffer); + challenge = new BigInteger(resume); + return challenge; + } + + /** + * Encryption + * + * @param input + * @param tpublicKeyAs + * @param tKeys + * @return resEncrypt (result of encryption) + */ + public ResEncrypt Encryption(byte[] input, ElGamalKey tKeys) { + ElGamal elGamal = new ElGamal(tKeys); + encrypt = elGamal.encryptForContract(input); + resEncrypt = new ResEncrypt(encrypt.getU(), encrypt.getV(), input); + return resEncrypt; + } + + public ResEncrypt getResEncrypt() { return resEncrypt; - } - - public ResEncrypt getResEncrypt(){ - return resEncrypt; - } - - - public ElGamalKey getKeys() { - return keys; - } - - public ElGamalKey getPublicKeys() { - ElGamalKey k = new ElGamalKey(); - k.setG(keys.getG()); - k.setP(keys.getP()); - k.setPublicKey(keys.getPublicKey()); - return k; - } - - // Returns a byte[] that is not too long for ElGamal - public static byte[] getIdentificationData(ElGamalKey k){ - String data = k.getPublicKey().toString(); - return data.substring(0, 125).getBytes(); - } + } + + public ElGamalKey getKeys() { + return keys; + } + + public ElGamalKey getPublicKeys() { + ElGamalKey k = new ElGamalKey(); + k.setG(keys.getG()); + k.setP(keys.getP()); + k.setPublicKey(keys.getPublicKey()); + return k; + } } diff --git a/src/main/java/protocol/impl/sigma/SigmaClauses.java b/src/main/java/protocol/impl/sigma/SigmaClauses.java index f4359b18..8f4b91eb 100644 --- a/src/main/java/protocol/impl/sigma/SigmaClauses.java +++ b/src/main/java/protocol/impl/sigma/SigmaClauses.java @@ -1,51 +1,51 @@ package protocol.impl.sigma; -import java.util.ArrayList; - import crypt.api.signatures.Signable; import model.entity.sigma.SigmaSignature; -public class SigmaClauses implements Signable{ - - private SigmaSignature sign; - private ArrayList clauses; - - public SigmaClauses(ArrayList s) { - this.clauses = s; - } - - public ArrayList getClauses(){ - return clauses; - } - - @Override - public byte[] getHashableData() { - StringBuffer buffer = new StringBuffer(); - for (String c : clauses) - buffer.append(c); - return buffer.toString().getBytes(); - } - - @Override - public void setSign(SigmaSignature s) { - this.sign = s; - } - - @Override - public SigmaSignature getSign() { - return this.sign; - } - - @Override - public boolean equals(Object o) { - SigmaClauses s2 = (SigmaClauses) o; - if (s2.clauses.size() != this.clauses.size()) - return false; - - boolean b = true; - int n = this.clauses.size(); - for (int k =0; k { + + private SigmaSignature sign; + private ArrayList clauses; + + public SigmaClauses(ArrayList s) { + this.clauses = s; + } + + public ArrayList getClauses() { + return clauses; + } + + @Override + public byte[] getHashableData() { + StringBuffer buffer = new StringBuffer(); + for (String c : clauses) + buffer.append(c); + return buffer.toString().getBytes(); + } + + @Override + public SigmaSignature getSign() { + return this.sign; + } + + @Override + public void setSign(SigmaSignature s) { + this.sign = s; + } + + @Override + public boolean equals(Object o) { + SigmaClauses s2 = (SigmaClauses) o; + if (s2.clauses.size() != this.clauses.size()) + return false; + + boolean b = true; + int n = this.clauses.size(); + for (int k = 0; k < n; k++) + b = b && this.clauses.get(k).equals(s2.clauses.get(k)); + return b; + } } diff --git a/src/main/java/protocol/impl/sigma/SigmaContract.java b/src/main/java/protocol/impl/sigma/SigmaContract.java index 0318a61a..05ea3fda 100644 --- a/src/main/java/protocol/impl/sigma/SigmaContract.java +++ b/src/main/java/protocol/impl/sigma/SigmaContract.java @@ -1,14 +1,6 @@ package protocol.impl.sigma; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; - -import org.bouncycastle.util.Arrays; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.Users; import controller.tools.JsonTools; import crypt.api.signatures.Signable; @@ -20,222 +12,236 @@ import model.entity.ElGamalKey; import model.entity.User; import model.entity.sigma.SigmaSignature; +import org.bouncycastle.util.Arrays; import protocol.api.EstablisherContract; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; + /** * This class aims to create an adapter between ContractEntity and EstablisherContract. We want everything * to be in the ContractEntity and an establisher will use an EstablisherContract. That's why we use this * adapter in the establishers - * - * @author Nathanaël Eon * + * @author Nathanaël Eon */ -public class SigmaContract extends EstablisherContract{ - - // List of parties keys - protected ArrayList parties = new ArrayList<>(); - // Maps the keys with the id of a user - protected HashMap partiesId = new HashMap(); - // Maps the keys with the signatures - protected HashMap signatures = new HashMap(); - // Clauses in the format we need them - protected Signable clauses = null; - // Signer object - protected SigmaSigner signer; - - // Basic constructor - public SigmaContract(){ - super(); - this.signer = new SigmaSigner(); - this.contract = new ContractEntity(); - contract.setClauses(new ArrayList()); - contract.setParties(new ArrayList()); - contract.setSignatures(new HashMap()); - contract.setEstablisherType(EstablisherType.Sigma); - } - - // Constructor from clauses (problem when resolve, because no partiesId set) - public SigmaContract(Signable clauses){ - super(); - this.signer = new SigmaSigner(); - this.contract = new ContractEntity(); - this.setClauses(clauses); - this.contract.setParties(new ArrayList()); - this.contract.setSignatures(new HashMap()); - this.contract.setEstablisherType(EstablisherType.Sigma); - } - - // Constructor from a ContractEntity (what will be most used) - public SigmaContract(ContractEntity c){ - super(); - this.contract=c; - this.signer = new SigmaSigner(); - this.setClauses(contract.getClauses()); - this.setParties(contract.getParties()); - this.contract.setEstablisherType(EstablisherType.Sigma); - } - - /************* GETTERS ***********/ - public Signable getClauses(){ - return clauses; - } - public ArrayList getParties(){ - return parties; - } - public ElGamalKey getTrentKey(){ - return signer.getTrentK(); - } - - /************* SETTERS ***********/ - public void setClauses(ArrayList c){ - this.clauses = new SigmaClauses(c); - this.contract.setClauses(c); - } - public void setClauses(Signable c){ - this.clauses = c; - ArrayList a = new ArrayList(); - a.add(new String(c.getHashableData())); - this.contract.setClauses(a); - } - - /** - * Find the parties keys - * @param s : List of user ids - */ - public void setParties(ArrayList s){ - for (String u : s){ - JsonTools json = new JsonTools<>(new TypeReference(){}); - Users users = new Users(); - User user = json.toEntity(users.get(u)); - this.parties.add(user.getKey()); - this.partiesId.put(user.getKey(), user.getId()); - } - this.contract.setParties(s); - - // Order parties by publicKey (useful to get hashable data - this.parties.sort(new Comparator(){ - @Override - public int compare(ElGamalKey k1, ElGamalKey k2){ - return k1.getPublicKey().compareTo(k2.getPublicKey()); - } - }); - } - /** - * Set the parties from a list of ElGamalKey - * WARNING : this won't set the partiesId - */ - public void setParties(ArrayList p, boolean isSigmaParty){ - this.parties = p; - } - - /** - * Set Trent key and store it into Establishement data - */ - public void setTrentKey (ElGamalKey k){ - signer.setTrentK(k); - } - - /************* STATUS / WISH ***********/ - @Override - public Status getStatus(){ - return contract.getStatus(); - } - @Override - public void setStatus(Status s){ - contract.setStatus(s); - } - - @Override - public Wish getWish(){ - return contract.getWish(); - } - @Override - public void setWish(Wish w){ - contract.setWish(w); - } - - /************* Abstract method implementation **********/ - - @Override - public boolean isFinalized() { - boolean result = false; - - if (this.getTrentKey() == null){ - return false;} - - - for(ElGamalKey k: parties) { - signer.setReceiverK(k); - if(signatures.get(k) == null){ - return false; - } - - byte[] data = (new String(this.getHashableData())).getBytes(); - if (signer.verify(data, signatures.get(k))) - return true; - - for (int round=1; round contract) { - return this.equals(contract) && this.isFinalized(); - } - - @Override - public boolean equals(EstablisherContract c) { - if (!(c instanceof SigmaContract)) - return false; - SigmaContract contract = (SigmaContract) c; - if (contract.clauses == null) - return false; - return Arrays.areEqual(this.getHashableData(), contract.getHashableData()); - } - - - @Override - public byte[] getHashableData() { - BigInteger sum = BigInteger.ZERO; - for(ElGamalKey k: parties) { - sum = sum.add(k.getPublicKey()); - } - - StringBuffer buffer = new StringBuffer(); - buffer.append(sum.toString()); - byte[] signable = this.clauses.getHashableData(); - - int signableL = signable.length; - int bufferL = buffer.toString().getBytes().length; - byte[] concate = new byte[signableL + bufferL]; - System.arraycopy(new String(buffer).getBytes(), 0, concate, 0, bufferL); - System.arraycopy(signable, 0, concate, bufferL, signableL); - - return concate; - } - - @Override - public SigmaSignature sign(SigmaSigner signer, ElGamalKey k) { - signer.setKey(k); - return signer.sign(this.getHashableData()); - } +public class SigmaContract extends EstablisherContract { + + // List of parties keys + protected ArrayList parties = new ArrayList<>(); + // Maps the keys with the id of a user + protected HashMap partiesId = new HashMap(); + // Maps the keys with the signatures + protected HashMap signatures = new HashMap(); + // Clauses in the format we need them + protected Signable clauses = null; + // Signer object + protected SigmaSigner signer; + + // Basic constructor + public SigmaContract() { + super(); + this.signer = new SigmaSigner(); + this.contract = new ContractEntity(); + contract.setClauses(new ArrayList()); + contract.setParties(new ArrayList()); + contract.setSignatures(new HashMap()); + contract.setEstablisherType(EstablisherType.Sigma); + } + + // Constructor from clauses (problem when resolve, because no partiesId set) + public SigmaContract(Signable clauses) { + super(); + this.signer = new SigmaSigner(); + this.contract = new ContractEntity(); + this.setClauses(clauses); + this.contract.setParties(new ArrayList()); + this.contract.setSignatures(new HashMap()); + this.contract.setEstablisherType(EstablisherType.Sigma); + } + + // Constructor from a ContractEntity (what will be most used) + public SigmaContract(ContractEntity c) { + super(); + this.contract = c; + this.signer = new SigmaSigner(); + this.setClauses(contract.getClauses()); + this.setParties(contract.getParties()); + this.contract.setEstablisherType(EstablisherType.Sigma); + } + + /************* GETTERS ***********/ + public Signable getClauses() { + return clauses; + } + + public void setClauses(Signable c) { + this.clauses = c; + ArrayList a = new ArrayList(); + a.add(new String(c.getHashableData())); + this.contract.setClauses(a); + } + + public ArrayList getParties() { + return parties; + } + + /** + * Find the parties keys + * + * @param s : List of user ids + */ + public void setParties(ArrayList s) { + for (String u : s) { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + Users users = new Users(); + User user = json.toEntity(users.get(u)); + this.parties.add(user.getKey()); + this.partiesId.put(user.getKey(), user.getId()); + } + this.contract.setParties(s); + + // Order parties by publicKey (useful to get hashable data + this.parties.sort(new Comparator() { + @Override + public int compare(ElGamalKey k1, ElGamalKey k2) { + return k1.getPublicKey().compareTo(k2.getPublicKey()); + } + }); + } + + public ElGamalKey getTrentKey() { + return signer.getTrentK(); + } + + /** + * Set Trent key and store it into Establishement data + */ + public void setTrentKey(ElGamalKey k) { + signer.setTrentK(k); + } + + /************* SETTERS ***********/ + public void setClauses(ArrayList c) { + this.clauses = new SigmaClauses(c); + this.contract.setClauses(c); + } + + /** + * Set the parties from a list of ElGamalKey + * WARNING : this won't set the partiesId + */ + public void setParties(ArrayList p, boolean isSigmaParty) { + this.parties = p; + } + + /************* STATUS / WISH ***********/ + @Override + public Status getStatus() { + return contract.getStatus(); + } + + @Override + public void setStatus(Status s) { + contract.setStatus(s); + } + + @Override + public Wish getWish() { + return contract.getWish(); + } + + @Override + public void setWish(Wish w) { + contract.setWish(w); + } + + /************* Abstract method implementation **********/ + + @Override + public boolean isFinalized() { + boolean result = false; + + if (this.getTrentKey() == null) { + return false; + } + + + for (ElGamalKey k : parties) { + signer.setReceiverK(k); + if (signatures.get(k) == null) { + return false; + } + + byte[] data = (new String(this.getHashableData())).getBytes(); + if (signer.verify(data, signatures.get(k))) + return true; + + for (int round = 1; round < parties.size() + 2; round++) { + data = (new String(this.getHashableData()) + round).getBytes(); + if (signer.verify(data, signatures.get(k))) { + result = true; + break; + } + } + } + return result; + } + + @Override + public void addSignature(ElGamalKey k, SigmaSignature s) { + if (k == null || !this.parties.contains(k)) { + throw new RuntimeException("invalid key"); + } + signatures.put(k, s); + contract.getSignatures().put(this.partiesId.get(k), s.toString()); + + if (this.isFinalized()) + this.setStatus(Status.FINALIZED); + } + + @Override + public boolean checkContrat(EstablisherContract contract) { + return this.equals(contract) && this.isFinalized(); + } + + @Override + public boolean equals(EstablisherContract c) { + if (!(c instanceof SigmaContract)) + return false; + SigmaContract contract = (SigmaContract) c; + if (contract.clauses == null) + return false; + return Arrays.areEqual(this.getHashableData(), contract.getHashableData()); + } + + + @Override + public byte[] getHashableData() { + BigInteger sum = BigInteger.ZERO; + for (ElGamalKey k : parties) { + sum = sum.add(k.getPublicKey()); + } + + StringBuffer buffer = new StringBuffer(); + buffer.append(sum.toString()); + byte[] signable = this.clauses.getHashableData(); + + int signableL = signable.length; + int bufferL = buffer.toString().getBytes().length; + byte[] concate = new byte[signableL + bufferL]; + System.arraycopy(new String(buffer).getBytes(), 0, concate, 0, bufferL); + System.arraycopy(signable, 0, concate, bufferL, signableL); + + return concate; + } + + @Override + public SigmaSignature sign(SigmaSigner signer, ElGamalKey k) { + signer.setKey(k); + return signer.sign(this.getHashableData()); + } } diff --git a/src/main/java/protocol/impl/sigma/SigmaEstablisherData.java b/src/main/java/protocol/impl/sigma/SigmaEstablisherData.java index 8a7cafb5..e1f54f72 100644 --- a/src/main/java/protocol/impl/sigma/SigmaEstablisherData.java +++ b/src/main/java/protocol/impl/sigma/SigmaEstablisherData.java @@ -1,74 +1,68 @@ package protocol.impl.sigma; -import java.util.HashMap; - -import javax.xml.bind.annotation.XmlElement; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; - import controller.tools.MapKeyStringDeserializer; import controller.tools.MapSerializer; import model.entity.ElGamalKey; import model.entity.sigma.Or; import protocol.impl.sigma.steps.ProtocolStep; +import javax.xml.bind.annotation.XmlElement; +import java.util.HashMap; + public class SigmaEstablisherData { - - @XmlElement(name="trentkey") - private ElGamalKey trentKey; - - @XmlElement(name="protocolstep") - private ProtocolStep protocolStep; - - @XmlElement(name="roundReceived") - private Or[][] roundReceived; - - @XmlElement(name="contract") - private SigmaContract contract; - - @XmlElement(name="uris") + + @XmlElement(name = "uris") @JsonSerialize(using = MapSerializer.class) @JsonDeserialize(using = MapKeyStringDeserializer.class) - protected HashMap uris; - - - public void setTrentKey(ElGamalKey t){ - this.trentKey = t; - } - public ElGamalKey getTrentKey(){ - return this.trentKey; - } - - - public void setProtocolStep(ProtocolStep p){ - this.protocolStep = p; - } - public ProtocolStep getProtocolStep(){ - return this.protocolStep; - } - - - public void setRoundReceived(Or[][] r){ - this.roundReceived = r; - } - public Or[][] getRoundReceived(){ - return this.roundReceived; - } - - - public void setContract(SigmaContract s){ - this.contract = s; - } - public SigmaContract getContract(){ - return this.contract; - } - - - public void setUris(HashMap u){ - this.uris = u; - } - public HashMap getUris(){ - return this.uris; - } + protected HashMap uris; + @XmlElement(name = "trentkey") + private ElGamalKey trentKey; + @XmlElement(name = "protocolstep") + private ProtocolStep protocolStep; + @XmlElement(name = "roundReceived") + private Or[][] roundReceived; + @XmlElement(name = "contract") + private SigmaContract contract; + + public ElGamalKey getTrentKey() { + return this.trentKey; + } + + public void setTrentKey(ElGamalKey t) { + this.trentKey = t; + } + + public ProtocolStep getProtocolStep() { + return this.protocolStep; + } + + public void setProtocolStep(ProtocolStep p) { + this.protocolStep = p; + } + + public Or[][] getRoundReceived() { + return this.roundReceived; + } + + public void setRoundReceived(Or[][] r) { + this.roundReceived = r; + } + + public SigmaContract getContract() { + return this.contract; + } + + public void setContract(SigmaContract s) { + this.contract = s; + } + + public HashMap getUris() { + return this.uris; + } + + public void setUris(HashMap u) { + this.uris = u; + } } diff --git a/src/main/java/protocol/impl/sigma/Trent.java b/src/main/java/protocol/impl/sigma/Trent.java index 64decba2..f21522a3 100644 --- a/src/main/java/protocol/impl/sigma/Trent.java +++ b/src/main/java/protocol/impl/sigma/Trent.java @@ -14,291 +14,291 @@ You should have received a copy of the GNU Lesser General Public License along with SXP. If not, see . */ package protocol.impl.sigma; -import java.math.BigInteger; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.HashMap; import com.fasterxml.jackson.core.type.TypeReference; - -import crypt.impl.signatures.SigmaSigner; - import controller.Application; import controller.tools.JsonTools; import controller.tools.LoggerUtilities; import crypt.api.encryption.Encrypter; import crypt.factories.EncrypterFactory; +import crypt.impl.signatures.SigmaSigner; import model.entity.ContractEntity; import model.entity.ElGamalKey; -import model.entity.sigma.And; -import model.entity.sigma.Masks; -import model.entity.sigma.Or; -import model.entity.sigma.ResEncrypt; -import model.entity.sigma.ResponsesCCD; -import model.entity.sigma.SigmaSignature; +import model.entity.sigma.*; import network.api.EstablisherService; import network.api.EstablisherServiceListener; import network.api.Peer; import protocol.impl.sigma.steps.ProtocolResolve; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.HashMap; + /** * this class simulate the arbiter but in the end all users have this class * the arbiter can described message, and in the protocol CCD - * @author sarah * + * @author sarah */ public class Trent { - - public final static String TRENT_MESSAGE = "FROM_TRENT"; - - protected EstablisherService establisherService; - - protected final ElGamalKey keys; - private HashMap eph = new HashMap(); - - private HashMap solvers = new HashMap(); - - private Encrypter encrypter; - - /** - * Constructor - */ - public Trent(final ElGamalKey key){ - this.keys = key; - - encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); - encrypter.setKey(keys); - } - - public void setListener(){ - establisherService = (EstablisherService) Application.getInstance().getPeer().getService(EstablisherService.NAME); - // Add a listener in case someone ask to resolve - establisherService.setListener("title", ProtocolResolve.TITLE + this.keys.getPublicKey().toString(), "TRENT"+this.keys.getPublicKey().toString(),new EstablisherServiceListener() { - @Override - public void notify(String title, String content, String senderId) { - BigInteger msgSenKey = new BigInteger(senderId); - ElGamalKey senderK = new ElGamalKey(); - senderK.setPublicKey(msgSenKey); - senderK.setG(keys.getG()); - senderK.setP(keys.getP()); - - resolve(content, senderK); - } - }, false); - } - - /* - * Trent resolve function - * Send a message to each signer of the contract - * Message format : ArrayList = {title, content} - */ - private void resolve(String message, ElGamalKey senderK){ - Peer peer = Application.getInstance().getPeer(); - - JsonTools json = new JsonTools<>(new TypeReference(){}); - String[] content = json.toEntity(message); - - // Message received useless - if (content != null){ - - // Data stored in the message - int round = Integer.parseInt(content[0]); - - JsonTools json2 = new JsonTools<>(new TypeReference(){}); - SigmaContract contract = new SigmaContract(json2.toEntity(content[1])); - String m = new String(encrypter.decrypt(content[2].getBytes())); - - JsonTools json4 = new JsonTools<>(new TypeReference(){}); - String sign = new String(encrypter.decrypt(content[3].getBytes())); - SigmaSignature signature = json4.toEntity(sign); - - - // Setup the necessary to check signature - SigmaSigner s = new SigmaSigner(); - s.setKey(this.keys); - s.setReceiverK(senderK); - s.setTrentK(this.keys); - - boolean verifiedOr = true; - if (round > 0){ - byte[] data = (new String(contract.getHashableData()) + round).getBytes(); - JsonTools json3 = new JsonTools<>(new TypeReference(){}); - Or[] orT = json3.toEntity(m); - - // Checks the signature - for (Or o : orT){ - verifiedOr = verifiedOr - && o.Verifies(data) - && this.VerifiesRes(o, senderK.getPublicKey()); - } - } - if (s.verify(m.getBytes(), signature) && verifiedOr){ - String id = new String(contract.getHashableData()); - if (solvers.get(id) == null){ - solvers.put(id, new TrentSolver(contract, this)); - } - - // TrentSolver is the class dealing with the message - TrentSolver ts = solvers.get(id); - ArrayList resolved = ts.resolveT(m, round, senderK.getPublicKey().toString()); - - if (resolved == null){ - establisherService.sendContract(TRENT_MESSAGE + new String(contract.getHashableData()), - "dishonest " + senderK.getPublicKey().toString(), - this.keys.getPublicKey().toString(), - peer); - } else{ - HashMap signatures = new HashMap(); - for (ElGamalKey k : contract.getParties()){ - s.setReceiverK(k); - SigmaSignature signa = s.sign(resolved.get(1).getBytes()); - JsonTools jsons = new JsonTools<>(new TypeReference(){}); - signatures.put(k.getPublicKey().toString(),jsons.toJson(signa)); - } - JsonTools> jsona = new JsonTools<>(new TypeReference>(){}); - resolved.add(jsona.toJson(signatures)); - - JsonTools> jsons = new JsonTools<>(new TypeReference>(){}); - String answer = jsons.toJson(resolved); - - establisherService.sendContract(TRENT_MESSAGE + new String(contract.getHashableData()), - answer, - this.keys.getPublicKey().toString(), - peer); - } - } - } - } - - /** - * Create mask for the CCD response - * @param res - * @return Masks - */ - public Masks SendMasks(ResEncrypt res) - { - BigInteger s; - s = Utils.rand(160, keys.getP()); - - BigInteger a, aBis; - - a = keys.getG().modPow(s, keys.getP()); - aBis = res.getU().modPow(s, keys.getP()); - - Masks masks = new Masks(a,aBis); - eph.put(masks, s); - - return masks; - } - - /** - * Create challenge for the not interactive version for the CCD - * @param mask - * @param message - * @return - */ - public BigInteger SendChallenge(Masks mask, byte[] message) - { - BigInteger challenge; - byte[] buffer, resume; - MessageDigest hash_function = null; - - String tmp = message.toString().concat(mask.getA().toString()); - - buffer = tmp.getBytes(); - - try { - hash_function = MessageDigest.getInstance("SHA-256"); - } catch (NoSuchAlgorithmException e) { - LoggerUtilities.logStackTrace(e); - } - - resume = hash_function.digest(buffer); - challenge = new BigInteger(resume); - return challenge; - } - - /** - * Create reponse CCD - * @param challenge - * @param mask - * @return BigInteger - */ - public BigInteger SendAnswer(BigInteger challenge, Masks mask) - { - BigInteger r = (keys.getPrivateKey().multiply(challenge)).add(eph.get(mask)); - return r; - } - - /** - * Create response CCD will send - * @param resEncrypt - * @return - */ - public ResponsesCCD SendResponse(ResEncrypt resEncrypt) - { - Masks mask = this.SendMasks(resEncrypt); - BigInteger challenge = this.SendChallenge(mask, resEncrypt.getM()); - BigInteger response = this.SendAnswer(challenge, mask); - - return new ResponsesCCD(mask,challenge,response); - } - - /** - * Create response CCD will send - * @param resEncrypt - * @return - */ - public ResponsesCCD SendResponse(ResEncrypt resEncrypt, byte[] m) - { - Masks mask = this.SendMasks(resEncrypt); - BigInteger challenge = this.SendChallenge(mask, m); - BigInteger response = this.SendAnswer(challenge, mask); - - return new ResponsesCCD(mask,challenge,response); - } - - public boolean VerifiesRes(Or o, BigInteger senPubK){ - boolean isVerified = false; - for (And a : o.ands){ - byte[] data = Sender.getIdentificationData(a.rK.get(a.responses[0])); - BigInteger k = new BigInteger(data); - BigInteger h = decryption(a.resEncrypt); - isVerified = isVerified || h.equals(k); - } - return isVerified; - } - - /** - * decrypt - * @param cipherText - * @return - */ - public byte[] decryption (byte[]cipherText) - { - ElGamal elGamal = new ElGamal (keys); + + public final static String TRENT_MESSAGE = "FROM_TRENT"; + protected final ElGamalKey keys; + protected EstablisherService establisherService; + private HashMap eph = new HashMap(); + + private HashMap solvers = new HashMap(); + + private Encrypter encrypter; + + /** + * Constructor + */ + public Trent(final ElGamalKey key) { + this.keys = key; + + encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); + encrypter.setKey(keys); + } + + public void setListener() { + establisherService = (EstablisherService) Application.getInstance().getPeer().getService(EstablisherService.NAME); + // Add a listener in case someone ask to resolve + establisherService.setListener("title", ProtocolResolve.TITLE + this.keys.getPublicKey().toString(), "TRENT" + this.keys.getPublicKey().toString(), new EstablisherServiceListener() { + @Override + public void notify(String title, String content, String senderId) { + BigInteger msgSenKey = new BigInteger(senderId); + ElGamalKey senderK = new ElGamalKey(); + senderK.setPublicKey(msgSenKey); + senderK.setG(keys.getG()); + senderK.setP(keys.getP()); + + resolve(content, senderK); + } + }, false); + } + + /* + * Trent resolve function + * Send a message to each signer of the contract + * Message format : ArrayList = {title, content} + */ + private void resolve(String message, ElGamalKey senderK) { + Peer peer = Application.getInstance().getPeer(); + + JsonTools json = new JsonTools<>(new TypeReference() { + }); + String[] content = json.toEntity(message); + + // Message received useless + if (content != null) { + + // Data stored in the message + int round = Integer.parseInt(content[0]); + + JsonTools json2 = new JsonTools<>(new TypeReference() { + }); + SigmaContract contract = new SigmaContract(json2.toEntity(content[1])); + String m = new String(encrypter.decrypt(content[2].getBytes())); + + JsonTools json4 = new JsonTools<>(new TypeReference() { + }); + String sign = new String(encrypter.decrypt(content[3].getBytes())); + SigmaSignature signature = json4.toEntity(sign); + + + // Setup the necessary to check signature + SigmaSigner s = new SigmaSigner(); + s.setKey(this.keys); + s.setReceiverK(senderK); + s.setTrentK(this.keys); + + boolean verifiedOr = true; + if (round > 0) { + byte[] data = (new String(contract.getHashableData()) + round).getBytes(); + JsonTools json3 = new JsonTools<>(new TypeReference() { + }); + Or[] orT = json3.toEntity(m); + + // Checks the signature + for (Or o : orT) { + verifiedOr = verifiedOr + && o.Verifies(data) + && this.VerifiesRes(o, senderK.getPublicKey()); + } + } + if (s.verify(m.getBytes(), signature) && verifiedOr) { + String id = new String(contract.getHashableData()); + if (solvers.get(id) == null) { + solvers.put(id, new TrentSolver(contract, this)); + } + + // TrentSolver is the class dealing with the message + TrentSolver ts = solvers.get(id); + ArrayList resolved = ts.resolveT(m, round, senderK.getPublicKey().toString()); + + if (resolved == null) { + establisherService.sendContract(TRENT_MESSAGE + new String(contract.getHashableData()), + "dishonest " + senderK.getPublicKey().toString(), + this.keys.getPublicKey().toString(), + peer); + } else { + HashMap signatures = new HashMap(); + for (ElGamalKey k : contract.getParties()) { + s.setReceiverK(k); + SigmaSignature signa = s.sign(resolved.get(1).getBytes()); + JsonTools jsons = new JsonTools<>(new TypeReference() { + }); + signatures.put(k.getPublicKey().toString(), jsons.toJson(signa)); + } + JsonTools> jsona = new JsonTools<>(new TypeReference>() { + }); + resolved.add(jsona.toJson(signatures)); + + JsonTools> jsons = new JsonTools<>(new TypeReference>() { + }); + String answer = jsons.toJson(resolved); + + establisherService.sendContract(TRENT_MESSAGE + new String(contract.getHashableData()), + answer, + this.keys.getPublicKey().toString(), + peer); + } + } + } + } + + /** + * Create mask for the CCD response + * + * @param res + * @return Masks + */ + public Masks SendMasks(ResEncrypt res) { + BigInteger s; + s = Utils.rand(160, keys.getP()); + + BigInteger a, aBis; + + a = keys.getG().modPow(s, keys.getP()); + aBis = res.getU().modPow(s, keys.getP()); + + Masks masks = new Masks(a, aBis); + eph.put(masks, s); + + return masks; + } + + /** + * Create challenge for the not interactive version for the CCD + * + * @param mask + * @param message + * @return + */ + public BigInteger SendChallenge(Masks mask, byte[] message) { + BigInteger challenge; + byte[] buffer, resume; + MessageDigest hash_function = null; + + String tmp = message.toString().concat(mask.getA().toString()); + + buffer = tmp.getBytes(); + + try { + hash_function = MessageDigest.getInstance("SHA-256"); + } catch (NoSuchAlgorithmException e) { + LoggerUtilities.logStackTrace(e); + } + + resume = hash_function.digest(buffer); + challenge = new BigInteger(resume); + return challenge; + } + + /** + * Create reponse CCD + * + * @param challenge + * @param mask + * @return BigInteger + */ + public BigInteger SendAnswer(BigInteger challenge, Masks mask) { + BigInteger r = (keys.getPrivateKey().multiply(challenge)).add(eph.get(mask)); + return r; + } + + /** + * Create response CCD will send + * + * @param resEncrypt + * @return + */ + public ResponsesCCD SendResponse(ResEncrypt resEncrypt) { + Masks mask = this.SendMasks(resEncrypt); + BigInteger challenge = this.SendChallenge(mask, resEncrypt.getM()); + BigInteger response = this.SendAnswer(challenge, mask); + + return new ResponsesCCD(mask, challenge, response); + } + + /** + * Create response CCD will send + * + * @param resEncrypt + * @return + */ + public ResponsesCCD SendResponse(ResEncrypt resEncrypt, byte[] m) { + Masks mask = this.SendMasks(resEncrypt); + BigInteger challenge = this.SendChallenge(mask, m); + BigInteger response = this.SendAnswer(challenge, mask); + + return new ResponsesCCD(mask, challenge, response); + } + + public boolean VerifiesRes(Or o, BigInteger senPubK) { + boolean isVerified = false; + for (And a : o.ands) { + byte[] data = Sender.getIdentificationData(a.rK.get(a.responses[0])); + BigInteger k = new BigInteger(data); + BigInteger h = decryption(a.resEncrypt); + isVerified = isVerified || h.equals(k); + } + return isVerified; + } + + /** + * decrypt + * + * @param cipherText + * @return + */ + public byte[] decryption(byte[] cipherText) { + ElGamal elGamal = new ElGamal(keys); return elGamal.decryptWithPrivateKey(cipherText); - } - - public BigInteger decryption(ResEncrypt res){ - BigInteger u = res.getU(); - BigInteger v = res.getV(); - BigInteger p = keys.getP(); - BigInteger data = u.modPow(p.subtract(BigInteger.ONE).subtract(keys.getPrivateKey()), p).multiply(v).mod(p); - return data; - } - - /** - * gives trent public keys - * @return - */ - public ElGamalKey getKey(){ - ElGamalKey pubKey = new ElGamalKey(); - pubKey.setG(this.keys.getG()); - pubKey.setP(this.keys.getP()); - pubKey.setPublicKey(this.keys.getPublicKey()); - return pubKey; - } + } + + public BigInteger decryption(ResEncrypt res) { + BigInteger u = res.getU(); + BigInteger v = res.getV(); + BigInteger p = keys.getP(); + BigInteger data = u.modPow(p.subtract(BigInteger.ONE).subtract(keys.getPrivateKey()), p).multiply(v).mod(p); + return data; + } + + /** + * gives trent public keys + * + * @return + */ + public ElGamalKey getKey() { + ElGamalKey pubKey = new ElGamalKey(); + pubKey.setG(this.keys.getG()); + pubKey.setP(this.keys.getP()); + pubKey.setPublicKey(this.keys.getPublicKey()); + return pubKey; + } } diff --git a/src/main/java/protocol/impl/sigma/TrentSolver.java b/src/main/java/protocol/impl/sigma/TrentSolver.java index e1b31606..b0594985 100644 --- a/src/main/java/protocol/impl/sigma/TrentSolver.java +++ b/src/main/java/protocol/impl/sigma/TrentSolver.java @@ -1,146 +1,152 @@ package protocol.impl.sigma; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Set; - import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import model.entity.sigma.Or; import model.entity.sigma.ResEncrypt; import model.entity.sigma.ResponsesCCD; import model.entity.sigma.SigmaSignature; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Set; + public class TrentSolver { - - private SigmaContract contract; - private boolean optimistic = true; - private Trent trent; - - // An index of the list is a round - // An index of the map is a user id - private ArrayList> possiblyHonestClaims; - private HashMap dishonestClaims; - - - public TrentSolver(SigmaContract c, Trent t){ - this.contract = c; - this.trent = t; - - this.possiblyHonestClaims = new ArrayList>(); - this.dishonestClaims = new HashMap(); - } - - /** - * Send the answer to resolveT - * @param orT : a claim by i on round : @param round - * @return : A string list of the form {answer type, Json answer} - */ - public ArrayList resolveT(String m, int round, String senderId){ - int N = contract.getParties().size(); - // j was dishonest and i shows it - for (int k=0; k+1 claims = possiblyHonestClaims.get(k); - Set set = claims.keySet(); - for (String s : set){ - if (s != senderId){ - String[] dishonestC = {claims.get(s), m}; - dishonestClaims.put(s, dishonestC); - possiblyHonestClaims.get(k).remove(s); - - ArrayList res = new ArrayList(); - res.add("honestyToken"); - res.add(honestyToken()); - return res; - } - } - } - } - - // i was dishonest and i shows it - for (HashMap claim : possiblyHonestClaims){ - int k = possiblyHonestClaims.indexOf(claim); - if (claim.get(senderId) != null && k != round){ - String[] dishonestC = {m, claim.get(senderId)}; - dishonestClaims.put(senderId, dishonestC); - possiblyHonestClaims.get(k).remove(senderId); - return null; - } - } - - // i was dishonest and j shows it - for (int k=round+1; k claims = possiblyHonestClaims.get(k); - Set set = claims.keySet(); - for (String s : set){ - if (s != senderId){ - String[] dishonestC = {m, claims.get(s)}; - dishonestClaims.put(senderId, dishonestC); - possiblyHonestClaims.get(k).remove(senderId); - return null; - } - } - } - }catch (IndexOutOfBoundsException e){} - } - - /***** Now the claim may be honest ****/ - // Claim with promises, wins - if ((possiblyHonestClaims.isEmpty() && round>0) || !optimistic){ - optimistic = false; - - ArrayList res = new ArrayList(); - res.add("resolved"); - res.add(resolveToken(m, round)); - return res; - - }else{ - HashMap h = new HashMap(); - h.put(senderId, m); - possiblyHonestClaims.add(round, h); - - ArrayList res = new ArrayList(); - res.add("aborted"); - res.add(honestyToken()); - return res; - } - } - - // This returns the full set of signatures - public String resolveToken(String m, int round){ - - int n = contract.getParties().size(); - - JsonTools json3 = new JsonTools<>(new TypeReference(){}); - Or[] orT = json3.toEntity(m); - ArrayList signatures = new ArrayList(); - - byte[] data = (new String(contract.getClauses().getHashableData()) + String.valueOf(round)).getBytes(); - ResponsesCCD response; - ResEncrypt res; - - JsonTools> json = new JsonTools<>(new TypeReference>(){}); - - for (int k=0; k json = new JsonTools<>(new TypeReference(){}); - JsonTools>> jsonA = new JsonTools<>(new TypeReference>>(){}); - JsonTools> jsonB = new JsonTools<>(new TypeReference>(){}); - String[] data = {jsonA.toJson(possiblyHonestClaims), jsonB.toJson(dishonestClaims)}; - return json.toJson(data); - } + + private SigmaContract contract; + private boolean optimistic = true; + private Trent trent; + + // An index of the list is a round + // An index of the map is a user id + private ArrayList> possiblyHonestClaims; + private HashMap dishonestClaims; + + + public TrentSolver(SigmaContract c, Trent t) { + this.contract = c; + this.trent = t; + + this.possiblyHonestClaims = new ArrayList>(); + this.dishonestClaims = new HashMap(); + } + + /** + * Send the answer to resolveT + * + * @param orT : a claim by i on round : @param round + * @return : A string list of the form {answer type, Json answer} + */ + public ArrayList resolveT(String m, int round, String senderId) { + int N = contract.getParties().size(); + // j was dishonest and i shows it + for (int k = 0; k + 1 < round; k++) { + if (possiblyHonestClaims.get(k) != null) { + HashMap claims = possiblyHonestClaims.get(k); + Set set = claims.keySet(); + for (String s : set) { + if (s != senderId) { + String[] dishonestC = {claims.get(s), m}; + dishonestClaims.put(s, dishonestC); + possiblyHonestClaims.get(k).remove(s); + + ArrayList res = new ArrayList(); + res.add("honestyToken"); + res.add(honestyToken()); + return res; + } + } + } + } + + // i was dishonest and i shows it + for (HashMap claim : possiblyHonestClaims) { + int k = possiblyHonestClaims.indexOf(claim); + if (claim.get(senderId) != null && k != round) { + String[] dishonestC = {m, claim.get(senderId)}; + dishonestClaims.put(senderId, dishonestC); + possiblyHonestClaims.get(k).remove(senderId); + return null; + } + } + + // i was dishonest and j shows it + for (int k = round + 1; k < N; k++) { + try { + if (possiblyHonestClaims.get(k) != null) { + HashMap claims = possiblyHonestClaims.get(k); + Set set = claims.keySet(); + for (String s : set) { + if (s != senderId) { + String[] dishonestC = {m, claims.get(s)}; + dishonestClaims.put(senderId, dishonestC); + possiblyHonestClaims.get(k).remove(senderId); + return null; + } + } + } + } catch (IndexOutOfBoundsException e) { + } + } + + /***** Now the claim may be honest ****/ + // Claim with promises, wins + if ((possiblyHonestClaims.isEmpty() && round > 0) || !optimistic) { + optimistic = false; + + ArrayList res = new ArrayList(); + res.add("resolved"); + res.add(resolveToken(m, round)); + return res; + + } else { + HashMap h = new HashMap(); + h.put(senderId, m); + possiblyHonestClaims.add(round, h); + + ArrayList res = new ArrayList(); + res.add("aborted"); + res.add(honestyToken()); + return res; + } + } + + // This returns the full set of signatures + public String resolveToken(String m, int round) { + + int n = contract.getParties().size(); + + JsonTools json3 = new JsonTools<>(new TypeReference() { + }); + Or[] orT = json3.toEntity(m); + ArrayList signatures = new ArrayList(); + + byte[] data = (new String(contract.getClauses().getHashableData()) + String.valueOf(round)).getBytes(); + ResponsesCCD response; + ResEncrypt res; + + JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + + for (int k = 0; k < n; k++) { + res = orT[k].ands[0].resEncrypt; + response = trent.SendResponse(res, data); + SigmaSignature s = new SigmaSignature(orT[k], response); + s.setTrenK(trent.getKey()); + signatures.add(k, s); + } + return json.toJson(signatures); + } + + // Return (PossiblyHonestClaims, dishonestClaims) + public String honestyToken() { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + JsonTools>> jsonA = new JsonTools<>(new TypeReference>>() { + }); + JsonTools> jsonB = new JsonTools<>(new TypeReference>() { + }); + String[] data = {jsonA.toJson(possiblyHonestClaims), jsonB.toJson(dishonestClaims)}; + return json.toJson(data); + } } diff --git a/src/main/java/protocol/impl/sigma/Utils.java b/src/main/java/protocol/impl/sigma/Utils.java index e8301cf7..3691aa0d 100644 --- a/src/main/java/protocol/impl/sigma/Utils.java +++ b/src/main/java/protocol/impl/sigma/Utils.java @@ -14,42 +14,43 @@ You should have received a copy of the GNU Lesser General Public License along with SXP. If not, see . */ package protocol.impl.sigma; + import java.math.BigInteger; import java.security.SecureRandom; /** * this class is util class - * @author sarah * + * @author sarah */ public class Utils { - static SecureRandom random = new SecureRandom(); - - /** - * random value - * @param bitLength - * @param object - * @return - */ - static public BigInteger rand (int bitLength, BigInteger p) - { - if (p.compareTo(BigInteger.ZERO) <= 0 || bitLength <= 0){ - return BigInteger.ZERO; - } - BigInteger s; - s = new BigInteger(bitLength,random); - // 0 < s < p - while(s.compareTo(BigInteger.ONE) < 0 || s.compareTo(p) > 0) - s = new BigInteger(bitLength,random); - - return s; - } - - public static String toHex(byte[] donnees) { - return javax.xml.bind.DatatypeConverter.printHexBinary(donnees); + static SecureRandom random = new SecureRandom(); + + /** + * random value + * + * @param bitLength + * @param object + * @return + */ + static public BigInteger rand(int bitLength, BigInteger p) { + if (p.compareTo(BigInteger.ZERO) <= 0 || bitLength <= 0) { + return BigInteger.ZERO; + } + BigInteger s; + s = new BigInteger(bitLength, random); + // 0 < s < p + while (s.compareTo(BigInteger.ONE) < 0 || s.compareTo(p) > 0) + s = new BigInteger(bitLength, random); + + return s; + } + + public static String toHex(byte[] donnees) { + return javax.xml.bind.DatatypeConverter.printHexBinary(donnees); } - /*static public BigInteger randPrime(int bitLength) + /*static public BigInteger randPrime(int bitLength) { }*/ diff --git a/src/main/java/protocol/impl/sigma/steps/ProtocolChooseTrent.java b/src/main/java/protocol/impl/sigma/steps/ProtocolChooseTrent.java index 68bdd8e6..44ccf374 100644 --- a/src/main/java/protocol/impl/sigma/steps/ProtocolChooseTrent.java +++ b/src/main/java/protocol/impl/sigma/steps/ProtocolChooseTrent.java @@ -1,20 +1,8 @@ package protocol.impl.sigma.steps; -import java.math.BigInteger; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.ListIterator; - -import javax.xml.bind.annotation.XmlElement; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; - import controller.Users; import controller.tools.JsonTools; import crypt.factories.ElGamalAsymKeyFactory; @@ -26,273 +14,282 @@ import protocol.impl.SigmaEstablisher; import protocol.impl.sigma.SigmaContract; +import javax.xml.bind.annotation.XmlElement; +import java.math.BigInteger; +import java.security.SecureRandom; +import java.util.*; + /** * Choose Trent with the other peers for this contract + * * @author neon@ec-m.fr - * + *

* The format of data sent here is a String[2] with - * data[0] = round - * data[1] = jsonSent - * - * First round - setup a list of potential TTP - * Second round - choose a random TTP - * Third round - checks that everyone has same TTP + * data[0] = round + * data[1] = jsonSent + *

+ * First round - setup a list of potential TTP + * Second round - choose a random TTP + * Third round - checks that everyone has same TTP */ public class ProtocolChooseTrent implements ProtocolStep { - - public static final String TITLE = "CHOOSING_TRENT"; - - @XmlElement(name="list") - final private ArrayList list; - - @XmlElement(name="randomNumber") - private BigInteger randomNumber; - @XmlElement(name="finalNumber") - private BigInteger finalNumber; - - @XmlElement(name="hasSent") - private String[][] hasSent = new String[3][]; - - @XmlElement(name="key") - private ElGamalKey key; - - - private SigmaEstablisher sigmaE; - private Peer peer; - private HashMap uris; - private EstablisherService es; - private SigmaContract contract; - private int senderKeyId; - - final private JsonTools> json = new JsonTools<>(new TypeReference>(){}); - final private JsonTools jsonMessage = new JsonTools<>(new TypeReference(){}); - - /** - * Used when the protocol stopped and need to be restarted from scratch where it stopped - */ - @JsonCreator - public ProtocolChooseTrent(@JsonProperty("list") ArrayList list, - @JsonProperty("randomNumber") BigInteger randomNumber, - @JsonProperty("finalNumber") BigInteger finalNumber, - @JsonProperty("hasSent") String[][] hasSent, - @JsonProperty("key") ElGamalKey key){ - this.list = list; - this.randomNumber = randomNumber; - this.finalNumber = finalNumber; - this.hasSent = hasSent; - this.key = key; - - this.senderKeyId = 0; - String senPubK = key.getPublicKey().toString(); - while (!(contract.getParties().get(this.senderKeyId).getPublicKey().toString().equals(senPubK))){this.senderKeyId++;} - } - - /** - * Constructor for the step - * @param sigmaE : the current sigmaEstablisher it is started from - * @param key : signer key - */ - public ProtocolChooseTrent(SigmaEstablisher sigmaE, - ElGamalKey key){ - - this.key = key; - this.sigmaE = sigmaE; - this.peer = sigmaE.peer; - this.uris = sigmaE.sigmaEstablisherData.getUris(); - this.es = sigmaE.establisherService; - this.contract = sigmaE.sigmaEstablisherData.getContract(); - - // Setup list of users (remove the signers) - this.list = new ArrayList(json.toEntity((new Users()).get())); - for (ElGamalKey k : contract.getParties()){ - ListIterator it = list.listIterator(); - while(it.hasNext()) - if (k.getPublicKey().equals(it.next().getKey().getPublicKey())) - it.remove(); - } - - // Setup the random number which will be sent - this.randomNumber = new BigInteger(100, new SecureRandom()); - this.finalNumber = this.randomNumber; - - int i=0; - String senPubK = key.getPublicKey().toString(); - while (!(contract.getParties().get(i).getPublicKey().toString().equals(senPubK))){i++;} - for (int k=0; k list; + final private JsonTools> json = new JsonTools<>(new TypeReference>() { + }); + final private JsonTools jsonMessage = new JsonTools<>(new TypeReference() { + }); + @XmlElement(name = "randomNumber") + private BigInteger randomNumber; + @XmlElement(name = "finalNumber") + private BigInteger finalNumber; + @XmlElement(name = "hasSent") + private String[][] hasSent = new String[3][]; + @XmlElement(name = "key") + private ElGamalKey key; + private SigmaEstablisher sigmaE; + private Peer peer; + private HashMap uris; + private EstablisherService es; + private SigmaContract contract; + private int senderKeyId; + + /** + * Used when the protocol stopped and need to be restarted from scratch where it stopped + */ + @JsonCreator + public ProtocolChooseTrent(@JsonProperty("list") ArrayList list, + @JsonProperty("randomNumber") BigInteger randomNumber, + @JsonProperty("finalNumber") BigInteger finalNumber, + @JsonProperty("hasSent") String[][] hasSent, + @JsonProperty("key") ElGamalKey key) { + this.list = list; + this.randomNumber = randomNumber; + this.finalNumber = finalNumber; + this.hasSent = hasSent; + this.key = key; + + this.senderKeyId = 0; + String senPubK = key.getPublicKey().toString(); + while (!(contract.getParties().get(this.senderKeyId).getPublicKey().toString().equals(senPubK))) { + this.senderKeyId++; + } + } + + /** + * Constructor for the step + * + * @param sigmaE : the current sigmaEstablisher it is started from + * @param key : signer key + */ + public ProtocolChooseTrent(SigmaEstablisher sigmaE, + ElGamalKey key) { + + this.key = key; + this.sigmaE = sigmaE; + this.peer = sigmaE.peer; + this.uris = sigmaE.sigmaEstablisherData.getUris(); + this.es = sigmaE.establisherService; + this.contract = sigmaE.sigmaEstablisherData.getContract(); + + // Setup list of users (remove the signers) + this.list = new ArrayList(json.toEntity((new Users()).get())); + for (ElGamalKey k : contract.getParties()) { + ListIterator it = list.listIterator(); + while (it.hasNext()) + if (k.getPublicKey().equals(it.next().getKey().getPublicKey())) + it.remove(); + } + + // Setup the random number which will be sent + this.randomNumber = new BigInteger(100, new SecureRandom()); + this.finalNumber = this.randomNumber; + + int i = 0; + String senPubK = key.getPublicKey().toString(); + while (!(contract.getParties().get(i).getPublicKey().toString().equals(senPubK))) { + i++; + } + for (int k = 0; k < hasSent.length; k++) + hasSent[k] = new String[contract.getParties().size() + 1]; + this.senderKeyId = i; + + // Setup the listener on other peers + this.setupListener(); + } + + @Override + /** + * Called to start again + */ + public void restore(SigmaEstablisher sigmaE) { + this.sigmaE = sigmaE; + this.peer = sigmaE.peer; + this.uris = sigmaE.sigmaEstablisherData.getUris(); + this.es = sigmaE.establisherService; + this.contract = sigmaE.sigmaEstablisherData.getContract(); + + this.setupListener(); + } + + + @Override + public String getName() { + return TITLE; + } + + + @Override + /* * The round here is * + 0 if the list hasn't been setup with other peers * + 1 if the random numbers aren't all recovered * + 2 if Trent is already chosen */ - public int getRound() { - if (Arrays.asList(hasSent[0]).indexOf(null) != (-1)) - return 0; - else if (Arrays.asList(hasSent[1]).indexOf(null) != (-1)) - return 1; - return 2; - } - - - @Override - public void sendMessage() { - String[] content = {"0", json.toJson(list)}; - String senPubK = key.getPublicKey().toString(); - - es.sendContract(TITLE+new String(contract.getHashableData()), - jsonMessage.toJson(content), - senPubK, - peer, - uris); - hasSent[0][senderKeyId] = ""; - } - - - @Override - public void setupListener() { - final String contractId = new String(contract.getHashableData()); - final String senPubK = key.getPublicKey().toString(); - final int N = contract.getParties().size(); - - es.removeListener(TITLE+contractId+senPubK); - es.setListener("title", TITLE+contractId, TITLE+contractId+senPubK, new EstablisherServiceListener() { - @Override - public void notify(String title, String msg, String senderId) { - String[] content = jsonMessage.toEntity(msg); - int j = 0; - while (!(contract.getParties().get(j).getPublicKey().toString().equals(senderId))){j++;} - // If we received a new list - if (content[0].equals("0") && Arrays.asList(hasSent[0]).indexOf(null) != (-1)){ - Collection list2 = json.toEntity(content[1]); - ListIterator it = list.listIterator(); - while(it.hasNext()){ - boolean isInBoth = false; - for (User u : list2){ - if (u.getKey().getPublicKey().equals(it.next().getKey().getPublicKey())) - isInBoth = true; - } - if (!isInBoth) - it.remove(); - } - hasSent[0][j] = ""; - - if (Arrays.asList(hasSent[0]).indexOf(null) == N){ - hasSent[0][N] = ""; - list.sort(new Comparator(){ - @Override - public int compare(User u1, User u2){ - return u1.getKey().getPublicKey().compareTo(u2.getKey().getPublicKey()); - } - }); - String[] toBeSent = new String[2]; - toBeSent[0] = "1"; - toBeSent[1] = randomNumber.toString(); - hasSent[1][senderKeyId] = ""; - es.sendContract(TITLE+contractId, jsonMessage.toJson(toBeSent), senPubK, peer, uris); - } - } - // If we receive the others random number - else if (content[0].equals("1") && Arrays.asList(hasSent[1]).indexOf(null) != (-1)){ - // Wait for everyone to have sent their number and setup Trent - if (hasSent[1][j] == null){ - finalNumber = finalNumber.add(new BigInteger(content[1])); - hasSent[1][j] = ""; - } - - if (Arrays.asList(hasSent[1]).indexOf(null) == N){ - hasSent[1][N] = ""; - int N2 = (int) list.size(); - if (N2 == 0){ - System.out.println("Can't go on - there is no third party available"); - }else{ - User trentUser = list.get(finalNumber.mod(new BigInteger(String.valueOf(N2))).intValue()); - if (sigmaE.sigmaEstablisherData.getTrentKey() ==null){ - sigmaE.setTrent(trentUser.getKey()); - } - - String[] toBeSent = new String[2]; - toBeSent[0] = "2"; - toBeSent[1] = trentUser.getKey().getPublicKey().toString(); - es.sendContract(TITLE+contractId, jsonMessage.toJson(toBeSent), senPubK, peer, uris); - hasSent[2][senderKeyId] = ""; - - if (sigmaE.sigmaEstablisherData.getTrentKey() !=null && - !sigmaE.sigmaEstablisherData.getTrentKey().getPublicKey().equals(trentUser.getKey().getPublicKey())){ - for (int k=0; k list2 = json.toEntity(content[1]); + ListIterator it = list.listIterator(); + while (it.hasNext()) { + boolean isInBoth = false; + for (User u : list2) { + if (u.getKey().getPublicKey().equals(it.next().getKey().getPublicKey())) + isInBoth = true; + } + if (!isInBoth) + it.remove(); + } + hasSent[0][j] = ""; + + if (Arrays.asList(hasSent[0]).indexOf(null) == N) { + hasSent[0][N] = ""; + list.sort(new Comparator() { + @Override + public int compare(User u1, User u2) { + return u1.getKey().getPublicKey().compareTo(u2.getKey().getPublicKey()); + } + }); + String[] toBeSent = new String[2]; + toBeSent[0] = "1"; + toBeSent[1] = randomNumber.toString(); + hasSent[1][senderKeyId] = ""; + es.sendContract(TITLE + contractId, jsonMessage.toJson(toBeSent), senPubK, peer, uris); + } + } + // If we receive the others random number + else if (content[0].equals("1") && Arrays.asList(hasSent[1]).indexOf(null) != (-1)) { + // Wait for everyone to have sent their number and setup Trent + if (hasSent[1][j] == null) { + finalNumber = finalNumber.add(new BigInteger(content[1])); + hasSent[1][j] = ""; + } + + if (Arrays.asList(hasSent[1]).indexOf(null) == N) { + hasSent[1][N] = ""; + int N2 = (int) list.size(); + if (N2 == 0) { + System.out.println("Can't go on - there is no third party available"); + } else { + User trentUser = list.get(finalNumber.mod(new BigInteger(String.valueOf(N2))).intValue()); + if (sigmaE.sigmaEstablisherData.getTrentKey() == null) { + sigmaE.setTrent(trentUser.getKey()); + } + + String[] toBeSent = new String[2]; + toBeSent[0] = "2"; + toBeSent[1] = trentUser.getKey().getPublicKey().toString(); + es.sendContract(TITLE + contractId, jsonMessage.toJson(toBeSent), senPubK, peer, uris); + hasSent[2][senderKeyId] = ""; + + if (sigmaE.sigmaEstablisherData.getTrentKey() != null && + !sigmaE.sigmaEstablisherData.getTrentKey().getPublicKey().equals(trentUser.getKey().getPublicKey())) { + for (int k = 0; k < hasSent.length; k++) + hasSent[k] = new String[contract.getParties().size()]; + sigmaE.setTrent(null); + sendMessage(); + } + } + } + } + // Check that we have the same Trent + else if (content[0].equals("2") && Arrays.asList(hasSent[2]).indexOf(null) != (-1)) { + ElGamalKey key = sigmaE.sigmaEstablisherData.getTrentKey(); + if (key == null) { + ElGamalKey trentK = ElGamalAsymKeyFactory.create(false); + trentK.setPublicKey(new BigInteger(content[1])); + sigmaE.setTrent(trentK); + hasSent[2][j] = ""; + } else if (content[1].equals(key.getPublicKey().toString())) { + hasSent[2][j] = ""; + if (Arrays.asList(hasSent[2]).indexOf(null) == (N)) { + hasSent[2][N] = ""; + nextStep(); + } + } else { + for (int k = 0; k < hasSent.length; k++) + hasSent[k] = new String[contract.getParties().size()]; + sigmaE.setTrent(null); + sendMessage(); + } + } + } + }, uris != null); + + } + + @Override + public void stop() { + String contractId = new String(contract.getHashableData()); + String senPubK = key.getPublicKey().toString(); + es.removeListener(TITLE + contractId + senPubK.toString()); + } + + /** + * Contains what needs to be done after this step + */ + private void nextStep() { + sigmaE.setListenerOnTrent(); + } } diff --git a/src/main/java/protocol/impl/sigma/steps/ProtocolResolve.java b/src/main/java/protocol/impl/sigma/steps/ProtocolResolve.java index 90673712..03cb39d6 100644 --- a/src/main/java/protocol/impl/sigma/steps/ProtocolResolve.java +++ b/src/main/java/protocol/impl/sigma/steps/ProtocolResolve.java @@ -1,15 +1,8 @@ package protocol.impl.sigma.steps; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.HashMap; - -import javax.xml.bind.annotation.XmlElement; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import crypt.api.encryption.Encrypter; import crypt.factories.EncrypterFactory; @@ -27,217 +20,228 @@ import protocol.impl.sigma.SigmaContract; import protocol.impl.sigma.Trent; +import javax.xml.bind.annotation.XmlElement; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.HashMap; + /** * This step is used if something goes wrong. It stop the protocol and contact the TTP - * @author Nathanaël Eon * + * @author Nathanaël Eon + *

* Format of data Sent : String[4] - * data[0] = round - * data[1] = contract - * data[2] = request (abort / encryptForTrent(claim) - * data[3] = Sigma Signature of the request + * data[0] = round + * data[1] = contract + * data[2] = request (abort / encryptForTrent(claim) + * data[3] = Sigma Signature of the request */ public class ProtocolResolve implements ProtocolStep { - public static final String TITLE = "RESOLVE"; - - @XmlElement(name="key") - protected ElGamalKey key; - @XmlElement(name="resolveSent") - protected boolean resolveSent = false; - - protected SigmaEstablisher sigmaEstablisher; - protected EstablisherService es; - protected Peer peer; - protected SigmaContract contract; - protected SigmaSigner signer; - - - - @JsonCreator - public ProtocolResolve(@JsonProperty("key") ElGamalKey key, - @JsonProperty("resolveSent") boolean resolveSent){ - this.key = key; - this.signer = SignerFactory.createSigmaSigner(); - this.signer.setKey(key); - - this.resolveSent = resolveSent; - } - - public ProtocolResolve(SigmaEstablisher sigmaE, - ElGamalKey key){ - this.key = key; - this.signer = SignerFactory.createSigmaSigner(); - this.signer.setKey(key); - - - this.sigmaEstablisher = sigmaE; - this.es = sigmaE.establisherService; - this.peer = sigmaE.peer; - this.contract = sigmaE.sigmaEstablisherData.getContract(); - this.signer.setTrentK(sigmaE.sigmaEstablisherData.getTrentKey()); - - this.setupListener(); - } - - @Override - public void restore(SigmaEstablisher sigmaE){ - this.sigmaEstablisher = sigmaE; - this.es = sigmaE.establisherService; - this.peer = sigmaE.peer; - this.contract = sigmaE.sigmaEstablisherData.getContract(); - this.signer.setTrentK(sigmaE.sigmaEstablisherData.getTrentKey()); - - this.setupListener(); - } - - @Override - public String getName() { - return TITLE; - } - - /** - * Return -2 if the resolved has been sent; 0 otherwise - */ - @Override - public int getRound() { - if (resolveSent) - return -2; - else - return 0; - } - - @Override - public void sendMessage() { - ProtocolStep step = sigmaEstablisher.sigmaEstablisherData.getProtocolStep(); - sigmaEstablisher.setStatus(Status.RESOLVING); - - int round = step.getRound(); - BigInteger senPubK = key.getPublicKey(); - ElGamalKey trentK = sigmaEstablisher.sigmaEstablisherData.getTrentKey(); - - step.stop(); - String[] content = new String[4]; - - // Round - content[0] = String.valueOf(round-1); - - - // Contract - JsonTools json2 = new JsonTools<>(new TypeReference(){}); - content[1] = json2.toJson(contract.getEntity(),false); - - // Claim(k) - signer.setReceiverK(trentK); - SigmaSignature sigClaimK; - if (round<=1){ - content[2] = encryptMsg("ABORT", trentK); - sigClaimK = signer.sign("ABORT".getBytes()); - }else { - JsonTools json = new JsonTools<>(new TypeReference(){}); - String claimK = json.toJson(sigmaEstablisher.sigmaEstablisherData.getRoundReceived()[round-1], true); - content[2] = encryptMsg(claimK, trentK); - sigClaimK = signer.sign(claimK.getBytes()); - } - JsonTools json3 = new JsonTools<>(new TypeReference(){}); - content[3] = encryptMsg(json3.toJson(sigClaimK, false), trentK); - - // Concatenate the content - JsonTools json = new JsonTools<>(new TypeReference(){}); - String fullContent = json.toJson(content, false); - - // For Trent, use only Advertisement - es.sendContract(TITLE + trentK.getPublicKey().toString(), fullContent, senPubK.toString(), peer, null); - - System.out.println("--- Sending resolve request to Trent --- Round : " + (round-1)); - } - - @Override - public void setupListener() { - final String contractId = new String(contract.getHashableData()); - final BigInteger senPubK = key.getPublicKey(); - - es.removeListener(Trent.TRENT_MESSAGE+contractId+senPubK.toString()); - es.setListener("title", Trent.TRENT_MESSAGE + contractId, Trent.TRENT_MESSAGE+contractId+senPubK.toString(), new EstablisherServiceListener(){ - @Override - public void notify(String title, String data, String senderId) { - ProtocolStep step = sigmaEstablisher.sigmaEstablisherData.getProtocolStep(); - - // If the message is for another contract or by someone else thant Trent - if (senderId.equals(sigmaEstablisher.sigmaEstablisherData.getTrentKey().getPublicKey().toString())){ - // If Trent found we were dishonest (second time a resolve sent) - if (data.substring(0, 9).equals("dishonest")){ - System.out.println("Someone was dishonest : "+ data.substring(10) + "\nTrent decided not to do anything"); - } - - else{ - JsonTools> jsons = new JsonTools<>(new TypeReference>(){}); - ArrayList answer = jsons.toEntity(data); - - // Making sure the message is from Trent - signer.setTrentK(sigmaEstablisher.sigmaEstablisherData.getTrentKey()); - JsonTools json = new JsonTools<>(new TypeReference(){}); - - JsonTools> jsonH = new JsonTools<>(new TypeReference>(){}); - HashMap signatures = jsonH.toEntity(answer.get(2)); - - if(signer.verify(answer.get(1).getBytes() ,json.toEntity(signatures.get(senPubK.toString())))){ - // If Trent aborted the contract - if (answer.get(0).equals("aborted") || answer.get(0).equals("honestyToken")){ - sigmaEstablisher.setStatus(Status.CANCELLED); - System.out.println("Signature cancelled"); - es.removeListener(step.getName()+contractId+senPubK.toString()); - es.removeListener(TITLE+contractId+senPubK.toString()); - } - - // If Trent solved the problem - else if (answer.get(0).equals("resolved")){ - - JsonTools> jsonSignatures = new JsonTools<>(new TypeReference>(){}); - ArrayList sigSign = jsonSignatures.toEntity(answer.get(1)); - - - // Check the signatures (we don't if it was on round -1 or -2) - byte[] data1 = (new String(contract.getHashableData()) + (step.getRound())).getBytes(); - byte[] data2 = (new String(contract.getHashableData()) + (step.getRound() - 1)).getBytes(); - byte[] data3 = (new String(contract.getHashableData()) + (step.getRound() - 2)).getBytes(); - - for (SigmaSignature signature : sigSign){ - signer.setReceiverK(contract.getParties().get(sigSign.indexOf(signature))); - - if (signer.verify(data1, signature) || signer.verify(data2, signature) || signer.verify(data3, signature)){ - contract.addSignature(contract.getParties().get(sigSign.indexOf(signature)), signature); - } - } - - if (contract.isFinalized()){ - sigmaEstablisher.setStatus(Status.FINALIZED); - System.out.println("CONTRACT FINALIZED"); - es.removeListener(step.getName()+contractId+senPubK.toString()); - es.removeListener(TITLE+contractId+senPubK.toString()); - } - } - } - - } - } - } - }, false); - } - - @Override - public void stop(){ - String contractId = new String(contract.getHashableData()); - String senPubK = key.getPublicKey().toString(); - es.removeListener(Trent.TRENT_MESSAGE+contractId+senPubK); - } - - - // Return the message encrypted with public key - protected String encryptMsg(String msg, ElGamalKey key){ - Encrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); - encrypter.setKey(key); - return new String(encrypter.encrypt(msg.getBytes())); - } + public static final String TITLE = "RESOLVE"; + + @XmlElement(name = "key") + protected ElGamalKey key; + @XmlElement(name = "resolveSent") + protected boolean resolveSent = false; + + protected SigmaEstablisher sigmaEstablisher; + protected EstablisherService es; + protected Peer peer; + protected SigmaContract contract; + protected SigmaSigner signer; + + + @JsonCreator + public ProtocolResolve(@JsonProperty("key") ElGamalKey key, + @JsonProperty("resolveSent") boolean resolveSent) { + this.key = key; + this.signer = SignerFactory.createSigmaSigner(); + this.signer.setKey(key); + + this.resolveSent = resolveSent; + } + + public ProtocolResolve(SigmaEstablisher sigmaE, + ElGamalKey key) { + this.key = key; + this.signer = SignerFactory.createSigmaSigner(); + this.signer.setKey(key); + + + this.sigmaEstablisher = sigmaE; + this.es = sigmaE.establisherService; + this.peer = sigmaE.peer; + this.contract = sigmaE.sigmaEstablisherData.getContract(); + this.signer.setTrentK(sigmaE.sigmaEstablisherData.getTrentKey()); + + this.setupListener(); + } + + @Override + public void restore(SigmaEstablisher sigmaE) { + this.sigmaEstablisher = sigmaE; + this.es = sigmaE.establisherService; + this.peer = sigmaE.peer; + this.contract = sigmaE.sigmaEstablisherData.getContract(); + this.signer.setTrentK(sigmaE.sigmaEstablisherData.getTrentKey()); + + this.setupListener(); + } + + @Override + public String getName() { + return TITLE; + } + + /** + * Return -2 if the resolved has been sent; 0 otherwise + */ + @Override + public int getRound() { + if (resolveSent) + return -2; + else + return 0; + } + + @Override + public void sendMessage() { + ProtocolStep step = sigmaEstablisher.sigmaEstablisherData.getProtocolStep(); + sigmaEstablisher.setStatus(Status.RESOLVING); + + int round = step.getRound(); + BigInteger senPubK = key.getPublicKey(); + ElGamalKey trentK = sigmaEstablisher.sigmaEstablisherData.getTrentKey(); + + step.stop(); + String[] content = new String[4]; + + // Round + content[0] = String.valueOf(round - 1); + + + // Contract + JsonTools json2 = new JsonTools<>(new TypeReference() { + }); + content[1] = json2.toJson(contract.getEntity(), false); + + // Claim(k) + signer.setReceiverK(trentK); + SigmaSignature sigClaimK; + if (round <= 1) { + content[2] = encryptMsg("ABORT", trentK); + sigClaimK = signer.sign("ABORT".getBytes()); + } else { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + String claimK = json.toJson(sigmaEstablisher.sigmaEstablisherData.getRoundReceived()[round - 1], true); + content[2] = encryptMsg(claimK, trentK); + sigClaimK = signer.sign(claimK.getBytes()); + } + JsonTools json3 = new JsonTools<>(new TypeReference() { + }); + content[3] = encryptMsg(json3.toJson(sigClaimK, false), trentK); + + // Concatenate the content + JsonTools json = new JsonTools<>(new TypeReference() { + }); + String fullContent = json.toJson(content, false); + + // For Trent, use only Advertisement + es.sendContract(TITLE + trentK.getPublicKey().toString(), fullContent, senPubK.toString(), peer, null); + + System.out.println("--- Sending resolve request to Trent --- Round : " + (round - 1)); + } + + @Override + public void setupListener() { + final String contractId = new String(contract.getHashableData()); + final BigInteger senPubK = key.getPublicKey(); + + es.removeListener(Trent.TRENT_MESSAGE + contractId + senPubK.toString()); + es.setListener("title", Trent.TRENT_MESSAGE + contractId, Trent.TRENT_MESSAGE + contractId + senPubK.toString(), new EstablisherServiceListener() { + @Override + public void notify(String title, String data, String senderId) { + ProtocolStep step = sigmaEstablisher.sigmaEstablisherData.getProtocolStep(); + + // If the message is for another contract or by someone else thant Trent + if (senderId.equals(sigmaEstablisher.sigmaEstablisherData.getTrentKey().getPublicKey().toString())) { + // If Trent found we were dishonest (second time a resolve sent) + if (data.substring(0, 9).equals("dishonest")) { + System.out.println("Someone was dishonest : " + data.substring(10) + "\nTrent decided not to do anything"); + } else { + JsonTools> jsons = new JsonTools<>(new TypeReference>() { + }); + ArrayList answer = jsons.toEntity(data); + + // Making sure the message is from Trent + signer.setTrentK(sigmaEstablisher.sigmaEstablisherData.getTrentKey()); + JsonTools json = new JsonTools<>(new TypeReference() { + }); + + JsonTools> jsonH = new JsonTools<>(new TypeReference>() { + }); + HashMap signatures = jsonH.toEntity(answer.get(2)); + + if (signer.verify(answer.get(1).getBytes(), json.toEntity(signatures.get(senPubK.toString())))) { + // If Trent aborted the contract + if (answer.get(0).equals("aborted") || answer.get(0).equals("honestyToken")) { + sigmaEstablisher.setStatus(Status.CANCELLED); + System.out.println("Signature cancelled"); + es.removeListener(step.getName() + contractId + senPubK.toString()); + es.removeListener(TITLE + contractId + senPubK.toString()); + } + + // If Trent solved the problem + else if (answer.get(0).equals("resolved")) { + + JsonTools> jsonSignatures = new JsonTools<>(new TypeReference>() { + }); + ArrayList sigSign = jsonSignatures.toEntity(answer.get(1)); + + + // Check the signatures (we don't if it was on round -1 or -2) + byte[] data1 = (new String(contract.getHashableData()) + (step.getRound())).getBytes(); + byte[] data2 = (new String(contract.getHashableData()) + (step.getRound() - 1)).getBytes(); + byte[] data3 = (new String(contract.getHashableData()) + (step.getRound() - 2)).getBytes(); + + for (SigmaSignature signature : sigSign) { + signer.setReceiverK(contract.getParties().get(sigSign.indexOf(signature))); + + if (signer.verify(data1, signature) || signer.verify(data2, signature) || signer.verify(data3, signature)) { + contract.addSignature(contract.getParties().get(sigSign.indexOf(signature)), signature); + } + } + + if (contract.isFinalized()) { + sigmaEstablisher.setStatus(Status.FINALIZED); + System.out.println("CONTRACT FINALIZED"); + es.removeListener(step.getName() + contractId + senPubK.toString()); + es.removeListener(TITLE + contractId + senPubK.toString()); + } + } + } + + } + } + } + }, false); + } + + @Override + public void stop() { + String contractId = new String(contract.getHashableData()); + String senPubK = key.getPublicKey().toString(); + es.removeListener(Trent.TRENT_MESSAGE + contractId + senPubK); + } + + + // Return the message encrypted with public key + protected String encryptMsg(String msg, ElGamalKey key) { + Encrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); + encrypter.setKey(key); + return new String(encrypter.encrypt(msg.getBytes())); + } } diff --git a/src/main/java/protocol/impl/sigma/steps/ProtocolSign.java b/src/main/java/protocol/impl/sigma/steps/ProtocolSign.java index bf2ba3e0..f8375753 100644 --- a/src/main/java/protocol/impl/sigma/steps/ProtocolSign.java +++ b/src/main/java/protocol/impl/sigma/steps/ProtocolSign.java @@ -1,15 +1,8 @@ package protocol.impl.sigma.steps; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.HashMap; - -import javax.xml.bind.annotation.XmlElement; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; - import controller.tools.JsonTools; import crypt.api.encryption.Encrypter; import crypt.factories.EncrypterFactory; @@ -27,236 +20,251 @@ import protocol.impl.sigma.Sender; import protocol.impl.sigma.SigmaContract; +import javax.xml.bind.annotation.XmlElement; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.HashMap; + /** * The signing step, sigma protocol happens here - * @author Nathanaël Eon * - * Data format : HashMap - * It contains the round of the protocol (Map.get("round")) - * It contains the different signatures, correctly encrypted for each receiver using publicKey as Map Key + * @author Nathanaël Eon + *

+ * Data format : HashMap + * It contains the round of the protocol (Map.get("round")) + * It contains the different signatures, correctly encrypted for each receiver using publicKey as Map Key */ public class ProtocolSign implements ProtocolStep { - public final static String TITLE = "SIGNING"; + public final static String TITLE = "SIGNING"; + + @XmlElement(name = "round") + protected int round; + + @XmlElement(name = "key") + protected ElGamalKey key; + + protected SigmaEstablisher sigmaEstablisher; + protected EstablisherService es; + protected Peer peer; + protected HashMap uris; + protected SigmaContract contract; + protected int N; + protected PCS pcs; + + + @JsonCreator + public ProtocolSign(@JsonProperty("key") ElGamalKey key, @JsonProperty("round") int round) { + this.key = key; + this.round = round; + + Sender sender = new Sender(key); + pcs = new PCS(sender, sigmaEstablisher.sigmaEstablisherData.getTrentKey()); + } + + public ProtocolSign(SigmaEstablisher sigmaE, + ElGamalKey key) { + this.sigmaEstablisher = sigmaE; + this.key = key; + + this.es = sigmaE.establisherService; + this.peer = sigmaE.peer; + this.uris = sigmaE.sigmaEstablisherData.getUris(); + this.contract = sigmaE.sigmaEstablisherData.getContract(); + this.N = this.contract.getParties().size(); + sigmaEstablisher.sigmaEstablisherData.setRoundReceived(new Or[N + 2][N]); + + Sender sender = new Sender(key); + pcs = new PCS(sender, sigmaEstablisher.sigmaEstablisherData.getTrentKey()); + round = 1; + + this.setupListener(); + } + + + @Override + public void restore(SigmaEstablisher sigmaE) { + this.sigmaEstablisher = sigmaE; + this.es = sigmaE.establisherService; + this.peer = sigmaE.peer; + this.uris = sigmaE.sigmaEstablisherData.getUris(); + this.contract = sigmaE.sigmaEstablisherData.getContract(); + this.N = this.contract.getParties().size(); + + this.setupListener(); + } + + + @Override + public String getName() { + return TITLE; + } + + @Override + public int getRound() { + return this.round; + } + + @Override + public void sendMessage() { + // Check the wish of the user each time we send a message + if (contract.getWish().equals(Wish.REFUSE)) { + this.sigmaEstablisher.resolvingStep.sendMessage(); + } else { + // Content of the message which will be sent + HashMap content = new HashMap(); + BigInteger senPubK = key.getPublicKey(); + + for (int k = 0; k < N; k++) { + + // Public key of the receiver + ElGamalKey receiverK = contract.getParties().get(k); + + // If the receiver is the sender, isSender = true + boolean isSender = receiverK.getPublicKey().equals(senPubK); + + // On the last round, send the clear signature + if (round == (N + 2)) { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + SigmaSignature signature = pcs.getClearSignature(contract, receiverK); + if (isSender) + contract.addSignature(contract.getParties().get(k), signature); + content.put(receiverK.getPublicKey().toString(), json.toJson(signature, true)); + // Otherwise send round k + } else { + byte[] data = (new String(contract.getHashableData()) + round).getBytes(); + Or p = pcs.getPcs(data, receiverK, true); + content.put(receiverK.getPublicKey().toString(), encryptMsg(getJson(p), receiverK)); + if (isSender) { + sigmaEstablisher.sigmaEstablisherData.getRoundReceived()[round][k] = p; + } + } + } + + // Adding the round to data sent + content.put("ROUND", String.valueOf(round)); + + // Convert map to String + JsonTools> json2 = new JsonTools<>(new TypeReference>() { + }); + String dataToBeSent = json2.toJson(content); + + // Getting the sender public key index + int i = 0; + while (!(contract.getParties().get(i).getPublicKey().equals(senPubK))) { + i++; + } + System.out.println("Sending Round : " + round + " : by " + i); + + // Sending an advertisement + es.sendContract(TITLE + new String(contract.getHashableData()), dataToBeSent, senPubK.toString(), peer, uris); + } + } + + @Override + public void setupListener() { + String contractId = new String(contract.getHashableData()); + String senPubK = key.getPublicKey().toString(); + es.removeListener(TITLE + contractId + senPubK); + es.setListener("title", TITLE + contractId, TITLE + contractId + senPubK, new EstablisherServiceListener() { + @Override + public void notify(String title, String msg, String senderId) { + // Checks if the message is a PCS, if yes store it in "pcs[round][k]" + verifyAndStoreSignature(msg, senderId); + + // Check if the round is complete + boolean claimFormed = true; + for (int k = 0; k < N; k++) { + if (round < N + 2 && sigmaEstablisher.sigmaEstablisherData.getRoundReceived()[round][k] == null) + claimFormed = false; + } - @XmlElement(name="round") - protected int round; - - @XmlElement(name="key") - protected ElGamalKey key; - - protected SigmaEstablisher sigmaEstablisher; - protected EstablisherService es; - protected Peer peer; - protected HashMap uris; - protected SigmaContract contract; - protected int N; - protected PCS pcs; - - - @JsonCreator - public ProtocolSign(@JsonProperty("key") ElGamalKey key, @JsonProperty("round") int round){ - this.key = key; - this.round = round; - - Sender sender = new Sender(key); - pcs = new PCS(sender, sigmaEstablisher.sigmaEstablisherData.getTrentKey()); - } - - public ProtocolSign(SigmaEstablisher sigmaE, - ElGamalKey key){ - this.sigmaEstablisher = sigmaE; - this.key = key; - - this.es = sigmaE.establisherService; - this.peer = sigmaE.peer; - this.uris = sigmaE.sigmaEstablisherData.getUris(); - this.contract = sigmaE.sigmaEstablisherData.getContract(); - this.N = this.contract.getParties().size(); - sigmaEstablisher.sigmaEstablisherData.setRoundReceived(new Or[N+2][N]); - - Sender sender = new Sender(key); - pcs = new PCS(sender, sigmaEstablisher.sigmaEstablisherData.getTrentKey()); - round = 1; - - this.setupListener(); - } - - - @Override - public void restore(SigmaEstablisher sigmaE){ - this.sigmaEstablisher = sigmaE; - this.es = sigmaE.establisherService; - this.peer = sigmaE.peer; - this.uris = sigmaE.sigmaEstablisherData.getUris(); - this.contract = sigmaE.sigmaEstablisherData.getContract(); - this.N = this.contract.getParties().size(); - - this.setupListener(); - } - - - @Override - public String getName(){ - return TITLE; - } - - @Override - public int getRound(){ - return this.round; - } - - @Override - public void sendMessage() { - // Check the wish of the user each time we send a message - if (contract.getWish().equals(Wish.REFUSE)){ - this.sigmaEstablisher.resolvingStep.sendMessage(); - }else{ - // Content of the message which will be sent - HashMap content = new HashMap(); - BigInteger senPubK = key.getPublicKey(); - - for (int k=0; k json = new JsonTools<>(new TypeReference(){}); - SigmaSignature signature = pcs.getClearSignature(contract, receiverK); - if (isSender) - contract.addSignature(contract.getParties().get(k), signature); - content.put(receiverK.getPublicKey().toString(), json.toJson(signature, true)); - // Otherwise send round k - }else { - byte[] data = (new String(contract.getHashableData()) + round).getBytes(); - Or p = pcs.getPcs(data, receiverK, true); - content.put(receiverK.getPublicKey().toString(), encryptMsg(getJson(p), receiverK)); - if (isSender){ - sigmaEstablisher.sigmaEstablisherData.getRoundReceived()[round][k] = p; - } - } - } - - // Adding the round to data sent - content.put("ROUND", String.valueOf(round)); - - // Convert map to String - JsonTools> json2 = new JsonTools<>(new TypeReference>(){}); - String dataToBeSent = json2.toJson(content); - - // Getting the sender public key index - int i = 0; - while (!(contract.getParties().get(i).getPublicKey().equals(senPubK))){i++;} - System.out.println("Sending Round : " + round + " : by " + i); - - // Sending an advertisement - es.sendContract(TITLE+new String(contract.getHashableData()), dataToBeSent, senPubK.toString(), peer, uris); - } - } - - @Override - public void setupListener() { - String contractId = new String(contract.getHashableData()); - String senPubK = key.getPublicKey().toString(); - es.removeListener(TITLE+contractId+senPubK); - es.setListener("title", TITLE+contractId, TITLE+contractId+senPubK, new EstablisherServiceListener() { - @Override - public void notify(String title, String msg, String senderId) { - // Checks if the message is a PCS, if yes store it in "pcs[round][k]" - verifyAndStoreSignature(msg, senderId); - - // Check if the round is complete - boolean claimFormed = true; - for (int k=0; k keys = contract.getParties(); - while (!(keys.get(i).getPublicKey().equals(msgSenKey))){i++;} - ElGamalKey senderKey = keys.get(i); - - // From json message to the object {"k", PCS} - JsonTools> json0 = new JsonTools<>(new TypeReference>(){}); - HashMap content = json0.toEntity(message); - - int k= Integer.parseInt(content.get("ROUND")); - // Don't do anything if the sender is the actual user (shouldn't happen though) - if (!(senderKey.getPublicKey().equals(senPubK))){ - // If it's the last round, test the clear signature - if (k == (N+2)){ - JsonTools json2 = new JsonTools<>(new TypeReference(){}); - SigmaSignature signature = json2.toEntity(content.get(senPubK.toString()), true); - - SigmaSigner s = new SigmaSigner(); - ElGamalKey ke = new ElGamalKey(); - ke.setPublicKey(senPubK); - s.setKey(ke); - s.setTrentK(sigmaEstablisher.sigmaEstablisherData.getTrentKey()); - - if (pcs.verifySignature(signature, s, contract)) { - contract.addSignature(keys.get(i), signature); - if (contract.isFinalized()){ - int j = 0; - while (!(keys.get(j).getPublicKey().equals(senPubK))){j++;} - System.out.println("--- CONTRACT FINALIZED -- id : " + j); - sigmaEstablisher.setStatus(Status.FINALIZED); - es.removeListener(TITLE + new String(contract.getHashableData()) + senPubK.toString()); - } - } - // Otherwise, test if it is the correct PCS, if so : store it - }else if (sigmaEstablisher.sigmaEstablisherData.getRoundReceived()[k][i] == null){ - String msg = decryptMsg(content.get(senPubK.toString()), key); - byte[] data = (new String(contract.getHashableData()) + k).getBytes(); - if (getPrivateCS(msg).Verifies(data)){ - sigmaEstablisher.sigmaEstablisherData.getRoundReceived()[k][i]=getPrivateCS(msg); - } - } - } - } + @Override + public void stop() { + String contractId = new String(contract.getHashableData()); + String senPubK = key.getPublicKey().toString(); + es.removeListener(TITLE + contractId + senPubK); + } + + + /* + * Verify the message received (if the message is the last, check if the signature is ok) + * called in sign() method + * @param message : message we receive (messages.getMessage("contract")) + * @param pubK : the sender ElGamal public key + * @param pcs : + * @return + */ + protected void verifyAndStoreSignature(String message, String pubK) { + BigInteger senPubK = key.getPublicKey(); + + // Get the keys of the sender of the message + BigInteger msgSenKey = new BigInteger(pubK); + int i = 0; + ArrayList keys = contract.getParties(); + while (!(keys.get(i).getPublicKey().equals(msgSenKey))) { + i++; + } + ElGamalKey senderKey = keys.get(i); + + // From json message to the object {"k", PCS} + JsonTools> json0 = new JsonTools<>(new TypeReference>() { + }); + HashMap content = json0.toEntity(message); + + int k = Integer.parseInt(content.get("ROUND")); + // Don't do anything if the sender is the actual user (shouldn't happen though) + if (!(senderKey.getPublicKey().equals(senPubK))) { + // If it's the last round, test the clear signature + if (k == (N + 2)) { + JsonTools json2 = new JsonTools<>(new TypeReference() { + }); + SigmaSignature signature = json2.toEntity(content.get(senPubK.toString()), true); + + SigmaSigner s = new SigmaSigner(); + ElGamalKey ke = new ElGamalKey(); + ke.setPublicKey(senPubK); + s.setKey(ke); + s.setTrentK(sigmaEstablisher.sigmaEstablisherData.getTrentKey()); + + if (pcs.verifySignature(signature, s, contract)) { + contract.addSignature(keys.get(i), signature); + if (contract.isFinalized()) { + int j = 0; + while (!(keys.get(j).getPublicKey().equals(senPubK))) { + j++; + } + System.out.println("--- CONTRACT FINALIZED -- id : " + j); + sigmaEstablisher.setStatus(Status.FINALIZED); + es.removeListener(TITLE + new String(contract.getHashableData()) + senPubK.toString()); + } + } + // Otherwise, test if it is the correct PCS, if so : store it + } else if (sigmaEstablisher.sigmaEstablisherData.getRoundReceived()[k][i] == null) { + String msg = decryptMsg(content.get(senPubK.toString()), key); + byte[] data = (new String(contract.getHashableData()) + k).getBytes(); + if (getPrivateCS(msg).Verifies(data)) { + sigmaEstablisher.sigmaEstablisherData.getRoundReceived()[k][i] = getPrivateCS(msg); + } + } + } + } /* @@ -264,28 +272,32 @@ protected void verifyAndStoreSignature(String message, String pubK){ * Transformation json <-> object * Decrypting <-> Encrypting */ - - // Return the string representing the private contract signature - protected String getJson(Or pcs){ - JsonTools json = new JsonTools<>(new TypeReference(){}); - return json.toJson(pcs, true); - } - // Return the PCS (Or Object) from json - protected Or getPrivateCS(String pcs){ - JsonTools json = new JsonTools<>(new TypeReference(){}); - return json.toEntity(pcs, true); - } - - // Return the message encrypted with public key - protected String encryptMsg(String msg, ElGamalKey key){ - Encrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); - encrypter.setKey(key); - return new String(encrypter.encrypt(msg.getBytes())); - } - // Return the message decrypted with private key - protected String decryptMsg(String msg, ElGamalKey key){ - Encrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); - encrypter.setKey(key); - return new String(encrypter.decrypt(msg.getBytes())); - } + + // Return the string representing the private contract signature + protected String getJson(Or pcs) { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + return json.toJson(pcs, true); + } + + // Return the PCS (Or Object) from json + protected Or getPrivateCS(String pcs) { + JsonTools json = new JsonTools<>(new TypeReference() { + }); + return json.toEntity(pcs, true); + } + + // Return the message encrypted with public key + protected String encryptMsg(String msg, ElGamalKey key) { + Encrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); + encrypter.setKey(key); + return new String(encrypter.encrypt(msg.getBytes())); + } + + // Return the message decrypted with private key + protected String decryptMsg(String msg, ElGamalKey key) { + Encrypter encrypter = EncrypterFactory.createElGamalSerpentEncrypter(); + encrypter.setKey(key); + return new String(encrypter.decrypt(msg.getBytes())); + } } diff --git a/src/main/java/protocol/impl/sigma/steps/ProtocolStep.java b/src/main/java/protocol/impl/sigma/steps/ProtocolStep.java index 91321743..00f2f374 100644 --- a/src/main/java/protocol/impl/sigma/steps/ProtocolStep.java +++ b/src/main/java/protocol/impl/sigma/steps/ProtocolStep.java @@ -3,41 +3,42 @@ import protocol.impl.SigmaEstablisher; /** - * A step of the protocol is part of the SigmaEstablisher, to divide the code in different parts, executed successively or - * concurrently (for the resolveStep) - * @author Nathanaël Eon + * A step of the protocol is part of the SigmaEstablisher, to divide the code in different parts, executed successively or + * concurrently (for the resolveStep) * + * @author Nathanaël Eon */ public interface ProtocolStep { - - /** - * @return TITLE of the messages sent in this step - */ - public String getName(); - - /** - * @return current round of the specific step - */ - public int getRound(); - - /** - * Send the initating message - */ - public void sendMessage(); - - /** - * Setup the protocol with the listener - */ - public void setupListener(); - - /** - * Remove every listener previously set - */ - public void stop(); - - /** - * Restart the step if establisher stopped before - * @param sigmaE : the sigmaEstablisher used - */ - public void restore(SigmaEstablisher sigmaE); + + /** + * @return TITLE of the messages sent in this step + */ + public String getName(); + + /** + * @return current round of the specific step + */ + public int getRound(); + + /** + * Send the initating message + */ + public void sendMessage(); + + /** + * Setup the protocol with the listener + */ + public void setupListener(); + + /** + * Remove every listener previously set + */ + public void stop(); + + /** + * Restart the step if establisher stopped before + * + * @param sigmaE : the sigmaEstablisher used + */ + public void restore(SigmaEstablisher sigmaE); } diff --git a/src/main/java/rest/api/Authentifier.java b/src/main/java/rest/api/Authentifier.java index a70bf44f..8be15c96 100644 --- a/src/main/java/rest/api/Authentifier.java +++ b/src/main/java/rest/api/Authentifier.java @@ -1,33 +1,38 @@ package rest.api; public interface Authentifier { - - public static final String PARAM_NAME = "Auth-Token"; - /** - * Generate a token for an username/password - * @param username - * @param password - * @return - */ - public String getToken(String username, String password); - - /** - * Get login from token - * @param token - * @return - */ - public String getLogin(String token); - - /** - * Get password from token - * @param token - * @return - */ - public String getPassword(String token); - /** - * Delete a token (for logout) - * @param token - */ - public void deleteToken(String token); + public static final String PARAM_NAME = "Auth-Token"; + + /** + * Generate a token for an username/password + * + * @param username + * @param password + * @return + */ + public String getToken(String username, String password); + + /** + * Get login from token + * + * @param token + * @return + */ + public String getLogin(String token); + + /** + * Get password from token + * + * @param token + * @return + */ + public String getPassword(String token); + + /** + * Delete a token (for logout) + * + * @param token + */ + public void deleteToken(String token); } diff --git a/src/main/java/rest/api/RestServer.java b/src/main/java/rest/api/RestServer.java index 89babd01..bf96894b 100644 --- a/src/main/java/rest/api/RestServer.java +++ b/src/main/java/rest/api/RestServer.java @@ -2,25 +2,27 @@ /** * Interface for implementing rest server - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public interface RestServer { - /** - * Initialize the server with the class that handle the REST api - * @param packageName Controller package that contains classes with REST annotations - */ - public void initialize(String packageName); - - /** - * Start the REST api on port {@code port} - * @param port the port the webserver will listen - * @throws Exception if server start failed. - */ - public void start(int port) throws Exception; - - /** - * Stop the server. - */ - public void stop(); + /** + * Initialize the server with the class that handle the REST api + * + * @param packageName Controller package that contains classes with REST annotations + */ + public void initialize(String packageName); + + /** + * Start the REST api on port {@code port} + * + * @param port the port the webserver will listen + * @throws Exception if server start failed. + */ + public void start(int port) throws Exception; + + /** + * Stop the server. + */ + public void stop(); } diff --git a/src/main/java/rest/api/ServletPath.java b/src/main/java/rest/api/ServletPath.java index 5289432d..a00d1e0d 100644 --- a/src/main/java/rest/api/ServletPath.java +++ b/src/main/java/rest/api/ServletPath.java @@ -5,10 +5,10 @@ /** * Define the route on the Servlet will be accessible - * @author Julien Prudhomme * + * @author Julien Prudhomme */ @Retention(RetentionPolicy.RUNTIME) public @interface ServletPath { - String value(); + String value(); } diff --git a/src/main/java/rest/factories/AuthentifierFactory.java b/src/main/java/rest/factories/AuthentifierFactory.java index 627e56c2..7dba7d17 100644 --- a/src/main/java/rest/factories/AuthentifierFactory.java +++ b/src/main/java/rest/factories/AuthentifierFactory.java @@ -4,14 +4,16 @@ import rest.impl.SimpleAuthentifier; public class AuthentifierFactory { - public static Authentifier createDefaultAuthentifier() { - return createAuthentifier("simple"); - } - - public static Authentifier createAuthentifier(String impl) { - switch(impl) { - case "simple": return new SimpleAuthentifier(); - default: throw new RuntimeException("No implementation for " + impl); - } - } + public static Authentifier createDefaultAuthentifier() { + return createAuthentifier("simple"); + } + + public static Authentifier createAuthentifier(String impl) { + switch (impl) { + case "simple": + return new SimpleAuthentifier(); + default: + throw new RuntimeException("No implementation for " + impl); + } + } } diff --git a/src/main/java/rest/factories/RestServerFactory.java b/src/main/java/rest/factories/RestServerFactory.java index bcb7be9d..e6983e49 100644 --- a/src/main/java/rest/factories/RestServerFactory.java +++ b/src/main/java/rest/factories/RestServerFactory.java @@ -6,51 +6,55 @@ /** * {@link RestServer} factory - * @author Julien Prudhomme * + * @author Julien Prudhomme */ public class RestServerFactory { - public static RestServer createDefaultRestServer() { - return createJettyRestServer(); - } - - public static JettyRestServer createJettyRestServer() { - return new JettyRestServer(); - } - - /** - * Create and start a {@link RestServer} in a new {@link Thread} - * @param classes Classes that handle rest request. - * @return a started {@link RestServer} - */ - public static RestServer createAndStartRestServer(String impl, final int port, String packageName) { - final RestServer serv; - switch(impl) { - case "jetty": serv = createJettyRestServer(); break; - default: throw new RuntimeException(impl + "doesn't exist !"); - } - - serv.initialize(packageName); - - new Thread(new Runnable() { - - @Override - public void run() { - try { - serv.start(port); - } catch (Exception e) { - LoggerUtilities.logStackTrace(e); - } finally { - serv.stop(); - } - } - }).start(); - return serv; - } - - public static RestServer createAndStartDefaultRestServer(int port) { - return createAndStartRestServer("jetty", - port, - "controller" /*rest controllers classes*/); - } + public static RestServer createDefaultRestServer() { + return createJettyRestServer(); + } + + public static JettyRestServer createJettyRestServer() { + return new JettyRestServer(); + } + + /** + * Create and start a {@link RestServer} in a new {@link Thread} + * + * @param classes Classes that handle rest request. + * @return a started {@link RestServer} + */ + public static RestServer createAndStartRestServer(String impl, final int port, String packageName) { + final RestServer serv; + switch (impl) { + case "jetty": + serv = createJettyRestServer(); + break; + default: + throw new RuntimeException(impl + "doesn't exist !"); + } + + serv.initialize(packageName); + + new Thread(new Runnable() { + + @Override + public void run() { + try { + serv.start(port); + } catch (Exception e) { + LoggerUtilities.logStackTrace(e); + } finally { + serv.stop(); + } + } + }).start(); + return serv; + } + + public static RestServer createAndStartDefaultRestServer(int port) { + return createAndStartRestServer("jetty", + port, + "controller" /*rest controllers classes*/); + } } diff --git a/src/main/java/rest/impl/JettyRestServer.java b/src/main/java/rest/impl/JettyRestServer.java index 6253459f..b8996c00 100644 --- a/src/main/java/rest/impl/JettyRestServer.java +++ b/src/main/java/rest/impl/JettyRestServer.java @@ -1,61 +1,53 @@ package rest.impl; -import java.io.IOException; - +import com.google.common.reflect.ClassPath; +import controller.tools.LoggerUtilities; +import crypt.api.certificate.CertificateGenerator; +import crypt.impl.certificate.X509V3Generator; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.eclipse.jetty.http.HttpVersion; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.server.*; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.ssl.SslContextFactory; - -import com.google.common.reflect.ClassPath; - -import controller.tools.LoggerUtilities; -import crypt.api.certificate.CertificateGenerator; -import crypt.impl.certificate.X509V3Generator; import rest.api.RestServer; import rest.api.ServletPath; -public class JettyRestServer implements RestServer{ - private final static Logger log = LogManager.getLogger(JettyRestServer.class); - private ServletContextHandler context; - private Server server; - private CertificateGenerator cert_gen; - - /** - * {@inheritDoc} - */ - @Override - public void initialize(String packageName) { - context = new ServletContextHandler(ServletContextHandler.SESSIONS); - context.setContextPath("/"); - - final ClassLoader loader = Thread.currentThread().getContextClassLoader(); - - try { - for (final ClassPath.ClassInfo info : ClassPath.from(loader).getTopLevelClasses()) { - if (info.getName().startsWith(packageName + ".")) { - final Class clazz = info.load(); - ServletPath path = clazz.getAnnotation(ServletPath.class); - if(path == null) { - continue; - } - ServletHolder jerseyServlet = context.addServlet(org.glassfish.jersey.servlet.ServletContainer.class, path.value()); - jerseyServlet.setInitOrder(0); - jerseyServlet.setInitParameter("jersey.config.server.provider.classnames", clazz.getCanonicalName()); - } - } - } catch (IOException e) { - LoggerUtilities.logStackTrace(e); - } +import java.io.IOException; + +public class JettyRestServer implements RestServer { + private final static Logger log = LogManager.getLogger(JettyRestServer.class); + private ServletContextHandler context; + private Server server; + private CertificateGenerator cert_gen; + + /** + * {@inheritDoc} + */ + @Override + public void initialize(String packageName) { + context = new ServletContextHandler(ServletContextHandler.SESSIONS); + context.setContextPath("/"); + + final ClassLoader loader = Thread.currentThread().getContextClassLoader(); + + try { + for (final ClassPath.ClassInfo info : ClassPath.from(loader).getTopLevelClasses()) { + if (info.getName().startsWith(packageName + ".")) { + final Class clazz = info.load(); + ServletPath path = clazz.getAnnotation(ServletPath.class); + if (path == null) { + continue; + } + ServletHolder jerseyServlet = context.addServlet(org.glassfish.jersey.servlet.ServletContainer.class, path.value()); + jerseyServlet.setInitOrder(0); + jerseyServlet.setInitParameter("jersey.config.server.provider.classnames", clazz.getCanonicalName()); + } + } + } catch (IOException e) { + LoggerUtilities.logStackTrace(e); + } /*for(Class c : entryPoints) { @@ -67,22 +59,22 @@ public void initialize(String packageName) { jerseyServlet.setInitOrder(0); jerseyServlet.setInitParameter("jersey.config.server.provider.classnames", c.getCanonicalName()); }*/ - } + } - /** - * {@inheritDoc} - */ - @Override - public void start(int port) throws Exception { + /** + * {@inheritDoc} + */ + @Override + public void start(int port) throws Exception { - server = new Server(); - server.setHandler(context); + server = new Server(); + server.setHandler(context); - @SuppressWarnings("unused") - String signe_type = "self-signed"; + @SuppressWarnings("unused") + String signe_type = "self-signed"; /*if( signe_type == "CA-signed" ) - { + { //Launching a simple http on 80 port for challenge //the CA serveur. createAndSetConnector(80, "http"); //Launch in sudo bc of 80; @@ -101,42 +93,42 @@ public void start(int port) throws Exception { } else if( signe_type == "self-signed" ) {*/ - this.cert_gen = X509V3Generator.getInstance("certConfig.conf"); - this.cert_gen.CreateCertificate("self-signed"); - this.cert_gen.StoreInKeystore("keystore.jks"); - createAndSetConnector(port, "https"); - //} - - server.start(); - server.join(); - } - - /** - * Create and link the proper connector to - * the jetty serveur. - * @param port Port the server will use for the given protocol. - * @param protocol Protocol used by the jetty serveur (currently available protocols : http, https). - */ - public void createAndSetConnector(int port, String protocol) throws Exception - { - - // Http config (base config) - HttpConfiguration http_config = new HttpConfiguration(); - http_config.setSecureScheme("https"); - http_config.setSecurePort(port); - http_config.setOutputBufferSize(38768); - javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier( - new javax.net.ssl.HostnameVerifier(){ - - @Override - public boolean verify(String hostname, - javax.net.ssl.SSLSession sslSession) { - if (hostname.equals("localhost")) { - return true; - } - return false; - } - }); + this.cert_gen = X509V3Generator.getInstance("certConfig.conf"); + this.cert_gen.CreateCertificate("self-signed"); + this.cert_gen.StoreInKeystore("keystore.jks"); + createAndSetConnector(port, "https"); + //} + + server.start(); + server.join(); + } + + /** + * Create and link the proper connector to + * the jetty serveur. + * + * @param port Port the server will use for the given protocol. + * @param protocol Protocol used by the jetty serveur (currently available protocols : http, https). + */ + public void createAndSetConnector(int port, String protocol) throws Exception { + + // Http config (base config) + HttpConfiguration http_config = new HttpConfiguration(); + http_config.setSecureScheme("https"); + http_config.setSecurePort(port); + http_config.setOutputBufferSize(38768); + javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier( + new javax.net.ssl.HostnameVerifier() { + + @Override + public boolean verify(String hostname, + javax.net.ssl.SSLSession sslSession) { + if (hostname.equals("localhost")) { + return true; + } + return false; + } + }); /* switch (protocol) { @@ -150,27 +142,27 @@ public boolean verify(String hostname, break; case "https":*/ - // SSL Context factory for HTTPS - SslContextFactory sslContextFactory = new SslContextFactory(); - sslContextFactory.setKeyStorePath("keystore.jks"); - sslContextFactory.setKeyStorePassword(this.cert_gen.getKsPassword()); - sslContextFactory.setKeyManagerPassword(this.cert_gen.getKsPassword()); - - // HTTPS Config - HttpConfiguration https_config = new HttpConfiguration(http_config); - SecureRequestCustomizer src = new SecureRequestCustomizer(); - src.setStsMaxAge(2000); - src.setStsIncludeSubDomains(true); - https_config.addCustomizer(src); - - // HTTPS Connector - ServerConnector https = new ServerConnector(server, - new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()), - new HttpConnectionFactory(https_config)); - https.setPort(port); - https.setIdleTimeout(500000); - log.debug("HTTPS context"); - server.setConnectors(new Connector[] {https}); + // SSL Context factory for HTTPS + SslContextFactory sslContextFactory = new SslContextFactory(); + sslContextFactory.setKeyStorePath("keystore.jks"); + sslContextFactory.setKeyStorePassword(this.cert_gen.getKsPassword()); + sslContextFactory.setKeyManagerPassword(this.cert_gen.getKsPassword()); + + // HTTPS Config + HttpConfiguration https_config = new HttpConfiguration(http_config); + SecureRequestCustomizer src = new SecureRequestCustomizer(); + src.setStsMaxAge(2000); + src.setStsIncludeSubDomains(true); + https_config.addCustomizer(src); + + // HTTPS Connector + ServerConnector https = new ServerConnector(server, + new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()), + new HttpConnectionFactory(https_config)); + https.setPort(port); + https.setIdleTimeout(500000); + log.debug("HTTPS context"); + server.setConnectors(new Connector[]{https}); /* break; case "http&https": @@ -208,13 +200,13 @@ public boolean verify(String hostname, System.exit(1); break; }*/ - } - - /** - * {@inheritDoc} - */ - @Override - public void stop() { - server.destroy(); - } + } + + /** + * {@inheritDoc} + */ + @Override + public void stop() { + server.destroy(); + } } diff --git a/src/main/java/rest/impl/SimpleAuthentifier.java b/src/main/java/rest/impl/SimpleAuthentifier.java index 9ea950d5..229a6ec0 100644 --- a/src/main/java/rest/impl/SimpleAuthentifier.java +++ b/src/main/java/rest/impl/SimpleAuthentifier.java @@ -1,65 +1,65 @@ package rest.impl; +import rest.api.Authentifier; + import java.math.BigInteger; import java.security.SecureRandom; import java.util.HashMap; -import rest.api.Authentifier; +public class SimpleAuthentifier implements Authentifier { + + private HashMap tokens = new HashMap<>(); + + /** + * {@inheritDoc} + */ + @Override + public String getToken(String username, String password) { + //TODO check credential or juste store user password ? + SecureRandom r = new SecureRandom(); + String token = new BigInteger(130, r).toString(32); + while (tokens.containsKey(token)) { + token = new BigInteger(130, r).toString(32); + } + tokens.put(token, new Logins(username, password)); + return token; + } -public class SimpleAuthentifier implements Authentifier{ + /** + * {@inheritDoc} + */ + @Override + public String getLogin(String token) { + if (!tokens.containsKey(token)) { + return null; + } + return tokens.get(token).login; + } - private class Logins { - public String login; - public String password; - - public Logins(String login, String password) { - this.login = login; - this.password = password; - } - } - - private HashMap tokens = new HashMap<>(); - - /** - * {@inheritDoc} - */ - @Override - public String getToken(String username, String password) { - //TODO check credential or juste store user password ? - SecureRandom r = new SecureRandom(); - String token = new BigInteger(130, r).toString(32); - while(tokens.containsKey(token)) { - token = new BigInteger(130, r).toString(32); - } - tokens.put(token, new Logins(username, password)); - return token; - } + /** + * {@inheritDoc} + */ + @Override + public String getPassword(String token) { + if (!tokens.containsKey(token)) { + return null; + } + return tokens.get(token).password; + } - /** - * {@inheritDoc} - */ - @Override - public String getLogin(String token) { - if(!tokens.containsKey(token)) { - return null; - } - return tokens.get(token).login; - } + @Override + public void deleteToken(String token) { + tokens.remove(token); + } - /** - * {@inheritDoc} - */ - @Override - public String getPassword(String token) { - if(!tokens.containsKey(token)) { - return null; - } - return tokens.get(token).password; - } + private class Logins { + public String login; + public String password; - @Override - public void deleteToken(String token) { - tokens.remove(token); - } + public Logins(String login, String password) { + this.login = login; + this.password = password; + } + } } diff --git a/src/main/js/.DS_Store b/src/main/js/.DS_Store new file mode 100644 index 00000000..638c5bd6 Binary files /dev/null and b/src/main/js/.DS_Store differ diff --git a/src/main/js/SXP-linux-x64/LICENSES.chromium.html b/src/main/js/SXP-linux-x64/LICENSES.chromium.html index 1de6a368..7ad03d1c 100644 --- a/src/main/js/SXP-linux-x64/LICENSES.chromium.html +++ b/src/main/js/SXP-linux-x64/LICENSES.chromium.html @@ -1,72 +1,83 @@ - -Credits - + + Credits + Credits Print

-
-Accessibility Audit library, from Accessibility Developer Tools -show license -homepage -
+
+ Accessibility Audit library, from Accessibility Developer Tools + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -270,14 +281,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Almost Native Graphics Layer Engine -show license -homepage -
+
+
+ +
+ Almost Native Graphics Layer Engine + show license + homepage + 
// Copyright (C) 2002-2013 The ANGLE Project Authors. 
 // All rights reserved.
 //
@@ -311,14 +322,14 @@
 // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Android -show license -homepage -
+
+
+ +
+ Android + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -522,14 +533,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Android Crazy Linker -show license -homepage -
+
+
+ +
+ Android Crazy Linker + show license + homepage + 
// Copyright 2014 The Chromium Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -586,14 +598,14 @@
  * SUCH DAMAGE.
  */
-
-
- -
-Android Explicit Synchronization -show license -homepage -
+
+
+ +
+ Android Explicit Synchronization + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -797,14 +809,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Android Open Source Project - App Compat Library -show license -homepage -
+
+
+ +
+ Android Open Source Project - App Compat Library + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -1008,14 +1021,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Android Open Source Project - Settings App -show license -homepage -
+
+
+ +
+ Android Open Source Project - Settings App + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -1219,14 +1232,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Android bionic libc -show license -homepage -
+
+
+ +
+ Android bionic libc + show license + homepage + 
   Copyright (c) 2014, Linaro Limited
    All rights reserved.
 
@@ -6302,14 +6316,14 @@
 -------------------------------------------------------------------
-
-
- -
-Apple sample code -show license -homepage -
+
+
+ +
+ Apple sample code + show license + homepage + 
Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
 Inc. ("Apple") in consideration of your agreement to the following
 terms, and your use, installation, modification or redistribution of
@@ -6349,14 +6363,15 @@
 POSSIBILITY OF SUCH DAMAGE.
 
 Copyright (C) 2009 Apple Inc. All Rights Reserved.
-
-
- -
-AsyncTask -show license -homepage -
+
+
+ +
+ AsyncTask + show license + homepage + 
Notice for all the files in this folder.
 ------------------------------------------------------------
 
@@ -6576,14 +6591,14 @@
    limitations under the License.
-
-
- -
-BSDiff -show license -homepage -
+
+
+ +
+ BSDiff + show license + homepage + 
Copyright 2003-2005 Colin Percival
 All rights reserved
 
@@ -6608,14 +6623,15 @@
 IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Blackmagic DeckLink SDK - Mac -show license -homepage -
+
+
+ +
+ Blackmagic DeckLink SDK - Mac + show license + homepage + 
Extracted from mac/include/DeckLinkAPI.h:
 
 ** Copyright (c) 2014 Blackmagic Design
@@ -6642,14 +6658,14 @@
 ** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 ** DEALINGS IN THE SOFTWARE.
-
-
- -
-Braille Translation Library -show license -homepage -
+
+
+ +
+ Braille Translation Library + show license + homepage + 
(Copied from src/liblouis/liblouis.h.in)
 
 /* liblouis Braille Translation and Back-Translation Library
@@ -6678,14 +6694,14 @@
    */
-
-
- -
-Breakpad, An open-source multi-platform crash reporting system -show license -homepage -
+
+
+ +
+ Breakpad, An open-source multi-platform crash reporting system + show license + homepage + 
Copyright (c) 2006, Google Inc.
 All rights reserved.
 
@@ -6775,14 +6791,14 @@
 License for the specific language governing permissions and limitations under
 the License.
-
-
- -
-Brotli -show license -homepage -
+
+
+ +
+ Brotli + show license + homepage + 
Copyright (c) 2009, 2010, 2013-2015 by the Brotli Authors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -6803,14 +6819,15 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-
- -
-Chrome Custom Tabs - Example and Usage -show license -homepage -
+
+
+ +
+ Chrome Custom Tabs - Example and Usage + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -6987,14 +7004,14 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-
-
- -
-ChromeVox -show license -homepage -
+
+
+ +
+ ChromeVox + show license + homepage + 
// Copyright 2013 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -7009,14 +7026,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
-
- -
-Chromium OS system API -show license -homepage -
+
+
+ +
+ Chromium OS system API + show license + homepage + 
// Copyright (c) 2006-2009 The Chromium OS Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -7045,14 +7062,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Closure compiler -show license -homepage -
+
+
+ +
+ Closure compiler + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -7256,14 +7273,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Cocoa extension code from Camino -show license -homepage -
+
+
+ +
+ Cocoa extension code from Camino + show license + homepage + 
/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -7300,14 +7317,15 @@
  *
  * ***** END LICENSE BLOCK ***** */
-
-
- -
-Compact Language Detection -show license -homepage -
+
+
+ +
+ Compact Language Detection + show license + homepage + 
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -7336,14 +7354,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Compact Language Detection 2 -show license -homepage -
+
+
+ +
+ Compact Language Detection 2 + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -7547,14 +7565,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Crashpad -show license -homepage -
+
+
+ +
+ Crashpad + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -7758,14 +7776,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Darwin -show license -homepage -
+
+
+ +
+ Darwin + show license + homepage + 
APPLE PUBLIC SOURCE LICENSE Version 2.0 -  August 6, 2003
 
 Please read this License carefully before downloading this software.  By
@@ -8094,14 +8112,14 @@
 ENJOYMENT OR NON-INFRINGEMENT.  Please see the License for the specific language
 governing rights and limitations under the License."
-
-
- -
-David M. Gay's floating point routines -show license -homepage -
+
+
+ +
+ David M. Gay's floating point routines + show license + homepage + 
/****************************************************************
  *
  * The author of this software is David M. Gay.
@@ -8121,14 +8139,14 @@
  *
  ***************************************************************/
-
-
- -
-Error Prone -show license -homepage -
+
+
+ +
+ Error Prone + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -8332,14 +8350,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Expat XML Parser -show license -homepage -
+
+
+ +
+ Expat XML Parser + show license + homepage + 
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
                                and Clark Cooper
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
@@ -8363,14 +8381,14 @@
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
- -
-Flot Javascript/JQuery library for creating graphs -show license -homepage -
+
+
+ +
+ Flot Javascript/JQuery library for creating graphs + show license + homepage + 
Copyright (c) 2007-2013 IOLA and Ole Laursen
 
 Permission is hereby granted, free of charge, to any person
@@ -8394,14 +8412,14 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
-
-
- -
-FreeType -show license -homepage -
+
+
+ +
+ FreeType + show license + homepage + 
                    The FreeType Project LICENSE
                     ----------------------------
 
@@ -8452,7 +8470,7 @@
   encourage you to use the following text:
 
    """
-    Portions of this software are copyright © <year> The FreeType
+    Portions of this software are copyright � <year> The FreeType
     Project (www.freetype.org).  All rights reserved.
    """
 
@@ -8572,14 +8590,14 @@
 
 --- end of FTL.TXT ---
-
-
- -
-GifPlayer Animated GIF Library -show license -homepage -
+
+
+ +
+ GifPlayer Animated GIF Library + show license + homepage + 
                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -8782,14 +8800,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Google Cache Invalidation API -show license -homepage -
+
+
+ +
+ Google Cache Invalidation API + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -8993,14 +9012,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Google Cardboard -show license -homepage -
+
+
+ +
+ Google Cardboard + show license + homepage + 
   Copyright (c) 2014, Google Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
@@ -9192,14 +9211,14 @@
-
-
- -
-Google Input Tools -show license -homepage -
+
+
+ +
+ Google Input Tools + show license + homepage + 
                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -9401,24 +9420,25 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Google Toolbox for Mac -show license -homepage -
+
+
+ +
+ Google Toolbox for Mac + show license + homepage + 
See src/COPYING
-
-
- -
-Hardware Composer Plus -show license -homepage -
+
+
+ +
+ Hardware Composer Plus + show license + homepage + 
// Copyright 2014 The Chromium Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -9447,14 +9467,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Headless Android Heap Analyzer -show license -homepage -
+
+
+ +
+ Headless Android Heap Analyzer + show license + homepage + 
perflib, guava:
 
                                  Apache License
@@ -9685,14 +9705,15 @@
 provided "as is" without expressed or implied warranty.
-
-
- -
-IAccessible2 COM interfaces for accessibility -show license -homepage -
+
+
+ +
+ IAccessible2 COM interfaces for accessibility + show license + homepage + 
/*************************************************************************
  *
  *  IAccessible2 IDL Specification 
@@ -9744,14 +9765,15 @@
  * 
  ************************************************************************/
-
-
- -
-ISimpleDOM COM interfaces for accessibility -show license -homepage -
+
+
+ +
+ ISimpleDOM COM interfaces for accessibility + show license + homepage + 
/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -9788,14 +9810,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
-
-
- -
-International Phone Number Library -show license -homepage -
+
+
+ +
+ International Phone Number Library + show license + homepage + 
                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -9973,14 +9995,14 @@
 
    END OF TERMS AND CONDITIONS
-
-
- -
-JMake -show license -homepage -
+
+
+ +
+ JMake + show license + homepage + 
		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
@@ -10323,14 +10345,14 @@
 Public License instead of this License.
-
-
- -
-Khronos header files -show license -homepage -
+
+
+ +
+ Khronos header files + show license + homepage + 
Copyright (c) 2007-2010 The Khronos Group Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -10380,14 +10402,14 @@
 dealings in this Software without prior written authorization from Silicon
 Graphics, Inc.
-
-
- -
-LCOV - the LTP GCOV extension -show license -homepage -
+
+
+ +
+ LCOV - the LTP GCOV extension + show license + homepage + 
		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
@@ -10728,24 +10750,24 @@
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
-
-
- -
-LZMA SDK -show license -homepage -
+
+
+ +
+ LZMA SDK + show license + homepage + 
LZMA SDK is placed in the public domain.
-
-
- -
-LeakCanary -show license -homepage -
+
+
+ +
+ LeakCanary + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -10948,14 +10970,14 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-LevelDB: A Fast Persistent Key-Value Store -show license -homepage -
+
+
+ +
+ LevelDB: A Fast Persistent Key-Value Store + show license + homepage + 
Copyright (c) 2011 The LevelDB Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -10984,14 +11006,15 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-MediaController android sample. -show license -homepage -
+
+
+ +
+ MediaController android sample. + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -11195,14 +11218,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-Mozilla Personal Security Manager -show license -homepage -
+
+
+ +
+ Mozilla Personal Security Manager + show license + homepage + 
/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -11239,14 +11263,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
-
-
- -
-NSBezierPath additions from Sean Patrick O'Brien -show license -homepage -
+
+
+ +
+ NSBezierPath additions from Sean Patrick O'Brien + show license + homepage + 
Copyright 2008 MolokoCacao
 All rights reserved
 
@@ -11271,14 +11295,14 @@
 IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-NVidia Control X Extension Library -show license -homepage -
+
+
+ +
+ NVidia Control X Extension Library + show license + homepage + 
/*
  * Copyright (c) 2008 NVIDIA, Corporation
  *
@@ -11301,14 +11325,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
-
- -
-Netscape Portable Runtime (NSPR) -show license -homepage -
+
+
+ +
+ Netscape Portable Runtime (NSPR) + show license + homepage + 
/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -11345,14 +11369,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
-
-
- -
-Network Security Services (NSS) -show license -homepage -
+
+
+ +
+ Network Security Services (NSS) + show license + homepage + 
/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -11389,14 +11413,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
-
-
- -
-OTS (OpenType Sanitizer) -show license -homepage -
+
+
+ +
+ OTS (OpenType Sanitizer) + show license + homepage + 
// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -11425,14 +11449,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-OpenH264 -show license -homepage -
+
+
+ +
+ OpenH264 + show license + homepage + 
Copyright (c) 2013, Cisco Systems
 All rights reserved.
 
@@ -11456,14 +11480,15 @@
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-OpenMAX DL -show license -homepage -
+
+
+ +
+ OpenMAX DL + show license + homepage + 
Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file in the root of the source tree. All
 contributing project authors may be found in the AUTHORS file in the
@@ -11502,14 +11527,14 @@
 
 Khronos and OpenMAX are trademarks of the Khronos Group Inc.
-
-
- -
-PDFium -show license -homepage -
+
+
+ +
+ PDFium + show license + homepage + 
// Copyright 2014 PDFium Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -11538,14 +11563,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-PLY (Python Lex-Yacc) -show license -homepage -
+
+
+ +
+ PLY (Python Lex-Yacc) + show license + homepage + 
PLY (Python Lex-Yacc)                   Version 3.4
 
 Copyright (C) 2001-2011,
@@ -11576,14 +11601,14 @@
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Paul Hsieh's SuperFastHash -show license -homepage -
+
+
+ +
+ Paul Hsieh's SuperFastHash + show license + homepage + 
Paul Hsieh OLD BSD license
 
 Copyright (c) 2010, Paul Hsieh
@@ -11612,14 +11637,14 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Polymer -show license -homepage -
+
+
+ +
+ Polymer + show license + homepage + 
// Copyright (c) 2012 The Polymer Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -11648,14 +11673,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Proguard -show license -homepage -
+
+
+ +
+ Proguard + show license + homepage + 
                    GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
@@ -11997,14 +12022,14 @@
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
-
-
- -
-Protocol Buffers -show license -homepage -
+
+
+ +
+ Protocol Buffers + show license + homepage + 
Copyright 2008, Google Inc.
 All rights reserved.
 
@@ -12039,14 +12064,14 @@
 standalone and requires a support library to be linked with it.  This
 support library is itself covered by the above license.
-
-
- -
-Quick Color Management System -show license -homepage -
+
+
+ +
+ Quick Color Management System + show license + homepage + 
qcms
 Copyright (C) 2009 Mozilla Corporation
 Copyright (C) 1998-2007 Marti Maria
@@ -12069,14 +12094,14 @@
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
- -
-SMHasher -show license -homepage -
+
+
+ +
+ SMHasher + show license + homepage + 
All MurmurHash source files are placed in the public domain.
 
 The license below applies to all other code in SMHasher:
@@ -12101,14 +12126,14 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-
- -
-Skia -show license -homepage -
+
+
+ +
+ Skia + show license + homepage + 
// Copyright (c) 2011 Google Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -12355,14 +12380,14 @@
 All Clipart are Released into the Public Domain.
 Each artist at Openclipart releases all rights to the images they share at Openclipart. The reason is so that there is no friction in using and sharing images authors make available at this website so that each artist might also receive the same benefit in using other artists clipart totally for any possible reason.
-
-
- -
-Snappy: A fast compressor/decompressor -show license -homepage -
+
+
+ +
+ Snappy: A fast compressor/decompressor + show license + homepage + 
Copyright 2011, Google Inc.
 All rights reserved.
 
@@ -12392,14 +12417,14 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Speech Dispatcher -show license -homepage -
+
+
+ +
+ Speech Dispatcher + show license + homepage + 
		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
@@ -13209,14 +13234,14 @@
-
-
- -
-Strongtalk -show license -homepage -
+
+
+ +
+ Strongtalk + show license + homepage + 
Copyright (c) 1994-2006 Sun Microsystems Inc.
 All Rights Reserved.
 
@@ -13247,14 +13272,14 @@
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Sudden Motion Sensor library -show license -homepage -
+
+
+ +
+ Sudden Motion Sensor library + show license + homepage + 
SMSLib Sudden Motion Sensor Access Library
 Copyright (c) 2010 Suitable Systems
 All rights reserved.
@@ -13299,25 +13324,25 @@
    Wakefield, MA 01880
    (781) 665-0053
-
-
- -
-SwiftShader software renderer. -show license -homepage -
+
+
+ +
+ SwiftShader software renderer. + show license + homepage + 
This product includes SwiftShader Software GPU Tookit,
 Copyright(c)2003-2011 TransGaming Inc
-
-
- -
-The USB ID Repository -show license -homepage -
+
+
+ +
+ The USB ID Repository + show license + homepage + 
Copyright (c) 2012, Linux USB Project
 All rights reserved.
 
@@ -13336,14 +13361,14 @@
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-The library to input, validate, and display addresses. -show license -homepage -
+
+
+ +
+ The library to input, validate, and display addresses. + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -13547,14 +13572,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-V8 JavaScript Engine -show license -homepage -
+
+
+ +
+ V8 JavaScript Engine + show license + homepage + 
This license applies to all parts of V8 that are not externally
 maintained libraries.  The externally maintained libraries used by V8
 are:
@@ -13613,14 +13638,15 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Vulkan API headers -show license -homepage -
+
+
+ +
+ Vulkan API headers + show license + homepage + 
 Copyright (C) 2015 Valve Corporation
 
@@ -13703,14 +13729,14 @@
 ///
-
-
- -
-WDS -show license -homepage -
+
+
+ +
+ WDS + show license + homepage + 
                  GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
@@ -14215,14 +14241,14 @@
 That's all there is to it!
-
-
- -
-Web Animations JS -show license -homepage -
+
+
+ +
+ Web Animations JS + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -14426,14 +14452,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-WebKit -show license -homepage -
+
+
+ +
+ WebKit + show license + homepage + 
(WebKit doesn't distribute an explicit license.  This LICENSE is derived from
 license text in the source.)
 
@@ -15402,14 +15428,14 @@
 
                      END OF TERMS AND CONDITIONS
-
-
- -
-WebM container parser and writer. -show license -homepage -
+
+
+ +
+ WebM container parser and writer. + show license + homepage + 
Copyright (c) 2010, Google Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -15441,14 +15467,14 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-WebP image encoder/decoder -show license -homepage -
+
+
+ +
+ WebP image encoder/decoder + show license + homepage + 
Copyright (c) 2010, Google Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -15503,14 +15529,14 @@
 for these implementations of WebM shall terminate as of the date such
 litigation is filed.
-
-
- -
-WebRTC -show license -homepage -
+
+
+ +
+ WebRTC + show license + homepage + 
Copyright (c) 2011, The WebRTC project authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -15541,14 +15567,14 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-WebRTC -show license -homepage -
+
+
+ +
+ WebRTC + show license + homepage + 
Copyright (c) 2011, The WebRTC project authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -15579,14 +15605,14 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-Windows Template Library (WTL) -show license -homepage -
+
+
+ +
+ Windows Template Library (WTL) + show license + homepage + 
Microsoft Permissive License (Ms-PL)
 Published: October 12, 2006
 
@@ -15653,24 +15679,24 @@
 the implied warranties of merchantability, fitness for a particular purpose and
 non-infringement.
-
-
- -
-XZ Utils -show license -homepage -
+
+
+ +
+ XZ Utils + show license + homepage + 
See http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/xz/COPYING
-
-
- -
-blimp_fonts -show license -homepage -
+
+
+ +
+ blimp_fonts + show license + homepage + 
All the font files are available in the font_bundle subdirectory.
 
 Fonts under Apache License Version 2.0 license:
@@ -15904,14 +15930,14 @@
 NanumGothicBold.ttf
 NanumGothic.ttf
-
-
- -
-blink HTMLTokenizer -show license -homepage -
+
+
+ +
+ blink HTMLTokenizer + show license + homepage + 
Copyright (C) 2008 Apple Inc. All Rights Reserved.
 Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
 Copyright (C) 2010 Google, Inc. All Rights Reserved.
@@ -15937,14 +15963,14 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-boringssl -show license -homepage -
+
+
+ +
+ boringssl + show license + homepage + 
   LICENSE ISSUES
   ==============
@@ -16073,14 +16099,14 @@
  */
-
-
- -
-bspatch -show license -homepage -
+
+
+ +
+ bspatch + show license + homepage + 
BSD Protection License
 February 2002
 
@@ -16203,14 +16229,14 @@
    TORT, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGES.
-
-
- -
-chromite -show license -homepage -
+
+
+ +
+ chromite + show license + homepage + 
// Copyright (c) 2006-2009 The Chromium OS Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -16239,14 +16265,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-class-dump -show license -homepage -
+
+
+ +
+ class-dump + show license + homepage + 
(Copied from the README.)
 
 --------------------------------------------------------------------------------
@@ -16274,14 +16300,14 @@
 
 You may contact the author by:
    e-mail:  nygard at gmail.com
-
-
- -
-d3 -show license -homepage -
+
+
+ +
+ d3 + show license + homepage + 
Copyright (c) 2010-2014, Michael Bostock
 All rights reserved.
 
@@ -16309,14 +16335,14 @@
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-dom-distiller-js -show license -homepage -
+
+
+ +
+ dom-distiller-js + show license + homepage + 
Copyright 2014 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -16415,14 +16441,14 @@
 
 END OF TERMS AND CONDITIONS
-
-
- -
-drawElements Quality Program -show license -homepage -
+
+
+ +
+ drawElements Quality Program + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -16626,14 +16652,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-dynamic annotations -show license -homepage -
+
+
+ +
+ dynamic annotations + show license + homepage + 
/* Copyright (c) 2008-2009, Google Inc.
  * All rights reserved.
  *
@@ -16663,14 +16690,14 @@
  * Author: Kostya Serebryany
  */
-
-
- -
-etc1 -show license -homepage -
+
+
+ +
+ etc1 + show license + homepage + 
/*
  * Copyright (C) 2009 The Android Open Source Project
  *
@@ -16686,14 +16713,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
- -
-fdlibm -show license -homepage -
+
+
+ +
+ fdlibm + show license + homepage + 
Copyright (C) 1993-2004 by Sun Microsystems, Inc. All rights reserved.
 
 Developed at SunSoft, a Sun Microsystems, Inc. business.
@@ -16701,14 +16728,14 @@
 software is freely granted, provided that this notice
 is preserved.
-
-
- -
-ffmpeg -show license -homepage -
+
+
+ +
+ ffmpeg + show license + homepage + 
#FFmpeg:
 
 Most files in FFmpeg are under the GNU Lesser General Public License version 2.1
@@ -17732,14 +17759,14 @@
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-
- -
-fips181 -show license -homepage -
+
+
+ +
+ fips181 + show license + homepage + 
Copyright (c) 1999, 2000, 2001, 2002
 Adel I. Mirzazhanov. All rights reserved
 
@@ -17767,14 +17794,15 @@
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-flac -show license -homepage -
+
+
+ +
+ flac + show license + homepage + 
Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
 
 Redistribution and use in source and binary forms, with or without
@@ -17804,14 +17832,14 @@
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-fontconfig -show license -homepage -
+
+
+ +
+ fontconfig + show license + homepage + 
fontconfig/COPYING
 
 Copyright © 2000,2001,2002,2003,2004,2006,2007 Keith Packard
@@ -17841,14 +17869,14 @@
 PERFORMANCE OF THIS SOFTWARE.
-
-
- -
-google-glog's symbolization library -show license -homepage -
+
+
+ +
+ google-glog's symbolization library + show license + homepage + 
// Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
@@ -17878,14 +17906,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-google-jstemplate -show license -homepage -
+
+
+ +
+ google-jstemplate + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -18089,14 +18117,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-google-safe-browsing -show license -homepage -
+
+
+ +
+ google-safe-browsing + show license + homepage + 
Copyright 2009 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -18111,14 +18139,14 @@
 See the License for the specific language governing permissions and
 limitations under the License.
-
-
- -
-harfbuzz-ng -show license -homepage -
+
+
+ +
+ harfbuzz-ng + show license + homepage + 
HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
 For parts of HarfBuzz that are licensed under different licenses see individual
 files names COPYING in subdirectories where applicable.
@@ -18156,14 +18184,14 @@
 ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-
- -
-hunspell -show license -homepage -
+
+
+ +
+ hunspell + show license + homepage + 
GPL 2.0/LGPL 2.1/MPL 1.1 tri-license
 
 The contents of this software may be used under the terms of
@@ -18177,14 +18205,14 @@
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the licences
 for the specific language governing rights and limitations under the licenses.
-
-
- -
-iccjpeg -show license -homepage -
+
+
+ +
+ iccjpeg + show license + homepage + 
LICENSE extracted from IJG's jpeg distribution:
 -----------------------------------------------
 
@@ -18235,14 +18263,14 @@
 assumed by the product vendor.
-
-
- -
-icu -show license -homepage -
+
+
+ +
+ icu + show license + homepage + 
ICU License - ICU 1.8.1 and later
 
    COPYRIGHT AND PERMISSION NOTICE
@@ -18630,14 +18658,15 @@
    database or code waives all rights to future claims in that
    contribution or in the TZ Database.
-
-
- -
-ijar -show license -homepage -
+
+
+ +
+ ijar + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -18842,14 +18871,14 @@
    limitations under the License.
-
-
- -
-jsoncpp -show license -homepage -
+
+
+ +
+ jsoncpp + show license + homepage + 
The JsonCpp library's source code, including accompanying documentation, 
 tests and demonstration applications, are licensed under the following
 conditions...
@@ -18906,14 +18935,14 @@
 Public Domain "license" you can re-license your copy using whatever
 license you like.
-
-
- -
-libFuzzer -show license -homepage -
+
+
+ +
+ libFuzzer + show license + homepage + 
==============================================================================
 LLVM Release License
 ==============================================================================
@@ -18985,14 +19014,14 @@
 ARM contributions   llvm/lib/Target/ARM/LICENSE.TXT
 md5 contributions   llvm/lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h
-
-
- -
-libcxx -show license -homepage -
+
+
+ +
+ libcxx + show license + homepage + 
==============================================================================
 libc++ License
 ==============================================================================
@@ -19070,14 +19099,14 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-
- -
-libevent -show license -homepage -
+
+
+ +
+ libevent + show license + homepage + 
Libevent is available for use under the following license, commonly known
 as the 3-clause (or "modified") BSD license:
 
@@ -19132,14 +19161,14 @@
 tree.h:
    Copyright 2002 Niels Provos <provos@citi.umich.edu>
-
-
- -
-libjingle -show license -homepage -
+
+
+ +
+ libjingle + show license + homepage + 
Copyright (c) 2013, Google Inc.
 All rights reserved.
 
@@ -19165,14 +19194,14 @@
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
 WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
-
-
- -
-libjpeg -show license -homepage -
+
+
+ +
+ libjpeg + show license + homepage + 
(Copied from the README.)
 
 --------------------------------------------------------------------------------
@@ -19256,14 +19285,14 @@
 jmorecfg.h contains modifications, which are distributed under the Netscape
 Public License.
-
-
- -
-libjpeg-turbo -show license -homepage -
+
+
+ +
+ libjpeg-turbo + show license + homepage + 
libjpeg-turbo is licensed under a non-restrictive, BSD-style license
 (see README.)  The TurboJPEG/OSS wrapper (both C and Java versions) and
 associated test programs bear a similar license, which is reproduced below:
@@ -19292,14 +19321,14 @@
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-libpng -show license -homepage -
+
+
+ +
+ libpng + show license + homepage + 
 This copy of the libpng notices is provided for your convenience.  In case of
 any discrepancy between this copy and the notices in the file png.h that is
@@ -19413,14 +19442,14 @@
 glennrp at users.sourceforge.net
 December 17, 2015
-
-
- -
-libsecret -show license -homepage -
+
+
+ +
+ libsecret + show license + homepage + 
                  GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
@@ -19923,14 +19952,14 @@
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-
- -
-libsrtp -show license -homepage -
+
+
+ +
+ libsrtp + show license + homepage + 
/*
  *	
  * Copyright (c) 2001-2006 Cisco Systems, Inc.
@@ -19967,14 +19996,14 @@
  *
  */
-
-
- -
-libudev -show license -homepage -
+
+
+ +
+ libudev + show license + homepage + 
                  GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
@@ -20478,14 +20507,14 @@
 
 That's all there is to it!
-
-
- -
-libusbx -show license -homepage -
+
+
+ +
+ libusbx + show license + homepage + 
		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
 
@@ -20991,14 +21020,14 @@
-
-
- -
-libva -show license -homepage -
+
+
+ +
+ libva + show license + homepage + 
    Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the
     "Software"), to deal in the Software without restriction, including
@@ -21019,14 +21048,14 @@
     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
- -
-libvpx -show license -homepage -
+
+
+ +
+ libvpx + show license + homepage + 
Copyright (c) 2010, The WebM Project authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -21059,14 +21088,14 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-libxml -show license -homepage -
+
+
+ +
+ libxml + show license + homepage + 
Except where otherwise noted in the source code (e.g. the files hash.c,
 list.c and the trio files, which are covered by a similar licence but
 with different Copyright notices) all the files are:
@@ -21091,14 +21120,14 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-
- -
-libxslt -show license -homepage -
+
+
+ +
+ libxslt + show license + homepage + 
Licence for libxslt except libexslt
 ----------------------------------------------------------------------
  Copyright (C) 2001-2002 Daniel Veillard.  All Rights Reserved.
@@ -21153,14 +21182,14 @@
 ings in this Software without prior written authorization from him.
 ----------------------------------------------------------------------
-
-
- -
-libyuv -show license -homepage -
+
+
+ +
+ libyuv + show license + homepage + 
Copyright 2011 The LibYuv Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -21191,14 +21220,14 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-linux-syscall-support -show license -homepage -
+
+
+ +
+ linux-syscall-support + show license + homepage + 
// Copyright 2015 The Chromium Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -21227,14 +21256,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-mach_override -show license -homepage -
+
+
+ +
+ mach_override + show license + homepage + 
Copyright (c) 2003-2012 Jonathan 'Wolf' Rentzsch: http://rentzsch.com
 Some rights reserved: http://opensource.org/licenses/mit
 
@@ -21263,14 +21292,14 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-markdown, a text-to-HTML conversion tool for web writers -show license -homepage -
+
+
+ +
+ markdown, a text-to-HTML conversion tool for web writers + show license + homepage + 
Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)  
 Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)  
 Copyright 2004 Manfred Stienstra (the original version)  
@@ -21302,14 +21331,14 @@
 POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-mesa -show license -homepage -
+
+
+ +
+ mesa + show license + homepage + 
The default Mesa license is as follows:
 
 Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
@@ -21823,14 +21852,15 @@
 That's all there is to it!
-
-
- -
-minigbm -show license -homepage -
+
+
+ +
+ minigbm + show license + homepage + 
// Copyright 2014 The Chromium OS Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -21859,14 +21889,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-modp base64 decoder -show license -homepage -
+
+
+ +
+ modp base64 decoder + show license + homepage + 
 * MODP_B64 - High performance base64 encoder/decoder
  * Version 1.3 -- 17-Mar-2006
  * http://modp.com/release/base64
@@ -21901,14 +21931,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-mt19937ar -show license -homepage -
+
+
+ +
+ mt19937ar + show license + homepage + 
   A C-program for MT19937, with initialization improved 2002/1/26.
    Coded by Takuji Nishimura and Makoto Matsumoto.
 
@@ -21945,14 +21976,14 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-native client -show license -homepage -
+
+
+ +
+ native client + show license + homepage + 
Copyright 2008, Google Inc.
 All rights reserved.
 
@@ -21982,14 +22013,14 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-newlib-extras -show license -homepage -
+
+
+ +
+ newlib-extras + show license + homepage + 
                        README for newlib-2.0.0 release
            (mostly cribbed from the README in the gdb-4.13 release)
 
@@ -22513,14 +22544,14 @@
 Archives of the newlib mailing list are on-line, see
 	http://sourceware.org/ml/newlib/
-
-
- -
-ocmock -show license -homepage -
+
+
+ +
+ ocmock + show license + homepage + 
  
   Copyright (c) 2004-2012 by Mulle Kybernetik. All rights reserved.
 
@@ -22536,14 +22567,14 @@
   "AS IS" CONDITION. THE COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY
   DAMAGES WHATSOEVER RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE
   OR OF ANY DERIVATIVE WORK.
-
-
- -
-open-vcdiff -show license -homepage -
+
+
+ +
+ open-vcdiff + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -22747,14 +22778,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-opus -show license -homepage -
+
+
+ +
+ opus + show license + homepage + 
Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic,
                     Jean-Marc Valin, Timothy B. Terriberry,
                     CSIRO, Gregory Maxwell, Mark Borgerding,
@@ -22800,14 +22831,14 @@
 Broadcom Corporation:
 https://datatracker.ietf.org/ipr/1526/
-
-
- -
-pdfsqueeze -show license -homepage -
+
+
+ +
+ pdfsqueeze + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -23010,14 +23041,14 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-pyelftools -show license -homepage -
+
+
+ +
+ pyelftools + show license + homepage + 
pyelftools is in the public domain (see below if you need more details).
 
 pyelftools uses the construct library for structured parsing of a binary
@@ -23052,14 +23083,14 @@
 For more information, please refer to <http://unlicense.org/>
-
-
- -
-re2 - an efficient, principled regular expression library -show license -homepage -
+
+
+ +
+ re2 - an efficient, principled regular expression library + show license + homepage + 
// Copyright (c) 2009 The RE2 Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23088,14 +23119,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-sfntly -show license -homepage -
+
+
+ +
+ sfntly + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -23300,14 +23331,14 @@
    limitations under the License.
-
-
- -
-simplejson -show license -homepage -
+
+
+ +
+ simplejson + show license + homepage + 
Copyright (c) 2006 Bob Ippolito
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -23328,14 +23359,14 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-
- -
-sqlite -show license -homepage -
+
+
+ +
+ sqlite + show license + homepage + 
The author disclaims copyright to this source code.  In place of
 a legal notice, here is a blessing:
 
@@ -23343,14 +23374,14 @@
    May you find forgiveness for yourself and forgive others.
    May you share freely, never taking more than you give.
-
-
- -
-talloc -show license -homepage -
+
+
+ +
+ talloc + show license + homepage + 
   Unix SMB/CIFS implementation.
    Samba temporary memory allocation functions
 
@@ -23374,14 +23405,14 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
-
-
- -
-tcmalloc -show license -homepage -
+
+
+ +
+ tcmalloc + show license + homepage + 
// Copyright (c) 2005, Google Inc.
 // All rights reserved.
 //
@@ -23411,14 +23442,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-tlslite -show license -homepage -
+
+
+ +
+ tlslite + show license + homepage + 
 TLS Lite includes code from different sources. All code is either dedicated to
 the public domain by its authors, or available under a BSD-style license. In
@@ -23487,14 +23518,15 @@
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-url_parse -show license -homepage -
+
+
+ +
+ url_parse + show license + homepage + 
Copyright 2007, Google Inc.
 All rights reserved.
 
@@ -23561,14 +23593,14 @@
 the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
-
-
- -
-usrsctp -show license -homepage -
+
+
+ +
+ usrsctp + show license + homepage + 
(Copied from the COPYRIGHT file of
 https://code.google.com/p/sctp-refimpl/source/browse/trunk/COPYRIGHT)
 --------------------------------------------------------------------------------
@@ -23600,14 +23632,14 @@
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
-
-
- -
-v4l-utils -show license -homepage -
+
+
+ +
+ v4l-utils + show license + homepage + 
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
@@ -24119,14 +24151,14 @@
-
-
- -
-valgrind -show license -homepage -
+
+
+ +
+ valgrind + show license + homepage + 
   Notice that the following BSD-style license applies to the Valgrind header
    files used by Chromium (valgrind.h and memcheck.h). However, the rest of
    Valgrind is licensed under the terms of the GNU General Public License,
@@ -24167,14 +24199,14 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- -
-wayland -show license -homepage -
+
+
+ +
+ wayland + show license + homepage + 
Copyright © 2008-2012 Kristian Høgsberg
 Copyright © 2010-2012 Intel Corporation
 Copyright © 2011 Benjamin Franzke
@@ -24205,14 +24237,14 @@
 
     http://cgit.freedesktop.org/xorg/xserver/tree/COPYING
-
-
- -
-wayland-protocols -show license -homepage -
+
+
+ +
+ wayland-protocols + show license + homepage + 
Copyright © 2008-2013 Kristian Høgsberg
 Copyright © 2010-2013 Intel Corporation
 Copyright © 2013      Rafael Antognolli
@@ -24247,14 +24279,14 @@
 
     http://cgit.freedesktop.org/xorg/xserver/tree/COPYING
-
-
- -
-woff2 -show license -homepage -
+
+
+ +
+ woff2 + show license + homepage + 
                                  Apache License
                            Version 2.0, January 2004
@@ -24458,14 +24490,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
- -
-x86inc -show license -homepage -
+
+
+ +
+ x86inc + show license + homepage + 
;*****************************************************************************
 ;* x86inc.asm
 ;*****************************************************************************
@@ -24501,14 +24533,14 @@
 ; as this feature might be useful for others as well.  Send patches or ideas
 ; to x264-devel@videolan.org .
-
-
- -
-xdg-mime -show license -homepage -
+
+
+ +
+ xdg-mime + show license + homepage + 
Licensed under the Academic Free License version 2.0 (below)
 Or under the following terms:
 
@@ -24678,14 +24710,14 @@
 modification. This license may not be modified without the express written
 permission of its copyright owner.
-
-
- -
-xdg-user-dirs -show license -homepage -
+
+
+ +
+ xdg-user-dirs + show license + homepage + 
  Copyright (c) 2007 Red Hat, inc
 
   Permission is hereby granted, free of charge, to any person
@@ -24708,14 +24740,14 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
-
-
- -
-xdg-utils -show license -homepage -
+
+
+ +
+ xdg-utils + show license + homepage + 
#
 #   Permission is hereby granted, free of charge, to any person obtaining a
 #   copy of this software and associated documentation files (the "Software"),
@@ -24735,14 +24767,14 @@
 #   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 #   OTHER DEALINGS IN THE SOFTWARE.
-
-
- -
-yasm -show license -homepage -
+
+
+ +
+ yasm + show license + homepage + 
Yasm is Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.
 
 Yasm developers and/or contributors include:
@@ -24805,14 +24837,14 @@
 GNU_GPL-2.0 - GNU General Public License
 GNU_LGPL-2.0 - GNU Library General Public License
-
-
- -
-zlib -show license -homepage -
+
+
+ +
+ zlib + show license + homepage + 
/* zlib.h -- interface of the 'zlib' general purpose compression library
   version 1.2.4, March 14th, 2010
 
@@ -24841,42 +24873,46 @@
 
 mozzconf.h is distributed under the MPL 1.1/GPL 2.0/LGPL 2.1 tri-license.
-
-
+
+
diff --git a/src/main/js/SXP-linux-x64/resources/app/css/custom.css b/src/main/js/SXP-linux-x64/resources/app/css/custom.css index ab2e10d3..4448f6d6 100644 --- a/src/main/js/SXP-linux-x64/resources/app/css/custom.css +++ b/src/main/js/SXP-linux-x64/resources/app/css/custom.css @@ -1,5 +1,5 @@ body { - padding-top: 45px; + padding-top: 45px; } .loader { @@ -9,133 +9,144 @@ body { width: 60px; height: 60px; animation: spin 2s linear infinite; - margin-left: 45%; - margin-top: 100px; + margin-left: 45%; + margin-top: 100px; } @keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } } .botborder { - border-bottom-style: solid; - border-bottom-width: 1px; - border-bottom-color: rgb(150, 150, 150); - height: 45px; - display: block; + border-bottom-style: solid; + border-bottom-width: 1px; + border-bottom-color: rgb(150, 150, 150); + height: 45px; + display: block; } nav ul li .linknodeco:hover, nav ul li .linknodeco:active, nav ul li .linknodeco:focus { - text-decoration: none; - outline: none !important; + text-decoration: none; + outline: none !important; } nav ul li .linknodeco:active { - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.05); } .transibutton { - opacity: 1; - position: relative; - left: 0px; + opacity: 1; + position: relative; + left: 0px; } .transibutton.ng-hide-add, .transibutton.ng-hide-remove { - transition: all linear 0.2s; + transition: all linear 0.2s; } .transibutton.ng-hide { - opacity: 0; - left: -100px; + opacity: 0; + left: -100px; } .center-content { - display: block; - text-align: center; - z-index: -1000; - width: 100%; - position: absolute; + display: block; + text-align: center; + z-index: -1000; + width: 100%; + position: absolute; } .specheight { - position: relative; - height: 100%; + position: relative; + height: 100%; } .ui-view-container { - position: relative; - height: 100%; - overflow-y: auto; - overflow-x: hidden; + position: relative; + height: 100%; + overflow-y: auto; + overflow-x: hidden; } [ui-view].ng-enter, [ui-view].ng-leave { - position: absolute; - left: 0; - right: 0; - -webkit-transition:all .5s ease-in-out; - -moz-transition:all .5s ease-in-out; - -o-transition:all .5s ease-in-out; - transition:all .5s ease-in-out; + position: absolute; + left: 0; + right: 0; + -webkit-transition: all .5s ease-in-out; + -moz-transition: all .5s ease-in-out; + -o-transition: all .5s ease-in-out; + transition: all .5s ease-in-out; } [ui-view].ng-enter { - opacity: 0; - -webkit-transform:translate3d(200px, 0, 0); - -moz-transform:translate3d(200px, 0, 0); - transform:translate3d(200px, 0, 0); + opacity: 0; + -webkit-transform: translate3d(200px, 0, 0); + -moz-transform: translate3d(200px, 0, 0); + transform: translate3d(200px, 0, 0); } [ui-view].ng-enter-active { - opacity: 1; - -webkit-transform:translate3d(0px, 0, 0); - -moz-transform:translate3d(0px, 0, 0); - transform:translate3d(0px, 0, 0); + opacity: 1; + -webkit-transform: translate3d(0px, 0, 0); + -moz-transform: translate3d(0px, 0, 0); + transform: translate3d(0px, 0, 0); } [ui-view].ng-leave { - opacity: 1; - -webkit-transform:translate3d(0, 0, 0); - -moz-transform:translate3d(0, 0, 0); - transform:translate3d(0, 0, 0); + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + -moz-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } [ui-view].ng-leave-active { - opacity: 0; - -webkit-transform:translate3d(-200px, 0, 0); - -moz-transform:translate3d(-200px, 0, 0); - transform:translate3d(-200px, 0, 0); + opacity: 0; + -webkit-transform: translate3d(-200px, 0, 0); + -moz-transform: translate3d(-200px, 0, 0); + transform: translate3d(-200px, 0, 0); } @-webkit-keyframes clignote { -0%{background-color: #f2dede;} -50%{background-color: #a94442;} -100%{background-color: #f2dede;} + 0% { + background-color: #f2dede; + } + 50% { + background-color: #a94442; + } + 100% { + background-color: #f2dede; + } } .alert-danger { --webkit-animation-name: clignote; //on affecte l'animation clignote à notre bouton --webkit-animation-duration: 1s; //on définit la durée de l'animation à 1s --webkit-animation-iteration-count:infinite; //on dit que l'animation se répétera à l'infini. + -webkit-animation-name: clignote; +/ / on affecte l 'animation clignote à notre bouton -webkit-animation-duration: 1 s; +/ / on définit la durée de l 'animation à 1s -webkit-animation-iteration-count: infinite; +/ / on dit que l 'animation se répétera à l' infini . } img { - float: right; - height: 200px; - width: 200px; + float: right; + height: 200px; + width: 200px; } .active { - background-color: #eee; + background-color: #eee; } .chatActive { - display: block; + display: block; } navbar { - background-color: white; + background-color: white; } diff --git a/src/main/js/SXP-linux-x64/resources/app/css/simple-sidebar.css b/src/main/js/SXP-linux-x64/resources/app/css/simple-sidebar.css index 9d064783..c06ed0d1 100644 --- a/src/main/js/SXP-linux-x64/resources/app/css/simple-sidebar.css +++ b/src/main/js/SXP-linux-x64/resources/app/css/simple-sidebar.css @@ -73,7 +73,7 @@ .sidebar-nav li a:hover { text-decoration: none; color: #fff; - background: rgba(255,255,255,0.2); + background: rgba(255, 255, 255, 0.2); } .sidebar-nav li a:active, @@ -96,7 +96,7 @@ background: none; } -@media(min-width:768px) { +@media (min-width: 768px) { #wrapper { padding-left: 250px; } diff --git a/src/main/js/SXP-linux-x64/resources/app/fonts/glyphicons-halflings-regular.svg b/src/main/js/SXP-linux-x64/resources/app/fonts/glyphicons-halflings-regular.svg index 94fb5490..2ba280f4 100644 --- a/src/main/js/SXP-linux-x64/resources/app/fonts/glyphicons-halflings-regular.svg +++ b/src/main/js/SXP-linux-x64/resources/app/fonts/glyphicons-halflings-regular.svg @@ -1,288 +1,543 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/js/SXP-linux-x64/resources/app/html/accounts/account.html b/src/main/js/SXP-linux-x64/resources/app/html/accounts/account.html index c0060319..6ae1e44e 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/accounts/account.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/accounts/account.html @@ -1,7 +1,7 @@

Account

Username : {{user.nick}}

- - + +

Unique id : {{user.id}}

diff --git a/src/main/js/SXP-linux-x64/resources/app/html/accounts/login.html b/src/main/js/SXP-linux-x64/resources/app/html/accounts/login.html index bdcaba14..b7c3f10d 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/accounts/login.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/accounts/login.html @@ -2,28 +2,28 @@

Login

-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
-
- - subscribe +
+
+ + subscribe +
-
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/accounts/subscribe.html b/src/main/js/SXP-linux-x64/resources/app/html/accounts/subscribe.html index a5f3e3c0..f5195c1f 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/accounts/subscribe.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/accounts/subscribe.html @@ -3,28 +3,30 @@

Subscribe

-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
-
- - Cancel +
+
+ + Cancel +
-
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/contextButtons.html b/src/main/js/SXP-linux-x64/resources/app/html/contextButtons.html index 3ab5e282..11afe53e 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/contextButtons.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/contextButtons.html @@ -1,7 +1,21 @@ - - - - - - - + + + + + + + diff --git a/src/main/js/SXP-linux-x64/resources/app/html/contracts/clause.html b/src/main/js/SXP-linux-x64/resources/app/html/contracts/clause.html index 97ee9e96..ba0d4ea7 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/contracts/clause.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/contracts/clause.html @@ -1,6 +1,6 @@
- {{clause}} + {{clause}}
- Delete + Delete
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/contracts/contract-form.html b/src/main/js/SXP-linux-x64/resources/app/html/contracts/contract-form.html index 36ccf110..2c276ef0 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/contracts/contract-form.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/contracts/contract-form.html @@ -2,74 +2,82 @@

Add a new contract

Edit a contract

-
- -
- - -
-
- -
- -
- -
- -
-
- -
-
- -
-
-
- -
- - -
-
- -
- -
-
- - + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+
+
+ +
+ + +
+
+ +
+ +
+
+ + -
-
-
- - - +
+
+
+ + + -
-
-
- - -
-
-
- -
-
-
-
- - -
-
- - - +
+
+
+ +
+
+
-
- + + +
+
+ + + +
+
+ \ No newline at end of file diff --git a/src/main/js/SXP-linux-x64/resources/app/html/contracts/contract.html b/src/main/js/SXP-linux-x64/resources/app/html/contracts/contract.html index 9661d86e..581da434 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/contracts/contract.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/contracts/contract.html @@ -1,15 +1,17 @@ -
-
-

{{title}}

- -
-

Parties :
    {{party}}

-

Clauses :
    {{clause}}

-
- -
- - - -
-
\ No newline at end of file +
+
+

{{title}}

+ +
+

Parties :
    {{party}}

+

Clauses :
    {{clause}}

+
+ +
+ + + +
+
+
\ No newline at end of file diff --git a/src/main/js/SXP-linux-x64/resources/app/html/contracts/contracts.html b/src/main/js/SXP-linux-x64/resources/app/html/contracts/contracts.html index 81253830..c5d6b0c3 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/contracts/contracts.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/contracts/contracts.html @@ -1,6 +1,6 @@

My contracts

-
- -
+
+ +
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/contracts/one-contract.html b/src/main/js/SXP-linux-x64/resources/app/html/contracts/one-contract.html index 89a496ef..4bd18e59 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/contracts/one-contract.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/contracts/one-contract.html @@ -1,12 +1,12 @@ -
-
-

{{contract.title}}

-
- {{getclauses(contract)}} -
- -

    {{clause}}

-
-
+
+
+

{{contract.title}}

+
+ {{getclauses(contract)}} +
+ +

    {{clause}}

+
+
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/contracts/party.html b/src/main/js/SXP-linux-x64/resources/app/html/contracts/party.html index 33f2a7c3..48784171 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/contracts/party.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/contracts/party.html @@ -1,6 +1,6 @@
- Id : {{party}} + Id : {{party}}
- Delete + Delete
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/index.html b/src/main/js/SXP-linux-x64/resources/app/html/index.html index a0e04731..0a0fe162 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/index.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/index.html @@ -1,54 +1,56 @@ - {{app.title}} - - - - - - - - - - - + {{app.title}} + + + + + + + + + + + - - - - - + + + + + - + - - + + - - -
- - - -
-
-
- -
-
+ + +
+ + + +
+
+
+ +
-
-
+
+
+
- - + diff --git a/src/main/js/SXP-linux-x64/resources/app/html/items/item-form.html b/src/main/js/SXP-linux-x64/resources/app/html/items/item-form.html index 18ecbfcb..4de66d3e 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/items/item-form.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/items/item-form.html @@ -4,30 +4,30 @@

Sub item

Are you sure to delete this item?

-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/items/item-list.html b/src/main/js/SXP-linux-x64/resources/app/html/items/item-list.html index b8ae1d64..49a850d9 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/items/item-list.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/items/item-list.html @@ -1,10 +1,10 @@ -
-
-

{{item.title}}

-
-
- {{item.description}} -
-
+
+
+

{{item.title}}

+
+
+ {{item.description}} +
+
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/items/item.html b/src/main/js/SXP-linux-x64/resources/app/html/items/item.html index 8cdd75ea..13b8005c 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/items/item.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/items/item.html @@ -1,5 +1,9 @@

{{item.title}}

Description : {{item.description}}

-

created on {{item.createdAt}} by {{item.username}}

-

Item id: {{item.id}}

+

+ created on {{item.createdAt}} by {{item.username}} +

+

+ Item id: {{item.id}} +

diff --git a/src/main/js/SXP-linux-x64/resources/app/html/items/items.html b/src/main/js/SXP-linux-x64/resources/app/html/items/items.html index a62b36ea..3ef7bac8 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/items/items.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/items/items.html @@ -1,6 +1,6 @@

My items

-
- -
+
+ +
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/messages.html b/src/main/js/SXP-linux-x64/resources/app/html/messages.html index bd3a5145..e87d58d3 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/messages.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/messages.html @@ -1,29 +1,31 @@

Inbox

-
- -
+
+ +
-
-
-
-

- Me: - {{message.sendName}}: - {{message.messageContent}}{{message.sendingDate}} -

-
-
- - - +
+
+
+

+ Me: + {{message.sendName}}: + {{message.messageContent}}{{message.sendingDate}} +

+
+
+ + + -
-
-
+
+
+
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/navbar.html b/src/main/js/SXP-linux-x64/resources/app/html/navbar.html index bd30ab87..1bdc845c 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/navbar.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/navbar.html @@ -1,30 +1,33 @@ diff --git a/src/main/js/SXP-linux-x64/resources/app/html/newMessage.html b/src/main/js/SXP-linux-x64/resources/app/html/newMessage.html index 00e8b44d..39e84216 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/newMessage.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/newMessage.html @@ -4,7 +4,8 @@

New Message

@ - +

diff --git a/src/main/js/SXP-linux-x64/resources/app/html/search.html b/src/main/js/SXP-linux-x64/resources/app/html/search.html index a94cb73a..097ef473 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/search.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/search.html @@ -1,24 +1,29 @@
- +
-

+

-
-
- - -
-
-

{{item.title}}

-
-
-

{{item.description}}

-

posted : {{item.createdAt}} by {{item.username}}

-
-
-
-
+
+
+ + +
+
+

{{item.title}}

+
+
+

{{item.description}}

+

+ posted : {{item.createdAt}} by {{item.username}} +

+
+
+
+
diff --git a/src/main/js/SXP-linux-x64/resources/app/html/settings/settings.html b/src/main/js/SXP-linux-x64/resources/app/html/settings/settings.html index 5f47814b..0a86b408 100755 --- a/src/main/js/SXP-linux-x64/resources/app/html/settings/settings.html +++ b/src/main/js/SXP-linux-x64/resources/app/html/settings/settings.html @@ -1,3 +1,3 @@

Settings

-

Account name : {{user.nick}}

- Change password +

Account name : {{user.nick}}

+Change password diff --git a/src/main/js/SXP-linux-x64/resources/app/libs/angular-oboe.js b/src/main/js/SXP-linux-x64/resources/app/libs/angular-oboe.js index 91b43059..29df6352 100644 --- a/src/main/js/SXP-linux-x64/resources/app/libs/angular-oboe.js +++ b/src/main/js/SXP-linux-x64/resources/app/libs/angular-oboe.js @@ -1,41 +1,41 @@ 'use strict'; angular.module('ngOboe', []).service('Oboe', [ - 'OboeStream', - function (OboeStream) { - // the passed parameters object need to have a Url and a pattern. - // all parameters consumed by the oboe module can be passed - // the url needs to return a json stream. see the oboe documentation - // the pattern contains a path which selects json objects from the stream - return function (params) { - return OboeStream.get(params); - }; - } + 'OboeStream', + function (OboeStream) { + // the passed parameters object need to have a Url and a pattern. + // all parameters consumed by the oboe module can be passed + // the url needs to return a json stream. see the oboe documentation + // the pattern contains a path which selects json objects from the stream + return function (params) { + return OboeStream.get(params); + }; + } ]).factory('OboeStream', [ - '$q', - function ($q) { - return { - get: function (params) { - var defer = $q.defer(); - var stream = oboe(params).start(function (status, headers) { - if (typeof params.start === 'function' && status === 200) { - params.start(stream); + '$q', + function ($q) { + return { + get: function (params) { + var defer = $q.defer(); + var stream = oboe(params).start(function (status, headers) { + if (typeof params.start === 'function' && status === 200) { + params.start(stream); + } + }).fail(function (error) { + defer.reject(error); + }).node(params.pattern || '.', function (node) { + defer.notify(node); + return oboe.drop; + }).done(function (parsedJSON) { + if (typeof params.done === 'function') { + params.done(parsedJSON); + } + // resolve the promise + defer.resolve(parsedJSON); + // make sure oboe cleans up memory + return oboe.drop; + }); + return defer.promise; } - }).fail(function (error) { - defer.reject(error); - }).node(params.pattern || '.', function (node) { - defer.notify(node); - return oboe.drop; - }).done(function (parsedJSON) { - if (typeof params.done === 'function') { - params.done(parsedJSON); - } - // resolve the promise - defer.resolve(parsedJSON); - // make sure oboe cleans up memory - return oboe.drop; - }); - return defer.promise; - } - }; - } + }; + } ]); diff --git a/src/main/js/SXP-linux-x64/resources/app/libs/angular.js b/src/main/js/SXP-linux-x64/resources/app/libs/angular.js index 05ebff5b..e0cf35ac 100644 --- a/src/main/js/SXP-linux-x64/resources/app/libs/angular.js +++ b/src/main/js/SXP-linux-x64/resources/app/libs/angular.js @@ -3,74 +3,75 @@ * (c) 2010-2016 Google, Inc. http://angularjs.org * License: MIT */ -(function(window) {'use strict'; +(function (window) { + 'use strict'; -/** - * @description - * - * This object provides a utility for producing rich Error messages within - * Angular. It can be called as follows: - * - * var exampleMinErr = minErr('example'); - * throw exampleMinErr('one', 'This {0} is {1}', foo, bar); - * - * The above creates an instance of minErr in the example namespace. The - * resulting error will have a namespaced error code of example.one. The - * resulting error will replace {0} with the value of foo, and {1} with the - * value of bar. The object is not restricted in the number of arguments it can - * take. - * - * If fewer arguments are specified than necessary for interpolation, the extra - * interpolation markers will be preserved in the final string. - * - * Since data will be parsed statically during a build step, some restrictions - * are applied with respect to how minErr instances are created and called. - * Instances should have names of the form namespaceMinErr for a minErr created - * using minErr('namespace') . Error codes, namespaces and template strings - * should all be static strings, not variables or general expressions. - * - * @param {string} module The namespace to use for the new minErr instance. - * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning - * error from returned function, for cases when a particular type of error is useful. - * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance - */ + /** + * @description + * + * This object provides a utility for producing rich Error messages within + * Angular. It can be called as follows: + * + * var exampleMinErr = minErr('example'); + * throw exampleMinErr('one', 'This {0} is {1}', foo, bar); + * + * The above creates an instance of minErr in the example namespace. The + * resulting error will have a namespaced error code of example.one. The + * resulting error will replace {0} with the value of foo, and {1} with the + * value of bar. The object is not restricted in the number of arguments it can + * take. + * + * If fewer arguments are specified than necessary for interpolation, the extra + * interpolation markers will be preserved in the final string. + * + * Since data will be parsed statically during a build step, some restrictions + * are applied with respect to how minErr instances are created and called. + * Instances should have names of the form namespaceMinErr for a minErr created + * using minErr('namespace') . Error codes, namespaces and template strings + * should all be static strings, not variables or general expressions. + * + * @param {string} module The namespace to use for the new minErr instance. + * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning + * error from returned function, for cases when a particular type of error is useful. + * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance + */ -function minErr(module, ErrorConstructor) { - ErrorConstructor = ErrorConstructor || Error; - return function() { - var SKIP_INDEXES = 2; + function minErr(module, ErrorConstructor) { + ErrorConstructor = ErrorConstructor || Error; + return function () { + var SKIP_INDEXES = 2; - var templateArgs = arguments, - code = templateArgs[0], - message = '[' + (module ? module + ':' : '') + code + '] ', - template = templateArgs[1], - paramPrefix, i; + var templateArgs = arguments, + code = templateArgs[0], + message = '[' + (module ? module + ':' : '') + code + '] ', + template = templateArgs[1], + paramPrefix, i; - message += template.replace(/\{\d+\}/g, function(match) { - var index = +match.slice(1, -1), - shiftedIndex = index + SKIP_INDEXES; + message += template.replace(/\{\d+\}/g, function (match) { + var index = +match.slice(1, -1), + shiftedIndex = index + SKIP_INDEXES; - if (shiftedIndex < templateArgs.length) { - return toDebugString(templateArgs[shiftedIndex]); - } + if (shiftedIndex < templateArgs.length) { + return toDebugString(templateArgs[shiftedIndex]); + } - return match; - }); + return match; + }); - message += '\nhttp://errors.angularjs.org/1.5.5/' + - (module ? module + '/' : '') + code; + message += '\nhttp://errors.angularjs.org/1.5.5/' + + (module ? module + '/' : '') + code; - for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') { - message += paramPrefix + 'p' + (i - SKIP_INDEXES) + '=' + - encodeURIComponent(toDebugString(templateArgs[i])); - } + for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') { + message += paramPrefix + 'p' + (i - SKIP_INDEXES) + '=' + + encodeURIComponent(toDebugString(templateArgs[i])); + } - return new ErrorConstructor(message); - }; -} + return new ErrorConstructor(message); + }; + } -/* We need to tell jshint what variables are being exported */ -/* global angular: true, + /* We need to tell jshint what variables are being exported */ + /* global angular: true, msie: true, jqLite: true, jQuery: true, @@ -167,678 +168,706 @@ function minErr(module, ErrorConstructor) { //////////////////////////////////// -/** - * @ngdoc module - * @name ng - * @module ng - * @installation - * @description - * - * # ng (core module) - * The ng module is loaded by default when an AngularJS application is started. The module itself - * contains the essential components for an AngularJS application to function. The table below - * lists a high level breakdown of each of the services/factories, filters, directives and testing - * components available within this core module. - * - *
- */ + /** + * @ngdoc module + * @name ng + * @module ng + * @installation + * @description + * + * # ng (core module) + * The ng module is loaded by default when an AngularJS application is started. The module itself + * contains the essential components for an AngularJS application to function. The table below + * lists a high level breakdown of each of the services/factories, filters, directives and testing + * components available within this core module. + * + *
+ */ -var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/; + var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/; // The name of a form control's ValidityState property. // This is used so that it's possible for internal tests to create mock ValidityStates. -var VALIDITY_STATE_PROPERTY = 'validity'; + var VALIDITY_STATE_PROPERTY = 'validity'; -var hasOwnProperty = Object.prototype.hasOwnProperty; + var hasOwnProperty = Object.prototype.hasOwnProperty; -var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;}; -var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;}; + var lowercase = function (string) { + return isString(string) ? string.toLowerCase() : string; + }; + var uppercase = function (string) { + return isString(string) ? string.toUpperCase() : string; + }; -var manualLowercase = function(s) { - /* jshint bitwise: false */ - return isString(s) - ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);}) - : s; -}; -var manualUppercase = function(s) { - /* jshint bitwise: false */ - return isString(s) - ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);}) - : s; -}; + var manualLowercase = function (s) { + /* jshint bitwise: false */ + return isString(s) + ? s.replace(/[A-Z]/g, function (ch) { + return String.fromCharCode(ch.charCodeAt(0) | 32); + }) + : s; + }; + var manualUppercase = function (s) { + /* jshint bitwise: false */ + return isString(s) + ? s.replace(/[a-z]/g, function (ch) { + return String.fromCharCode(ch.charCodeAt(0) & ~32); + }) + : s; + }; // String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish // locale, for this reason we need to detect this case and redefine lowercase/uppercase methods // with correct but slower alternatives. See https://github.com/angular/angular.js/issues/11387 -if ('i' !== 'I'.toLowerCase()) { - lowercase = manualLowercase; - uppercase = manualUppercase; -} - - -var - msie, // holds major version number for IE, or NaN if UA is not IE. - jqLite, // delay binding since jQuery could be loaded after us. - jQuery, // delay binding - slice = [].slice, - splice = [].splice, - push = [].push, - toString = Object.prototype.toString, - getPrototypeOf = Object.getPrototypeOf, - ngMinErr = minErr('ng'), - - /** @name angular */ - angular = window.angular || (window.angular = {}), - angularModule, - uid = 0; + if ('i' !== 'I'.toLowerCase()) { + lowercase = manualLowercase; + uppercase = manualUppercase; + } -/** - * documentMode is an IE-only property - * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx - */ -msie = window.document.documentMode; + var + msie, // holds major version number for IE, or NaN if UA is not IE. + jqLite, // delay binding since jQuery could be loaded after us. + jQuery, // delay binding + slice = [].slice, + splice = [].splice, + push = [].push, + toString = Object.prototype.toString, + getPrototypeOf = Object.getPrototypeOf, + ngMinErr = minErr('ng'), + + /** @name angular */ + angular = window.angular || (window.angular = {}), + angularModule, + uid = 0; + + /** + * documentMode is an IE-only property + * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx + */ + msie = window.document.documentMode; -/** - * @private - * @param {*} obj - * @return {boolean} Returns true if `obj` is an array or array-like object (NodeList, Arguments, - * String ...) - */ -function isArrayLike(obj) { - // `null`, `undefined` and `window` are not array-like - if (obj == null || isWindow(obj)) return false; + /** + * @private + * @param {*} obj + * @return {boolean} Returns true if `obj` is an array or array-like object (NodeList, Arguments, + * String ...) + */ + function isArrayLike(obj) { - // arrays, strings and jQuery/jqLite objects are array like - // * jqLite is either the jQuery or jqLite constructor function - // * we have to check the existence of jqLite first as this method is called - // via the forEach method when constructing the jqLite object in the first place - if (isArray(obj) || isString(obj) || (jqLite && obj instanceof jqLite)) return true; + // `null`, `undefined` and `window` are not array-like + if (obj == null || isWindow(obj)) return false; - // Support: iOS 8.2 (not reproducible in simulator) - // "length" in obj used to prevent JIT error (gh-11508) - var length = "length" in Object(obj) && obj.length; + // arrays, strings and jQuery/jqLite objects are array like + // * jqLite is either the jQuery or jqLite constructor function + // * we have to check the existence of jqLite first as this method is called + // via the forEach method when constructing the jqLite object in the first place + if (isArray(obj) || isString(obj) || (jqLite && obj instanceof jqLite)) return true; - // NodeList objects (with `item` method) and - // other objects with suitable length characteristics are array-like - return isNumber(length) && - (length >= 0 && ((length - 1) in obj || obj instanceof Array) || typeof obj.item == 'function'); + // Support: iOS 8.2 (not reproducible in simulator) + // "length" in obj used to prevent JIT error (gh-11508) + var length = "length" in Object(obj) && obj.length; -} + // NodeList objects (with `item` method) and + // other objects with suitable length characteristics are array-like + return isNumber(length) && + (length >= 0 && ((length - 1) in obj || obj instanceof Array) || typeof obj.item == 'function'); -/** - * @ngdoc function - * @name angular.forEach - * @module ng - * @kind function - * - * @description - * Invokes the `iterator` function once for each item in `obj` collection, which can be either an - * object or an array. The `iterator` function is invoked with `iterator(value, key, obj)`, where `value` - * is the value of an object property or an array element, `key` is the object property key or - * array element index and obj is the `obj` itself. Specifying a `context` for the function is optional. - * - * It is worth noting that `.forEach` does not iterate over inherited properties because it filters - * using the `hasOwnProperty` method. - * - * Unlike ES262's - * [Array.prototype.forEach](http://www.ecma-international.org/ecma-262/5.1/#sec-15.4.4.18), - * providing 'undefined' or 'null' values for `obj` will not throw a TypeError, but rather just - * return the value provided. - * - ```js + } + + /** + * @ngdoc function + * @name angular.forEach + * @module ng + * @kind function + * + * @description + * Invokes the `iterator` function once for each item in `obj` collection, which can be either an + * object or an array. The `iterator` function is invoked with `iterator(value, key, obj)`, where `value` + * is the value of an object property or an array element, `key` is the object property key or + * array element index and obj is the `obj` itself. Specifying a `context` for the function is optional. + * + * It is worth noting that `.forEach` does not iterate over inherited properties because it filters + * using the `hasOwnProperty` method. + * + * Unlike ES262's + * [Array.prototype.forEach](http://www.ecma-international.org/ecma-262/5.1/#sec-15.4.4.18), + * providing 'undefined' or 'null' values for `obj` will not throw a TypeError, but rather just + * return the value provided. + * + ```js var values = {name: 'misko', gender: 'male'}; var log = []; angular.forEach(values, function(value, key) { this.push(key + ': ' + value); }, log); expect(log).toEqual(['name: misko', 'gender: male']); - ``` - * - * @param {Object|Array} obj Object to iterate over. - * @param {Function} iterator Iterator function. - * @param {Object=} context Object to become context (`this`) for the iterator function. - * @returns {Object|Array} Reference to `obj`. - */ + ``` + * + * @param {Object|Array} obj Object to iterate over. + * @param {Function} iterator Iterator function. + * @param {Object=} context Object to become context (`this`) for the iterator function. + * @returns {Object|Array} Reference to `obj`. + */ -function forEach(obj, iterator, context) { - var key, length; - if (obj) { - if (isFunction(obj)) { - for (key in obj) { - // Need to check if hasOwnProperty exists, - // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function - if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) { - iterator.call(context, obj[key], key, obj); - } - } - } else if (isArray(obj) || isArrayLike(obj)) { - var isPrimitive = typeof obj !== 'object'; - for (key = 0, length = obj.length; key < length; key++) { - if (isPrimitive || key in obj) { - iterator.call(context, obj[key], key, obj); - } - } - } else if (obj.forEach && obj.forEach !== forEach) { - obj.forEach(iterator, context, obj); - } else if (isBlankObject(obj)) { - // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty - for (key in obj) { - iterator.call(context, obj[key], key, obj); - } - } else if (typeof obj.hasOwnProperty === 'function') { - // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed - for (key in obj) { - if (obj.hasOwnProperty(key)) { - iterator.call(context, obj[key], key, obj); - } - } - } else { - // Slow path for objects which do not have a method `hasOwnProperty` - for (key in obj) { - if (hasOwnProperty.call(obj, key)) { - iterator.call(context, obj[key], key, obj); + function forEach(obj, iterator, context) { + var key, length; + if (obj) { + if (isFunction(obj)) { + for (key in obj) { + // Need to check if hasOwnProperty exists, + // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function + if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) { + iterator.call(context, obj[key], key, obj); + } + } + } else if (isArray(obj) || isArrayLike(obj)) { + var isPrimitive = typeof obj !== 'object'; + for (key = 0, length = obj.length; key < length; key++) { + if (isPrimitive || key in obj) { + iterator.call(context, obj[key], key, obj); + } + } + } else if (obj.forEach && obj.forEach !== forEach) { + obj.forEach(iterator, context, obj); + } else if (isBlankObject(obj)) { + // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty + for (key in obj) { + iterator.call(context, obj[key], key, obj); + } + } else if (typeof obj.hasOwnProperty === 'function') { + // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed + for (key in obj) { + if (obj.hasOwnProperty(key)) { + iterator.call(context, obj[key], key, obj); + } + } + } else { + // Slow path for objects which do not have a method `hasOwnProperty` + for (key in obj) { + if (hasOwnProperty.call(obj, key)) { + iterator.call(context, obj[key], key, obj); + } + } + } } - } + return obj; } - } - return obj; -} -function forEachSorted(obj, iterator, context) { - var keys = Object.keys(obj).sort(); - for (var i = 0; i < keys.length; i++) { - iterator.call(context, obj[keys[i]], keys[i]); - } - return keys; -} + function forEachSorted(obj, iterator, context) { + var keys = Object.keys(obj).sort(); + for (var i = 0; i < keys.length; i++) { + iterator.call(context, obj[keys[i]], keys[i]); + } + return keys; + } -/** - * when using forEach the params are value, key, but it is often useful to have key, value. - * @param {function(string, *)} iteratorFn - * @returns {function(*, string)} - */ -function reverseParams(iteratorFn) { - return function(value, key) {iteratorFn(key, value);}; -} + /** + * when using forEach the params are value, key, but it is often useful to have key, value. + * @param {function(string, *)} iteratorFn + * @returns {function(*, string)} + */ + function reverseParams(iteratorFn) { + return function (value, key) { + iteratorFn(key, value); + }; + } -/** - * A consistent way of creating unique IDs in angular. - * - * Using simple numbers allows us to generate 28.6 million unique ids per second for 10 years before - * we hit number precision issues in JavaScript. - * - * Math.pow(2,53) / 60 / 60 / 24 / 365 / 10 = 28.6M - * - * @returns {number} an unique alpha-numeric string - */ -function nextUid() { - return ++uid; -} + /** + * A consistent way of creating unique IDs in angular. + * + * Using simple numbers allows us to generate 28.6 million unique ids per second for 10 years before + * we hit number precision issues in JavaScript. + * + * Math.pow(2,53) / 60 / 60 / 24 / 365 / 10 = 28.6M + * + * @returns {number} an unique alpha-numeric string + */ + function nextUid() { + return ++uid; + } -/** - * Set or clear the hashkey for an object. - * @param obj object - * @param h the hashkey (!truthy to delete the hashkey) - */ -function setHashKey(obj, h) { - if (h) { - obj.$$hashKey = h; - } else { - delete obj.$$hashKey; - } -} - - -function baseExtend(dst, objs, deep) { - var h = dst.$$hashKey; - - for (var i = 0, ii = objs.length; i < ii; ++i) { - var obj = objs[i]; - if (!isObject(obj) && !isFunction(obj)) continue; - var keys = Object.keys(obj); - for (var j = 0, jj = keys.length; j < jj; j++) { - var key = keys[j]; - var src = obj[key]; - - if (deep && isObject(src)) { - if (isDate(src)) { - dst[key] = new Date(src.valueOf()); - } else if (isRegExp(src)) { - dst[key] = new RegExp(src); - } else if (src.nodeName) { - dst[key] = src.cloneNode(true); - } else if (isElement(src)) { - dst[key] = src.clone(); + /** + * Set or clear the hashkey for an object. + * @param obj object + * @param h the hashkey (!truthy to delete the hashkey) + */ + function setHashKey(obj, h) { + if (h) { + obj.$$hashKey = h; } else { - if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {}; - baseExtend(dst[key], [src], true); + delete obj.$$hashKey; } - } else { - dst[key] = src; - } } - } - setHashKey(dst, h); - return dst; -} -/** - * @ngdoc function - * @name angular.extend - * @module ng - * @kind function - * - * @description - * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s) - * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so - * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`. - * - * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use - * {@link angular.merge} for this. - * - * @param {Object} dst Destination object. - * @param {...Object} src Source object(s). - * @returns {Object} Reference to `dst`. - */ -function extend(dst) { - return baseExtend(dst, slice.call(arguments, 1), false); -} + function baseExtend(dst, objs, deep) { + var h = dst.$$hashKey; + for (var i = 0, ii = objs.length; i < ii; ++i) { + var obj = objs[i]; + if (!isObject(obj) && !isFunction(obj)) continue; + var keys = Object.keys(obj); + for (var j = 0, jj = keys.length; j < jj; j++) { + var key = keys[j]; + var src = obj[key]; -/** -* @ngdoc function -* @name angular.merge -* @module ng -* @kind function -* -* @description -* Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s) -* to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so -* by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`. -* -* Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source -* objects, performing a deep copy. -* -* @param {Object} dst Destination object. -* @param {...Object} src Source object(s). -* @returns {Object} Reference to `dst`. -*/ -function merge(dst) { - return baseExtend(dst, slice.call(arguments, 1), true); -} + if (deep && isObject(src)) { + if (isDate(src)) { + dst[key] = new Date(src.valueOf()); + } else if (isRegExp(src)) { + dst[key] = new RegExp(src); + } else if (src.nodeName) { + dst[key] = src.cloneNode(true); + } else if (isElement(src)) { + dst[key] = src.clone(); + } else { + if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {}; + baseExtend(dst[key], [src], true); + } + } else { + dst[key] = src; + } + } + } + + setHashKey(dst, h); + return dst; + } + /** + * @ngdoc function + * @name angular.extend + * @module ng + * @kind function + * + * @description + * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s) + * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so + * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`. + * + * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use + * {@link angular.merge} for this. + * + * @param {Object} dst Destination object. + * @param {...Object} src Source object(s). + * @returns {Object} Reference to `dst`. + */ + function extend(dst) { + return baseExtend(dst, slice.call(arguments, 1), false); + } + + + /** + * @ngdoc function + * @name angular.merge + * @module ng + * @kind function + * + * @description + * Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s) + * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so + * by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`. + * + * Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source + * objects, performing a deep copy. + * + * @param {Object} dst Destination object. + * @param {...Object} src Source object(s). + * @returns {Object} Reference to `dst`. + */ + function merge(dst) { + return baseExtend(dst, slice.call(arguments, 1), true); + } -function toInt(str) { - return parseInt(str, 10); -} + function toInt(str) { + return parseInt(str, 10); + } -function inherit(parent, extra) { - return extend(Object.create(parent), extra); -} + function inherit(parent, extra) { + return extend(Object.create(parent), extra); + } -/** - * @ngdoc function - * @name angular.noop - * @module ng - * @kind function - * - * @description - * A function that performs no operations. This function can be useful when writing code in the - * functional style. - ```js + /** + * @ngdoc function + * @name angular.noop + * @module ng + * @kind function + * + * @description + * A function that performs no operations. This function can be useful when writing code in the + * functional style. + ```js function foo(callback) { var result = calculateResult(); (callback || angular.noop)(result); } - ``` - */ -function noop() {} -noop.$inject = []; + ``` + */ + function noop() { + } + noop.$inject = []; -/** - * @ngdoc function - * @name angular.identity - * @module ng - * @kind function - * - * @description - * A function that returns its first argument. This function is useful when writing code in the - * functional style. - * - ```js + + /** + * @ngdoc function + * @name angular.identity + * @module ng + * @kind function + * + * @description + * A function that returns its first argument. This function is useful when writing code in the + * functional style. + * + ```js function transformer(transformationFn, value) { return (transformationFn || angular.identity)(value); }; - ``` - * @param {*} value to be returned. - * @returns {*} the value passed in. - */ -function identity($) {return $;} -identity.$inject = []; + ``` + * @param {*} value to be returned. + * @returns {*} the value passed in. + */ + function identity($) { + return $; + } + identity.$inject = []; -function valueFn(value) {return function valueRef() {return value;};} -function hasCustomToString(obj) { - return isFunction(obj.toString) && obj.toString !== toString; -} + function valueFn(value) { + return function valueRef() { + return value; + }; + } + function hasCustomToString(obj) { + return isFunction(obj.toString) && obj.toString !== toString; + } -/** - * @ngdoc function - * @name angular.isUndefined - * @module ng - * @kind function - * - * @description - * Determines if a reference is undefined. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is undefined. - */ -function isUndefined(value) {return typeof value === 'undefined';} + /** + * @ngdoc function + * @name angular.isUndefined + * @module ng + * @kind function + * + * @description + * Determines if a reference is undefined. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is undefined. + */ + function isUndefined(value) { + return typeof value === 'undefined'; + } -/** - * @ngdoc function - * @name angular.isDefined - * @module ng - * @kind function - * - * @description - * Determines if a reference is defined. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is defined. - */ -function isDefined(value) {return typeof value !== 'undefined';} + /** + * @ngdoc function + * @name angular.isDefined + * @module ng + * @kind function + * + * @description + * Determines if a reference is defined. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is defined. + */ + function isDefined(value) { + return typeof value !== 'undefined'; + } -/** - * @ngdoc function - * @name angular.isObject - * @module ng - * @kind function - * - * @description - * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not - * considered to be objects. Note that JavaScript arrays are objects. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is an `Object` but not `null`. - */ -function isObject(value) { - // http://jsperf.com/isobject4 - return value !== null && typeof value === 'object'; -} + /** + * @ngdoc function + * @name angular.isObject + * @module ng + * @kind function + * + * @description + * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not + * considered to be objects. Note that JavaScript arrays are objects. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is an `Object` but not `null`. + */ + function isObject(value) { + // http://jsperf.com/isobject4 + return value !== null && typeof value === 'object'; + } -/** - * Determine if a value is an object with a null prototype - * - * @returns {boolean} True if `value` is an `Object` with a null prototype - */ -function isBlankObject(value) { - return value !== null && typeof value === 'object' && !getPrototypeOf(value); -} + /** + * Determine if a value is an object with a null prototype + * + * @returns {boolean} True if `value` is an `Object` with a null prototype + */ + function isBlankObject(value) { + return value !== null && typeof value === 'object' && !getPrototypeOf(value); + } -/** - * @ngdoc function - * @name angular.isString - * @module ng - * @kind function - * - * @description - * Determines if a reference is a `String`. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `String`. - */ -function isString(value) {return typeof value === 'string';} + /** + * @ngdoc function + * @name angular.isString + * @module ng + * @kind function + * + * @description + * Determines if a reference is a `String`. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `String`. + */ + function isString(value) { + return typeof value === 'string'; + } -/** - * @ngdoc function - * @name angular.isNumber - * @module ng - * @kind function - * - * @description - * Determines if a reference is a `Number`. - * - * This includes the "special" numbers `NaN`, `+Infinity` and `-Infinity`. - * - * If you wish to exclude these then you can use the native - * [`isFinite'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/isFinite) - * method. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `Number`. - */ -function isNumber(value) {return typeof value === 'number';} + /** + * @ngdoc function + * @name angular.isNumber + * @module ng + * @kind function + * + * @description + * Determines if a reference is a `Number`. + * + * This includes the "special" numbers `NaN`, `+Infinity` and `-Infinity`. + * + * If you wish to exclude these then you can use the native + * [`isFinite'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/isFinite) + * method. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `Number`. + */ + function isNumber(value) { + return typeof value === 'number'; + } -/** - * @ngdoc function - * @name angular.isDate - * @module ng - * @kind function - * - * @description - * Determines if a value is a date. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `Date`. - */ -function isDate(value) { - return toString.call(value) === '[object Date]'; -} + /** + * @ngdoc function + * @name angular.isDate + * @module ng + * @kind function + * + * @description + * Determines if a value is a date. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `Date`. + */ + function isDate(value) { + return toString.call(value) === '[object Date]'; + } -/** - * @ngdoc function - * @name angular.isArray - * @module ng - * @kind function - * - * @description - * Determines if a reference is an `Array`. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is an `Array`. - */ -var isArray = Array.isArray; -/** - * @ngdoc function - * @name angular.isFunction - * @module ng - * @kind function - * - * @description - * Determines if a reference is a `Function`. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `Function`. - */ -function isFunction(value) {return typeof value === 'function';} + /** + * @ngdoc function + * @name angular.isArray + * @module ng + * @kind function + * + * @description + * Determines if a reference is an `Array`. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is an `Array`. + */ + var isArray = Array.isArray; + + /** + * @ngdoc function + * @name angular.isFunction + * @module ng + * @kind function + * + * @description + * Determines if a reference is a `Function`. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `Function`. + */ + function isFunction(value) { + return typeof value === 'function'; + } -/** - * Determines if a value is a regular expression object. - * - * @private - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `RegExp`. - */ -function isRegExp(value) { - return toString.call(value) === '[object RegExp]'; -} + /** + * Determines if a value is a regular expression object. + * + * @private + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `RegExp`. + */ + function isRegExp(value) { + return toString.call(value) === '[object RegExp]'; + } -/** - * Checks if `obj` is a window object. - * - * @private - * @param {*} obj Object to check - * @returns {boolean} True if `obj` is a window obj. - */ -function isWindow(obj) { - return obj && obj.window === obj; -} + /** + * Checks if `obj` is a window object. + * + * @private + * @param {*} obj Object to check + * @returns {boolean} True if `obj` is a window obj. + */ + function isWindow(obj) { + return obj && obj.window === obj; + } + + function isScope(obj) { + return obj && obj.$evalAsync && obj.$watch; + } -function isScope(obj) { - return obj && obj.$evalAsync && obj.$watch; -} + function isFile(obj) { + return toString.call(obj) === '[object File]'; + } -function isFile(obj) { - return toString.call(obj) === '[object File]'; -} + function isFormData(obj) { + return toString.call(obj) === '[object FormData]'; + } -function isFormData(obj) { - return toString.call(obj) === '[object FormData]'; -} + function isBlob(obj) { + return toString.call(obj) === '[object Blob]'; + } -function isBlob(obj) { - return toString.call(obj) === '[object Blob]'; -} + function isBoolean(value) { + return typeof value === 'boolean'; + } -function isBoolean(value) { - return typeof value === 'boolean'; -} + function isPromiseLike(obj) { + return obj && isFunction(obj.then); + } -function isPromiseLike(obj) { - return obj && isFunction(obj.then); -} + var TYPED_ARRAY_REGEXP = /^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array\]$/; -var TYPED_ARRAY_REGEXP = /^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array\]$/; -function isTypedArray(value) { - return value && isNumber(value.length) && TYPED_ARRAY_REGEXP.test(toString.call(value)); -} + function isTypedArray(value) { + return value && isNumber(value.length) && TYPED_ARRAY_REGEXP.test(toString.call(value)); + } -function isArrayBuffer(obj) { - return toString.call(obj) === '[object ArrayBuffer]'; -} + function isArrayBuffer(obj) { + return toString.call(obj) === '[object ArrayBuffer]'; + } -var trim = function(value) { - return isString(value) ? value.trim() : value; -}; + var trim = function (value) { + return isString(value) ? value.trim() : value; + }; // Copied from: // http://docs.closure-library.googlecode.com/git/local_closure_goog_string_string.js.source.html#line1021 // Prereq: s is a string. -var escapeForRegexp = function(s) { - return s.replace(/([-()\[\]{}+?*.$\^|,:#= 0) { - array.splice(index, 1); - } - return index; -} + /** + * @param str 'key1,key2,...' + * @returns {object} in the form of {key1:true, key2:true, ...} + */ + function makeMap(str) { + var obj = {}, items = str.split(','), i; + for (i = 0; i < items.length; i++) { + obj[items[i]] = true; + } + return obj; + } -/** - * @ngdoc function - * @name angular.copy - * @module ng - * @kind function - * - * @description - * Creates a deep copy of `source`, which should be an object or an array. - * - * * If no destination is supplied, a copy of the object or array is created. - * * If a destination is provided, all of its elements (for arrays) or properties (for objects) - * are deleted and then all elements/properties from the source are copied to it. - * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned. - * * If `source` is identical to 'destination' an exception will be thrown. - * - * @param {*} source The source that will be used to make a copy. - * Can be any type, including primitives, `null`, and `undefined`. - * @param {(Object|Array)=} destination Destination into which the source is copied. If - * provided, must be of the same type as `source`. - * @returns {*} The copy or updated `destination`, if `destination` was specified. - * - * @example - - -
- - Name:
- E-mail:
- Gender: male - female
- - - - 
form = {{user | json}}
- 
master = {{master | json}}
-
- - - - - */ -function copy(source, destination) { - var stackSource = []; - var stackDest = []; + + + + */ + function copy(source, destination) { + var stackSource = []; + var stackDest = []; - if (destination) { - if (isTypedArray(destination) || isArrayBuffer(destination)) { - throw ngMinErr('cpta', "Can't copy! TypedArray destination cannot be mutated."); - } - if (source === destination) { - throw ngMinErr('cpi', "Can't copy! Source and destination are identical."); - } + if (destination) { + if (isTypedArray(destination) || isArrayBuffer(destination)) { + throw ngMinErr('cpta', "Can't copy! TypedArray destination cannot be mutated."); + } + if (source === destination) { + throw ngMinErr('cpi', "Can't copy! Source and destination are identical."); + } - // Empty the destination object - if (isArray(destination)) { - destination.length = 0; - } else { - forEach(destination, function(value, key) { - if (key !== '$$hashKey') { - delete destination[key]; - } - }); - } + // Empty the destination object + if (isArray(destination)) { + destination.length = 0; + } else { + forEach(destination, function (value, key) { + if (key !== '$$hashKey') { + delete destination[key]; + } + }); + } - stackSource.push(source); - stackDest.push(destination); - return copyRecurse(source, destination); - } + stackSource.push(source); + stackDest.push(destination); + return copyRecurse(source, destination); + } - return copyElement(source); + return copyElement(source); - function copyRecurse(source, destination) { - var h = destination.$$hashKey; - var key; - if (isArray(source)) { - for (var i = 0, ii = source.length; i < ii; i++) { - destination.push(copyElement(source[i])); - } - } else if (isBlankObject(source)) { - // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty - for (key in source) { - destination[key] = copyElement(source[key]); - } - } else if (source && typeof source.hasOwnProperty === 'function') { - // Slow path, which must rely on hasOwnProperty - for (key in source) { - if (source.hasOwnProperty(key)) { - destination[key] = copyElement(source[key]); - } - } - } else { - // Slowest path --- hasOwnProperty can't be called as a method - for (key in source) { - if (hasOwnProperty.call(source, key)) { - destination[key] = copyElement(source[key]); + function copyRecurse(source, destination) { + var h = destination.$$hashKey; + var key; + if (isArray(source)) { + for (var i = 0, ii = source.length; i < ii; i++) { + destination.push(copyElement(source[i])); + } + } else if (isBlankObject(source)) { + // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty + for (key in source) { + destination[key] = copyElement(source[key]); + } + } else if (source && typeof source.hasOwnProperty === 'function') { + // Slow path, which must rely on hasOwnProperty + for (key in source) { + if (source.hasOwnProperty(key)) { + destination[key] = copyElement(source[key]); + } + } + } else { + // Slowest path --- hasOwnProperty can't be called as a method + for (key in source) { + if (hasOwnProperty.call(source, key)) { + destination[key] = copyElement(source[key]); + } + } + } + setHashKey(destination, h); + return destination; } - } - } - setHashKey(destination, h); - return destination; - } - - function copyElement(source) { - // Simple values - if (!isObject(source)) { - return source; - } - // Already copied values - var index = stackSource.indexOf(source); - if (index !== -1) { - return stackDest[index]; - } + function copyElement(source) { + // Simple values + if (!isObject(source)) { + return source; + } - if (isWindow(source) || isScope(source)) { - throw ngMinErr('cpws', - "Can't copy! Making copies of Window or Scope instances is not supported."); - } + // Already copied values + var index = stackSource.indexOf(source); + if (index !== -1) { + return stackDest[index]; + } - var needsRecurse = false; - var destination = copyType(source); + if (isWindow(source) || isScope(source)) { + throw ngMinErr('cpws', + "Can't copy! Making copies of Window or Scope instances is not supported."); + } - if (destination === undefined) { - destination = isArray(source) ? [] : Object.create(getPrototypeOf(source)); - needsRecurse = true; - } + var needsRecurse = false; + var destination = copyType(source); - stackSource.push(source); - stackDest.push(destination); - - return needsRecurse - ? copyRecurse(source, destination) - : destination; - } - - function copyType(source) { - switch (toString.call(source)) { - case '[object Int8Array]': - case '[object Int16Array]': - case '[object Int32Array]': - case '[object Float32Array]': - case '[object Float64Array]': - case '[object Uint8Array]': - case '[object Uint8ClampedArray]': - case '[object Uint16Array]': - case '[object Uint32Array]': - return new source.constructor(copyElement(source.buffer)); - - case '[object ArrayBuffer]': - //Support: IE10 - if (!source.slice) { - var copied = new ArrayBuffer(source.byteLength); - new Uint8Array(copied).set(new Uint8Array(source)); - return copied; - } - return source.slice(0); + if (destination === undefined) { + destination = isArray(source) ? [] : Object.create(getPrototypeOf(source)); + needsRecurse = true; + } - case '[object Boolean]': - case '[object Number]': - case '[object String]': - case '[object Date]': - return new source.constructor(source.valueOf()); + stackSource.push(source); + stackDest.push(destination); + + return needsRecurse + ? copyRecurse(source, destination) + : destination; + } + + function copyType(source) { + switch (toString.call(source)) { + case '[object Int8Array]': + case '[object Int16Array]': + case '[object Int32Array]': + case '[object Float32Array]': + case '[object Float64Array]': + case '[object Uint8Array]': + case '[object Uint8ClampedArray]': + case '[object Uint16Array]': + case '[object Uint32Array]': + return new source.constructor(copyElement(source.buffer)); + + case '[object ArrayBuffer]': + //Support: IE10 + if (!source.slice) { + var copied = new ArrayBuffer(source.byteLength); + new Uint8Array(copied).set(new Uint8Array(source)); + return copied; + } + return source.slice(0); - case '[object RegExp]': - var re = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]); - re.lastIndex = source.lastIndex; - return re; + case '[object Boolean]': + case '[object Number]': + case '[object String]': + case '[object Date]': + return new source.constructor(source.valueOf()); - case '[object Blob]': - return new source.constructor([source], {type: source.type}); - } + case '[object RegExp]': + var re = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]); + re.lastIndex = source.lastIndex; + return re; + + case '[object Blob]': + return new source.constructor([source], {type: source.type}); + } - if (isFunction(source.cloneNode)) { - return source.cloneNode(true); + if (isFunction(source.cloneNode)) { + return source.cloneNode(true); + } + } } - } -} -/** - * Creates a shallow copy of an object, an array or a primitive. - * - * Assumes that there are no proto properties for objects. - */ -function shallowCopy(src, dst) { - if (isArray(src)) { - dst = dst || []; + /** + * Creates a shallow copy of an object, an array or a primitive. + * + * Assumes that there are no proto properties for objects. + */ + function shallowCopy(src, dst) { + if (isArray(src)) { + dst = dst || []; - for (var i = 0, ii = src.length; i < ii; i++) { - dst[i] = src[i]; - } - } else if (isObject(src)) { - dst = dst || {}; + for (var i = 0, ii = src.length; i < ii; i++) { + dst[i] = src[i]; + } + } else if (isObject(src)) { + dst = dst || {}; - for (var key in src) { - if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) { - dst[key] = src[key]; - } - } - } + for (var key in src) { + if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) { + dst[key] = src[key]; + } + } + } - return dst || src; -} + return dst || src; + } -/** - * @ngdoc function - * @name angular.equals - * @module ng - * @kind function - * - * @description - * Determines if two objects or two values are equivalent. Supports value types, regular - * expressions, arrays and objects. - * - * Two objects or values are considered equivalent if at least one of the following is true: - * - * * Both objects or values pass `===` comparison. - * * Both objects or values are of the same type and all of their properties are equal by - * comparing them with `angular.equals`. - * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal) - * * Both values represent the same regular expression (In JavaScript, - * /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual - * representation matches). - * - * During a property comparison, properties of `function` type and properties with names - * that begin with `$` are ignored. - * - * Scope and DOMWindow objects are being compared only by identify (`===`). - * - * @param {*} o1 Object or value to compare. - * @param {*} o2 Object or value to compare. - * @returns {boolean} True if arguments are equal. - * - * @example - + /** + * @ngdoc function + * @name angular.equals + * @module ng + * @kind function + * + * @description + * Determines if two objects or two values are equivalent. Supports value types, regular + * expressions, arrays and objects. + * + * Two objects or values are considered equivalent if at least one of the following is true: + * + * * Both objects or values pass `===` comparison. + * * Both objects or values are of the same type and all of their properties are equal by + * comparing them with `angular.equals`. + * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal) + * * Both values represent the same regular expression (In JavaScript, + * /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual + * representation matches). + * + * During a property comparison, properties of `function` type and properties with names + * that begin with `$` are ignored. + * + * Scope and DOMWindow objects are being compared only by identify (`===`). + * + * @param {*} o1 Object or value to compare. + * @param {*} o2 Object or value to compare. + * @returns {boolean} True if arguments are equal. + * + * @example + -
-
-

User 1

- Name: - Age: - -

User 2

- Name: - Age: - -
-
- -
- User 1: 
{{user1 | json}}
- User 2: 
{{user2 | json}}
- Equal: 
{{result}}
-
-
- - - angular.module('equalsExample', []).controller('ExampleController', ['$scope', function($scope) { +
+
+

User 1

+ Name: + Age: + +

User 2

+ Name: + Age: + +
+
+ +
+ User 1: 
{{user1 | json}}
+ User 2: 
{{user2 | json}}
+ Equal: 
{{result}}
+
+
+ + + angular.module('equalsExample', []).controller('ExampleController', ['$scope', function($scope) { $scope.user1 = {}; $scope.user2 = {}; $scope.result; @@ -1081,509 +1110,503 @@ function shallowCopy(src, dst) { $scope.result = angular.equals($scope.user1, $scope.user2); }; }]); - - - */ -function equals(o1, o2) { - if (o1 === o2) return true; - if (o1 === null || o2 === null) return false; - if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN - var t1 = typeof o1, t2 = typeof o2, length, key, keySet; - if (t1 == t2 && t1 == 'object') { - if (isArray(o1)) { - if (!isArray(o2)) return false; - if ((length = o1.length) == o2.length) { - for (key = 0; key < length; key++) { - if (!equals(o1[key], o2[key])) return false; + + + */ + function equals(o1, o2) { + if (o1 === o2) return true; + if (o1 === null || o2 === null) return false; + if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN + var t1 = typeof o1, t2 = typeof o2, length, key, keySet; + if (t1 == t2 && t1 == 'object') { + if (isArray(o1)) { + if (!isArray(o2)) return false; + if ((length = o1.length) == o2.length) { + for (key = 0; key < length; key++) { + if (!equals(o1[key], o2[key])) return false; + } + return true; + } + } else if (isDate(o1)) { + if (!isDate(o2)) return false; + return equals(o1.getTime(), o2.getTime()); + } else if (isRegExp(o1)) { + if (!isRegExp(o2)) return false; + return o1.toString() == o2.toString(); + } else { + if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) || + isArray(o2) || isDate(o2) || isRegExp(o2)) return false; + keySet = createMap(); + for (key in o1) { + if (key.charAt(0) === '$' || isFunction(o1[key])) continue; + if (!equals(o1[key], o2[key])) return false; + keySet[key] = true; + } + for (key in o2) { + if (!(key in keySet) && + key.charAt(0) !== '$' && + isDefined(o2[key]) && + !isFunction(o2[key])) return false; + } + return true; + } } - return true; - } - } else if (isDate(o1)) { - if (!isDate(o2)) return false; - return equals(o1.getTime(), o2.getTime()); - } else if (isRegExp(o1)) { - if (!isRegExp(o2)) return false; - return o1.toString() == o2.toString(); - } else { - if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) || - isArray(o2) || isDate(o2) || isRegExp(o2)) return false; - keySet = createMap(); - for (key in o1) { - if (key.charAt(0) === '$' || isFunction(o1[key])) continue; - if (!equals(o1[key], o2[key])) return false; - keySet[key] = true; - } - for (key in o2) { - if (!(key in keySet) && - key.charAt(0) !== '$' && - isDefined(o2[key]) && - !isFunction(o2[key])) return false; - } - return true; + return false; } - } - return false; -} -var csp = function() { - if (!isDefined(csp.rules)) { + var csp = function () { + if (!isDefined(csp.rules)) { - var ngCspElement = (window.document.querySelector('[ng-csp]') || - window.document.querySelector('[data-ng-csp]')); + var ngCspElement = (window.document.querySelector('[ng-csp]') || + window.document.querySelector('[data-ng-csp]')); - if (ngCspElement) { - var ngCspAttribute = ngCspElement.getAttribute('ng-csp') || + if (ngCspElement) { + var ngCspAttribute = ngCspElement.getAttribute('ng-csp') || ngCspElement.getAttribute('data-ng-csp'); - csp.rules = { - noUnsafeEval: !ngCspAttribute || (ngCspAttribute.indexOf('no-unsafe-eval') !== -1), - noInlineStyle: !ngCspAttribute || (ngCspAttribute.indexOf('no-inline-style') !== -1) - }; - } else { - csp.rules = { - noUnsafeEval: noUnsafeEval(), - noInlineStyle: false - }; - } - } - - return csp.rules; - - function noUnsafeEval() { - try { - /* jshint -W031, -W054 */ - new Function(''); - /* jshint +W031, +W054 */ - return false; - } catch (e) { - return true; - } - } -}; + csp.rules = { + noUnsafeEval: !ngCspAttribute || (ngCspAttribute.indexOf('no-unsafe-eval') !== -1), + noInlineStyle: !ngCspAttribute || (ngCspAttribute.indexOf('no-inline-style') !== -1) + }; + } else { + csp.rules = { + noUnsafeEval: noUnsafeEval(), + noInlineStyle: false + }; + } + } -/** - * @ngdoc directive - * @module ng - * @name ngJq - * - * @element ANY - * @param {string=} ngJq the name of the library available under `window` - * to be used for angular.element - * @description - * Use this directive to force the angular.element library. This should be - * used to force either jqLite by leaving ng-jq blank or setting the name of - * the jquery variable under window (eg. jQuery). - * - * Since angular looks for this directive when it is loaded (doesn't wait for the - * DOMContentLoaded event), it must be placed on an element that comes before the script - * which loads angular. Also, only the first instance of `ng-jq` will be used and all - * others ignored. - * - * @example - * This example shows how to force jqLite using the `ngJq` directive to the `html` tag. - ```html - - - ... - ... - - ``` - * @example - * This example shows how to use a jQuery based library of a different name. - * The library name must be available at the top most 'window'. - ```html - - - ... - ... - - ``` - */ -var jq = function() { - if (isDefined(jq.name_)) return jq.name_; - var el; - var i, ii = ngAttrPrefixes.length, prefix, name; - for (i = 0; i < ii; ++i) { - prefix = ngAttrPrefixes[i]; - if (el = window.document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]')) { - name = el.getAttribute(prefix + 'jq'); - break; - } - } + return csp.rules; - return (jq.name_ = name); -}; + function noUnsafeEval() { + try { + /* jshint -W031, -W054 */ + new Function(''); + /* jshint +W031, +W054 */ + return false; + } catch (e) { + return true; + } + } + }; -function concat(array1, array2, index) { - return array1.concat(slice.call(array2, index)); -} + /** + * @ngdoc directive + * @module ng + * @name ngJq + * + * @element ANY + * @param {string=} ngJq the name of the library available under `window` + * to be used for angular.element + * @description + * Use this directive to force the angular.element library. This should be + * used to force either jqLite by leaving ng-jq blank or setting the name of + * the jquery variable under window (eg. jQuery). + * + * Since angular looks for this directive when it is loaded (doesn't wait for the + * DOMContentLoaded event), it must be placed on an element that comes before the script + * which loads angular. Also, only the first instance of `ng-jq` will be used and all + * others ignored. + * + * @example + * This example shows how to force jqLite using the `ngJq` directive to the `html` tag. + ```html + + + ... + ... + + ``` + * @example + * This example shows how to use a jQuery based library of a different name. + * The library name must be available at the top most 'window'. + ```html + + + ... + ... + + ``` + */ + var jq = function () { + if (isDefined(jq.name_)) return jq.name_; + var el; + var i, ii = ngAttrPrefixes.length, prefix, name; + for (i = 0; i < ii; ++i) { + prefix = ngAttrPrefixes[i]; + if (el = window.document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]')) { + name = el.getAttribute(prefix + 'jq'); + break; + } + } -function sliceArgs(args, startIndex) { - return slice.call(args, startIndex || 0); -} + return (jq.name_ = name); + }; + function concat(array1, array2, index) { + return array1.concat(slice.call(array2, index)); + } -/* jshint -W101 */ -/** - * @ngdoc function - * @name angular.bind - * @module ng - * @kind function - * - * @description - * Returns a function which calls function `fn` bound to `self` (`self` becomes the `this` for - * `fn`). You can supply optional `args` that are prebound to the function. This feature is also - * known as [partial application](http://en.wikipedia.org/wiki/Partial_application), as - * distinguished from [function currying](http://en.wikipedia.org/wiki/Currying#Contrast_with_partial_function_application). - * - * @param {Object} self Context which `fn` should be evaluated in. - * @param {function()} fn Function to be bound. - * @param {...*} args Optional arguments to be prebound to the `fn` function call. - * @returns {function()} Function that wraps the `fn` with all the specified bindings. - */ -/* jshint +W101 */ -function bind(self, fn) { - var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : []; - if (isFunction(fn) && !(fn instanceof RegExp)) { - return curryArgs.length - ? function() { - return arguments.length - ? fn.apply(self, concat(curryArgs, arguments, 0)) - : fn.apply(self, curryArgs); + function sliceArgs(args, startIndex) { + return slice.call(args, startIndex || 0); + } + + + /* jshint -W101 */ + /** + * @ngdoc function + * @name angular.bind + * @module ng + * @kind function + * + * @description + * Returns a function which calls function `fn` bound to `self` (`self` becomes the `this` for + * `fn`). You can supply optional `args` that are prebound to the function. This feature is also + * known as [partial application](http://en.wikipedia.org/wiki/Partial_application), as + * distinguished from [function currying](http://en.wikipedia.org/wiki/Currying#Contrast_with_partial_function_application). + * + * @param {Object} self Context which `fn` should be evaluated in. + * @param {function()} fn Function to be bound. + * @param {...*} args Optional arguments to be prebound to the `fn` function call. + * @returns {function()} Function that wraps the `fn` with all the specified bindings. + */ + + /* jshint +W101 */ + function bind(self, fn) { + var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : []; + if (isFunction(fn) && !(fn instanceof RegExp)) { + return curryArgs.length + ? function () { + return arguments.length + ? fn.apply(self, concat(curryArgs, arguments, 0)) + : fn.apply(self, curryArgs); + } + : function () { + return arguments.length + ? fn.apply(self, arguments) + : fn.call(self); + }; + } else { + // in IE, native methods are not functions so they cannot be bound (note: they don't need to be) + return fn; } - : function() { - return arguments.length - ? fn.apply(self, arguments) - : fn.call(self); - }; - } else { - // in IE, native methods are not functions so they cannot be bound (note: they don't need to be) - return fn; - } -} + } -function toJsonReplacer(key, value) { - var val = value; + function toJsonReplacer(key, value) { + var val = value; - if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') { - val = undefined; - } else if (isWindow(value)) { - val = '$WINDOW'; - } else if (value && window.document === value) { - val = '$DOCUMENT'; - } else if (isScope(value)) { - val = '$SCOPE'; - } + if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') { + val = undefined; + } else if (isWindow(value)) { + val = '$WINDOW'; + } else if (value && window.document === value) { + val = '$DOCUMENT'; + } else if (isScope(value)) { + val = '$SCOPE'; + } - return val; -} + return val; + } -/** - * @ngdoc function - * @name angular.toJson - * @module ng - * @kind function - * - * @description - * Serializes input into a JSON-formatted string. Properties with leading $$ characters will be - * stripped since angular uses this notation internally. - * - * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON. - * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace. - * If set to an integer, the JSON output will contain that many spaces per indentation. - * @returns {string|undefined} JSON-ified string representing `obj`. - */ -function toJson(obj, pretty) { - if (isUndefined(obj)) return undefined; - if (!isNumber(pretty)) { - pretty = pretty ? 2 : null; - } - return JSON.stringify(obj, toJsonReplacer, pretty); -} + /** + * @ngdoc function + * @name angular.toJson + * @module ng + * @kind function + * + * @description + * Serializes input into a JSON-formatted string. Properties with leading $$ characters will be + * stripped since angular uses this notation internally. + * + * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON. + * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace. + * If set to an integer, the JSON output will contain that many spaces per indentation. + * @returns {string|undefined} JSON-ified string representing `obj`. + */ + function toJson(obj, pretty) { + if (isUndefined(obj)) return undefined; + if (!isNumber(pretty)) { + pretty = pretty ? 2 : null; + } + return JSON.stringify(obj, toJsonReplacer, pretty); + } -/** - * @ngdoc function - * @name angular.fromJson - * @module ng - * @kind function - * - * @description - * Deserializes a JSON string. - * - * @param {string} json JSON string to deserialize. - * @returns {Object|Array|string|number} Deserialized JSON string. - */ -function fromJson(json) { - return isString(json) - ? JSON.parse(json) - : json; -} + /** + * @ngdoc function + * @name angular.fromJson + * @module ng + * @kind function + * + * @description + * Deserializes a JSON string. + * + * @param {string} json JSON string to deserialize. + * @returns {Object|Array|string|number} Deserialized JSON string. + */ + function fromJson(json) { + return isString(json) + ? JSON.parse(json) + : json; + } -var ALL_COLONS = /:/g; -function timezoneToOffset(timezone, fallback) { - // IE/Edge do not "understand" colon (`:`) in timezone - timezone = timezone.replace(ALL_COLONS, ''); - var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000; - return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset; -} + var ALL_COLONS = /:/g; + function timezoneToOffset(timezone, fallback) { + // IE/Edge do not "understand" colon (`:`) in timezone + timezone = timezone.replace(ALL_COLONS, ''); + var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000; + return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset; + } -function addDateMinutes(date, minutes) { - date = new Date(date.getTime()); - date.setMinutes(date.getMinutes() + minutes); - return date; -} + function addDateMinutes(date, minutes) { + date = new Date(date.getTime()); + date.setMinutes(date.getMinutes() + minutes); + return date; + } -function convertTimezoneToLocal(date, timezone, reverse) { - reverse = reverse ? -1 : 1; - var dateTimezoneOffset = date.getTimezoneOffset(); - var timezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset); - return addDateMinutes(date, reverse * (timezoneOffset - dateTimezoneOffset)); -} + function convertTimezoneToLocal(date, timezone, reverse) { + reverse = reverse ? -1 : 1; + var dateTimezoneOffset = date.getTimezoneOffset(); + var timezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset); + return addDateMinutes(date, reverse * (timezoneOffset - dateTimezoneOffset)); + } -/** - * @returns {string} Returns the string representation of the element. - */ -function startingTag(element) { - element = jqLite(element).clone(); - try { - // turns out IE does not let you set .html() on elements which - // are not allowed to have children. So we just ignore it. - element.empty(); - } catch (e) {} - var elemHtml = jqLite('
').append(element).html(); - try { - return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) : - elemHtml. - match(/^(<[^>]+>)/)[1]. - replace(/^<([\w\-]+)/, function(match, nodeName) {return '<' + lowercase(nodeName);}); - } catch (e) { - return lowercase(elemHtml); - } - -} + /** + * @returns {string} Returns the string representation of the element. + */ + function startingTag(element) { + element = jqLite(element).clone(); + try { + // turns out IE does not let you set .html() on elements which + // are not allowed to have children. So we just ignore it. + element.empty(); + } catch (e) { + } + var elemHtml = jqLite('
').append(element).html(); + try { + return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) : + elemHtml.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/, function (match, nodeName) { + return '<' + lowercase(nodeName); + }); + } catch (e) { + return lowercase(elemHtml); + } -///////////////////////////////////////////////// + } -/** - * Tries to decode the URI component without throwing an exception. - * - * @private - * @param str value potential URI component to check. - * @returns {boolean} True if `value` can be decoded - * with the decodeURIComponent function. - */ -function tryDecodeURIComponent(value) { - try { - return decodeURIComponent(value); - } catch (e) { - // Ignore any invalid uri component - } -} +///////////////////////////////////////////////// -/** - * Parses an escaped url query string into key-value pairs. - * @returns {Object.} - */ -function parseKeyValue(/**string*/keyValue) { - var obj = {}; - forEach((keyValue || "").split('&'), function(keyValue) { - var splitPoint, key, val; - if (keyValue) { - key = keyValue = keyValue.replace(/\+/g,'%20'); - splitPoint = keyValue.indexOf('='); - if (splitPoint !== -1) { - key = keyValue.substring(0, splitPoint); - val = keyValue.substring(splitPoint + 1); - } - key = tryDecodeURIComponent(key); - if (isDefined(key)) { - val = isDefined(val) ? tryDecodeURIComponent(val) : true; - if (!hasOwnProperty.call(obj, key)) { - obj[key] = val; - } else if (isArray(obj[key])) { - obj[key].push(val); - } else { - obj[key] = [obj[key],val]; + /** + * Tries to decode the URI component without throwing an exception. + * + * @private + * @param str value potential URI component to check. + * @returns {boolean} True if `value` can be decoded + * with the decodeURIComponent function. + */ + function tryDecodeURIComponent(value) { + try { + return decodeURIComponent(value); + } catch (e) { + // Ignore any invalid uri component } - } } - }); - return obj; -} - -function toKeyValue(obj) { - var parts = []; - forEach(obj, function(value, key) { - if (isArray(value)) { - forEach(value, function(arrayValue) { - parts.push(encodeUriQuery(key, true) + - (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true))); - }); - } else { - parts.push(encodeUriQuery(key, true) + - (value === true ? '' : '=' + encodeUriQuery(value, true))); + + + /** + * Parses an escaped url query string into key-value pairs. + * @returns {Object.} + */ + function parseKeyValue(/**string*/keyValue) { + var obj = {}; + forEach((keyValue || "").split('&'), function (keyValue) { + var splitPoint, key, val; + if (keyValue) { + key = keyValue = keyValue.replace(/\+/g, '%20'); + splitPoint = keyValue.indexOf('='); + if (splitPoint !== -1) { + key = keyValue.substring(0, splitPoint); + val = keyValue.substring(splitPoint + 1); + } + key = tryDecodeURIComponent(key); + if (isDefined(key)) { + val = isDefined(val) ? tryDecodeURIComponent(val) : true; + if (!hasOwnProperty.call(obj, key)) { + obj[key] = val; + } else if (isArray(obj[key])) { + obj[key].push(val); + } else { + obj[key] = [obj[key], val]; + } + } + } + }); + return obj; + } + + function toKeyValue(obj) { + var parts = []; + forEach(obj, function (value, key) { + if (isArray(value)) { + forEach(value, function (arrayValue) { + parts.push(encodeUriQuery(key, true) + + (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true))); + }); + } else { + parts.push(encodeUriQuery(key, true) + + (value === true ? '' : '=' + encodeUriQuery(value, true))); + } + }); + return parts.length ? parts.join('&') : ''; } - }); - return parts.length ? parts.join('&') : ''; -} -/** - * We need our custom method because encodeURIComponent is too aggressive and doesn't follow - * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path - * segments: - * segment = *pchar - * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" - * pct-encoded = "%" HEXDIG HEXDIG - * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" - * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" - * / "*" / "+" / "," / ";" / "=" - */ -function encodeUriSegment(val) { - return encodeUriQuery(val, true). - replace(/%26/gi, '&'). - replace(/%3D/gi, '='). - replace(/%2B/gi, '+'); -} + /** + * We need our custom method because encodeURIComponent is too aggressive and doesn't follow + * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path + * segments: + * segment = *pchar + * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" + * pct-encoded = "%" HEXDIG HEXDIG + * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" + * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" + * / "*" / "+" / "," / ";" / "=" + */ + function encodeUriSegment(val) { + return encodeUriQuery(val, true).replace(/%26/gi, '&').replace(/%3D/gi, '=').replace(/%2B/gi, '+'); + } -/** - * This method is intended for encoding *key* or *value* parts of query component. We need a custom - * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be - * encoded per http://tools.ietf.org/html/rfc3986: - * query = *( pchar / "/" / "?" ) - * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" - * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" - * pct-encoded = "%" HEXDIG HEXDIG - * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" - * / "*" / "+" / "," / ";" / "=" - */ -function encodeUriQuery(val, pctEncodeSpaces) { - return encodeURIComponent(val). - replace(/%40/gi, '@'). - replace(/%3A/gi, ':'). - replace(/%24/g, '$'). - replace(/%2C/gi, ','). - replace(/%3B/gi, ';'). - replace(/%20/g, (pctEncodeSpaces ? '%20' : '+')); -} - -var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-']; - -function getNgAttribute(element, ngAttr) { - var attr, i, ii = ngAttrPrefixes.length; - for (i = 0; i < ii; ++i) { - attr = ngAttrPrefixes[i] + ngAttr; - if (isString(attr = element.getAttribute(attr))) { - return attr; + /** + * This method is intended for encoding *key* or *value* parts of query component. We need a custom + * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be + * encoded per http://tools.ietf.org/html/rfc3986: + * query = *( pchar / "/" / "?" ) + * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" + * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" + * pct-encoded = "%" HEXDIG HEXDIG + * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" + * / "*" / "+" / "," / ";" / "=" + */ + function encodeUriQuery(val, pctEncodeSpaces) { + return encodeURIComponent(val).replace(/%40/gi, '@').replace(/%3A/gi, ':').replace(/%24/g, '$').replace(/%2C/gi, ',').replace(/%3B/gi, ';').replace(/%20/g, (pctEncodeSpaces ? '%20' : '+')); } - } - return null; -} -/** - * @ngdoc directive - * @name ngApp - * @module ng - * - * @element ANY - * @param {angular.Module} ngApp an optional application - * {@link angular.module module} name to load. - * @param {boolean=} ngStrictDi if this attribute is present on the app element, the injector will be - * created in "strict-di" mode. This means that the application will fail to invoke functions which - * do not use explicit function annotation (and are thus unsuitable for minification), as described - * in {@link guide/di the Dependency Injection guide}, and useful debugging info will assist in - * tracking down the root of these bugs. - * - * @description - * - * Use this directive to **auto-bootstrap** an AngularJS application. The `ngApp` directive - * designates the **root element** of the application and is typically placed near the root element - * of the page - e.g. on the `` or `` tags. - * - * There are a few things to keep in mind when using `ngApp`: - * - only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp` - * found in the document will be used to define the root element to auto-bootstrap as an - * application. To run multiple applications in an HTML document you must manually bootstrap them using - * {@link angular.bootstrap} instead. - * - AngularJS applications cannot be nested within each other. - * - Do not use a directive that uses {@link ng.$compile#transclusion transclusion} on the same element as `ngApp`. - * This includes directives such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and - * {@link ngRoute.ngView `ngView`}. - * Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector}, - * causing animations to stop working and making the injector inaccessible from outside the app. - * - * You can specify an **AngularJS module** to be used as the root module for the application. This - * module will be loaded into the {@link auto.$injector} when the application is bootstrapped. It - * should contain the application code needed or have dependencies on other modules that will - * contain the code. See {@link angular.module} for more information. - * - * In the example below if the `ngApp` directive were not placed on the `html` element then the - * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}` - * would not be resolved to `3`. - * - * `ngApp` is the easiest, and most common way to bootstrap an application. - * - - -
+ var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-']; + + function getNgAttribute(element, ngAttr) { + var attr, i, ii = ngAttrPrefixes.length; + for (i = 0; i < ii; ++i) { + attr = ngAttrPrefixes[i] + ngAttr; + if (isString(attr = element.getAttribute(attr))) { + return attr; + } + } + return null; + } + + /** + * @ngdoc directive + * @name ngApp + * @module ng + * + * @element ANY + * @param {angular.Module} ngApp an optional application + * {@link angular.module module} name to load. + * @param {boolean=} ngStrictDi if this attribute is present on the app element, the injector will be + * created in "strict-di" mode. This means that the application will fail to invoke functions which + * do not use explicit function annotation (and are thus unsuitable for minification), as described + * in {@link guide/di the Dependency Injection guide}, and useful debugging info will assist in + * tracking down the root of these bugs. + * + * @description + * + * Use this directive to **auto-bootstrap** an AngularJS application. The `ngApp` directive + * designates the **root element** of the application and is typically placed near the root element + * of the page - e.g. on the `` or `` tags. + * + * There are a few things to keep in mind when using `ngApp`: + * - only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp` + * found in the document will be used to define the root element to auto-bootstrap as an + * application. To run multiple applications in an HTML document you must manually bootstrap them using + * {@link angular.bootstrap} instead. + * - AngularJS applications cannot be nested within each other. + * - Do not use a directive that uses {@link ng.$compile#transclusion transclusion} on the same element as `ngApp`. + * This includes directives such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and + * {@link ngRoute.ngView `ngView`}. + * Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector}, + * causing animations to stop working and making the injector inaccessible from outside the app. + * + * You can specify an **AngularJS module** to be used as the root module for the application. This + * module will be loaded into the {@link auto.$injector} when the application is bootstrapped. It + * should contain the application code needed or have dependencies on other modules that will + * contain the code. See {@link angular.module} for more information. + * + * In the example below if the `ngApp` directive were not placed on the `html` element then the + * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}` + * would not be resolved to `3`. + * + * `ngApp` is the easiest, and most common way to bootstrap an application. + * + + +
I can add: {{a}} + {{b}} = {{ a+b }} -
- - - angular.module('ngAppDemo', []).controller('ngAppDemoController', function($scope) { +
+ + + angular.module('ngAppDemo', []).controller('ngAppDemoController', function($scope) { $scope.a = 1; $scope.b = 2; }); - - - * - * Using `ngStrictDi`, you would see something like this: - * - - -
-
- I can add: {{a}} + {{b}} = {{ a+b }} - -

This renders because the controller does not fail to - instantiate, by using explicit annotation style (see - script.js for details) -

-
- -
- Name:
- Hello, {{name}}! - -

This renders because the controller does not fail to - instantiate, by using explicit annotation style - (see script.js for details) -

-
- -
- I can add: {{a}} + {{b}} = {{ a+b }} - -

The controller could not be instantiated, due to relying - on automatic function annotations (which are disabled in - strict mode). As such, the content of this section is not - interpolated, and there should be an error in your web console. -

-
-
- - - angular.module('ngAppStrictDemo', []) + + + * + * Using `ngStrictDi`, you would see something like this: + * + + +
+
+ I can add: {{a}} + {{b}} = {{ a+b }} + +

This renders because the controller does not fail to + instantiate, by using explicit annotation style (see + script.js for details) +

+
+ +
+ Name:
+ Hello, {{name}}! + +

This renders because the controller does not fail to + instantiate, by using explicit annotation style + (see script.js for details) +

+
+ +
+ I can add: {{a}} + {{b}} = {{ a+b }} + +

The controller could not be instantiated, due to relying + on automatic function annotations (which are disabled in + strict mode). As such, the content of this section is not + interpolated, and there should be an error in your web console. +

+
+
+ + + angular.module('ngAppStrictDemo', []) // BadController will fail to instantiate, due to relying on automatic function annotation, // rather than an explicit annotation .controller('BadController', function($scope) { @@ -1601,603 +1624,605 @@ function getNgAttribute(element, ngAttr) { $scope.name = "World"; } GoodController2.$inject = ['$scope']; - - - div[ng-controller] { + + + div[ng-controller] { margin-bottom: 1em; -webkit-border-radius: 4px; border-radius: 4px; border: 1px solid; padding: .5em; } - div[ng-controller^=Good] { + div[ng-controller^=Good] { border-color: #d6e9c6; background-color: #dff0d8; color: #3c763d; } - div[ng-controller^=Bad] { + div[ng-controller^=Bad] { border-color: #ebccd1; background-color: #f2dede; color: #a94442; margin-bottom: 0; } - - - */ -function angularInit(element, bootstrap) { - var appElement, - module, - config = {}; - - // The element `element` has priority over any other element - forEach(ngAttrPrefixes, function(prefix) { - var name = prefix + 'app'; - - if (!appElement && element.hasAttribute && element.hasAttribute(name)) { - appElement = element; - module = element.getAttribute(name); - } - }); - forEach(ngAttrPrefixes, function(prefix) { - var name = prefix + 'app'; - var candidate; + + + */ + function angularInit(element, bootstrap) { + var appElement, + module, + config = {}; + + // The element `element` has priority over any other element + forEach(ngAttrPrefixes, function (prefix) { + var name = prefix + 'app'; + + if (!appElement && element.hasAttribute && element.hasAttribute(name)) { + appElement = element; + module = element.getAttribute(name); + } + }); + forEach(ngAttrPrefixes, function (prefix) { + var name = prefix + 'app'; + var candidate; - if (!appElement && (candidate = element.querySelector('[' + name.replace(':', '\\:') + ']'))) { - appElement = candidate; - module = candidate.getAttribute(name); + if (!appElement && (candidate = element.querySelector('[' + name.replace(':', '\\:') + ']'))) { + appElement = candidate; + module = candidate.getAttribute(name); + } + }); + if (appElement) { + config.strictDi = getNgAttribute(appElement, "strict-di") !== null; + bootstrap(appElement, module ? [module] : [], config); + } } - }); - if (appElement) { - config.strictDi = getNgAttribute(appElement, "strict-di") !== null; - bootstrap(appElement, module ? [module] : [], config); - } -} -/** - * @ngdoc function - * @name angular.bootstrap - * @module ng - * @description - * Use this function to manually start up angular application. - * - * For more information, see the {@link guide/bootstrap Bootstrap guide}. - * - * Angular will detect if it has been loaded into the browser more than once and only allow the - * first loaded script to be bootstrapped and will report a warning to the browser console for - * each of the subsequent scripts. This prevents strange results in applications, where otherwise - * multiple instances of Angular try to work on the DOM. - * - *
- * **Note:** Protractor based end-to-end tests cannot use this function to bootstrap manually. - * They must use {@link ng.directive:ngApp ngApp}. - *
- * - *
- * **Note:** Do not bootstrap the app on an element with a directive that uses {@link ng.$compile#transclusion transclusion}, - * such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and {@link ngRoute.ngView `ngView`}. - * Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector}, - * causing animations to stop working and making the injector inaccessible from outside the app. - *
- * - * ```html - * - * - * - *
- * {{greeting}} - *
- * - * - * + * - * - * - * ``` - * - * @param {DOMElement} element DOM element which is the root of angular application. - * @param {Array=} modules an array of modules to load into the application. - * Each item in the array should be the name of a predefined module or a (DI annotated) - * function that will be invoked by the injector as a `config` block. - * See: {@link angular.module modules} - * @param {Object=} config an object for defining configuration options for the application. The - * following keys are supported: - * - * * `strictDi` - disable automatic function annotation for the application. This is meant to - * assist in finding bugs which break minified code. Defaults to `false`. - * - * @returns {auto.$injector} Returns the newly created injector for this app. - */ -function bootstrap(element, modules, config) { - if (!isObject(config)) config = {}; - var defaultConfig = { - strictDi: false - }; - config = extend(defaultConfig, config); - var doBootstrap = function() { - element = jqLite(element); - - if (element.injector()) { - var tag = (element[0] === window.document) ? 'document' : startingTag(element); - //Encode angle brackets to prevent input from being sanitized to empty string #8683 - throw ngMinErr( - 'btstrpd', - "App already bootstrapped with this element '{0}'", - tag.replace(//,'>')); - } - - modules = modules || []; - modules.unshift(['$provide', function($provide) { - $provide.value('$rootElement', element); - }]); + * angular.bootstrap(document, ['demo']); + * + * + * + * ``` + * + * @param {DOMElement} element DOM element which is the root of angular application. + * @param {Array=} modules an array of modules to load into the application. + * Each item in the array should be the name of a predefined module or a (DI annotated) + * function that will be invoked by the injector as a `config` block. + * See: {@link angular.module modules} + * @param {Object=} config an object for defining configuration options for the application. The + * following keys are supported: + * + * * `strictDi` - disable automatic function annotation for the application. This is meant to + * assist in finding bugs which break minified code. Defaults to `false`. + * + * @returns {auto.$injector} Returns the newly created injector for this app. + */ + function bootstrap(element, modules, config) { + if (!isObject(config)) config = {}; + var defaultConfig = { + strictDi: false + }; + config = extend(defaultConfig, config); + var doBootstrap = function () { + element = jqLite(element); + + if (element.injector()) { + var tag = (element[0] === window.document) ? 'document' : startingTag(element); + //Encode angle brackets to prevent input from being sanitized to empty string #8683 + throw ngMinErr( + 'btstrpd', + "App already bootstrapped with this element '{0}'", + tag.replace(//, '>')); + } - if (config.debugInfoEnabled) { - // Pushing so that this overrides `debugInfoEnabled` setting defined in user's `modules`. - modules.push(['$compileProvider', function($compileProvider) { - $compileProvider.debugInfoEnabled(true); - }]); - } + modules = modules || []; + modules.unshift(['$provide', function ($provide) { + $provide.value('$rootElement', element); + }]); - modules.unshift('ng'); - var injector = createInjector(modules, config.strictDi); - injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector', - function bootstrapApply(scope, element, compile, injector) { - scope.$apply(function() { - element.data('$injector', injector); - compile(element)(scope); - }); - }] - ); - return injector; - }; + if (config.debugInfoEnabled) { + // Pushing so that this overrides `debugInfoEnabled` setting defined in user's `modules`. + modules.push(['$compileProvider', function ($compileProvider) { + $compileProvider.debugInfoEnabled(true); + }]); + } - var NG_ENABLE_DEBUG_INFO = /^NG_ENABLE_DEBUG_INFO!/; - var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/; + modules.unshift('ng'); + var injector = createInjector(modules, config.strictDi); + injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector', + function bootstrapApply(scope, element, compile, injector) { + scope.$apply(function () { + element.data('$injector', injector); + compile(element)(scope); + }); + }] + ); + return injector; + }; - if (window && NG_ENABLE_DEBUG_INFO.test(window.name)) { - config.debugInfoEnabled = true; - window.name = window.name.replace(NG_ENABLE_DEBUG_INFO, ''); - } + var NG_ENABLE_DEBUG_INFO = /^NG_ENABLE_DEBUG_INFO!/; + var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/; - if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) { - return doBootstrap(); - } + if (window && NG_ENABLE_DEBUG_INFO.test(window.name)) { + config.debugInfoEnabled = true; + window.name = window.name.replace(NG_ENABLE_DEBUG_INFO, ''); + } - window.name = window.name.replace(NG_DEFER_BOOTSTRAP, ''); - angular.resumeBootstrap = function(extraModules) { - forEach(extraModules, function(module) { - modules.push(module); - }); - return doBootstrap(); - }; + if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) { + return doBootstrap(); + } - if (isFunction(angular.resumeDeferredBootstrap)) { - angular.resumeDeferredBootstrap(); - } -} + window.name = window.name.replace(NG_DEFER_BOOTSTRAP, ''); + angular.resumeBootstrap = function (extraModules) { + forEach(extraModules, function (module) { + modules.push(module); + }); + return doBootstrap(); + }; -/** - * @ngdoc function - * @name angular.reloadWithDebugInfo - * @module ng - * @description - * Use this function to reload the current application with debug information turned on. - * This takes precedence over a call to `$compileProvider.debugInfoEnabled(false)`. - * - * See {@link ng.$compileProvider#debugInfoEnabled} for more. - */ -function reloadWithDebugInfo() { - window.name = 'NG_ENABLE_DEBUG_INFO!' + window.name; - window.location.reload(); -} + if (isFunction(angular.resumeDeferredBootstrap)) { + angular.resumeDeferredBootstrap(); + } + } -/** - * @name angular.getTestability - * @module ng - * @description - * Get the testability service for the instance of Angular on the given - * element. - * @param {DOMElement} element DOM element which is the root of angular application. - */ -function getTestability(rootElement) { - var injector = angular.element(rootElement).injector(); - if (!injector) { - throw ngMinErr('test', - 'no injector found for element argument to getTestability'); - } - return injector.get('$$testability'); -} - -var SNAKE_CASE_REGEXP = /[A-Z]/g; -function snake_case(name, separator) { - separator = separator || '_'; - return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) { - return (pos ? separator : '') + letter.toLowerCase(); - }); -} - -var bindJQueryFired = false; -function bindJQuery() { - var originalCleanData; - - if (bindJQueryFired) { - return; - } - - // bind to jQuery if present; - var jqName = jq(); - jQuery = isUndefined(jqName) ? window.jQuery : // use jQuery (if present) - !jqName ? undefined : // use jqLite - window[jqName]; // use jQuery specified by `ngJq` - - // Use jQuery if it exists with proper functionality, otherwise default to us. - // Angular 1.2+ requires jQuery 1.7+ for on()/off() support. - // Angular 1.3+ technically requires at least jQuery 2.1+ but it may work with older - // versions. It will not work for sure with jQuery <1.7, though. - if (jQuery && jQuery.fn.on) { - jqLite = jQuery; - extend(jQuery.fn, { - scope: JQLitePrototype.scope, - isolateScope: JQLitePrototype.isolateScope, - controller: JQLitePrototype.controller, - injector: JQLitePrototype.injector, - inheritedData: JQLitePrototype.inheritedData - }); + /** + * @ngdoc function + * @name angular.reloadWithDebugInfo + * @module ng + * @description + * Use this function to reload the current application with debug information turned on. + * This takes precedence over a call to `$compileProvider.debugInfoEnabled(false)`. + * + * See {@link ng.$compileProvider#debugInfoEnabled} for more. + */ + function reloadWithDebugInfo() { + window.name = 'NG_ENABLE_DEBUG_INFO!' + window.name; + window.location.reload(); + } - // All nodes removed from the DOM via various jQuery APIs like .remove() - // are passed through jQuery.cleanData. Monkey-patch this method to fire - // the $destroy event on all removed nodes. - originalCleanData = jQuery.cleanData; - jQuery.cleanData = function(elems) { - var events; - for (var i = 0, elem; (elem = elems[i]) != null; i++) { - events = jQuery._data(elem, "events"); - if (events && events.$destroy) { - jQuery(elem).triggerHandler('$destroy'); + /** + * @name angular.getTestability + * @module ng + * @description + * Get the testability service for the instance of Angular on the given + * element. + * @param {DOMElement} element DOM element which is the root of angular application. + */ + function getTestability(rootElement) { + var injector = angular.element(rootElement).injector(); + if (!injector) { + throw ngMinErr('test', + 'no injector found for element argument to getTestability'); } - } - originalCleanData(elems); - }; - } else { - jqLite = JQLite; - } + return injector.get('$$testability'); + } - angular.element = jqLite; + var SNAKE_CASE_REGEXP = /[A-Z]/g; - // Prevent double-proxying. - bindJQueryFired = true; -} + function snake_case(name, separator) { + separator = separator || '_'; + return name.replace(SNAKE_CASE_REGEXP, function (letter, pos) { + return (pos ? separator : '') + letter.toLowerCase(); + }); + } -/** - * throw error if the argument is falsy. - */ -function assertArg(arg, name, reason) { - if (!arg) { - throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required")); - } - return arg; -} - -function assertArgFn(arg, name, acceptArrayAnnotation) { - if (acceptArrayAnnotation && isArray(arg)) { - arg = arg[arg.length - 1]; - } - - assertArg(isFunction(arg), name, 'not a function, got ' + - (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg)); - return arg; -} + var bindJQueryFired = false; -/** - * throw error if the name given is hasOwnProperty - * @param {String} name the name to test - * @param {String} context the context in which the name is used, such as module or directive - */ -function assertNotHasOwnProperty(name, context) { - if (name === 'hasOwnProperty') { - throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context); - } -} + function bindJQuery() { + var originalCleanData; -/** - * Return the value accessible from the object by path. Any undefined traversals are ignored - * @param {Object} obj starting object - * @param {String} path path to traverse - * @param {boolean} [bindFnToScope=true] - * @returns {Object} value as accessible by path - */ -//TODO(misko): this function needs to be removed -function getter(obj, path, bindFnToScope) { - if (!path) return obj; - var keys = path.split('.'); - var key; - var lastInstance = obj; - var len = keys.length; - - for (var i = 0; i < len; i++) { - key = keys[i]; - if (obj) { - obj = (lastInstance = obj)[key]; - } - } - if (!bindFnToScope && isFunction(obj)) { - return bind(lastInstance, obj); - } - return obj; -} + if (bindJQueryFired) { + return; + } -/** - * Return the DOM siblings between the first and last node in the given array. - * @param {Array} array like object - * @returns {Array} the inputted object or a jqLite collection containing the nodes - */ -function getBlockNodes(nodes) { - // TODO(perf): update `nodes` instead of creating a new object? - var node = nodes[0]; - var endNode = nodes[nodes.length - 1]; - var blockNodes; - - for (var i = 1; node !== endNode && (node = node.nextSibling); i++) { - if (blockNodes || nodes[i] !== node) { - if (!blockNodes) { - blockNodes = jqLite(slice.call(nodes, 0, i)); - } - blockNodes.push(node); - } - } + // bind to jQuery if present; + var jqName = jq(); + jQuery = isUndefined(jqName) ? window.jQuery : // use jQuery (if present) + !jqName ? undefined : // use jqLite + window[jqName]; // use jQuery specified by `ngJq` + + // Use jQuery if it exists with proper functionality, otherwise default to us. + // Angular 1.2+ requires jQuery 1.7+ for on()/off() support. + // Angular 1.3+ technically requires at least jQuery 2.1+ but it may work with older + // versions. It will not work for sure with jQuery <1.7, though. + if (jQuery && jQuery.fn.on) { + jqLite = jQuery; + extend(jQuery.fn, { + scope: JQLitePrototype.scope, + isolateScope: JQLitePrototype.isolateScope, + controller: JQLitePrototype.controller, + injector: JQLitePrototype.injector, + inheritedData: JQLitePrototype.inheritedData + }); + + // All nodes removed from the DOM via various jQuery APIs like .remove() + // are passed through jQuery.cleanData. Monkey-patch this method to fire + // the $destroy event on all removed nodes. + originalCleanData = jQuery.cleanData; + jQuery.cleanData = function (elems) { + var events; + for (var i = 0, elem; (elem = elems[i]) != null; i++) { + events = jQuery._data(elem, "events"); + if (events && events.$destroy) { + jQuery(elem).triggerHandler('$destroy'); + } + } + originalCleanData(elems); + }; + } else { + jqLite = JQLite; + } - return blockNodes || nodes; -} + angular.element = jqLite; + // Prevent double-proxying. + bindJQueryFired = true; + } -/** - * Creates a new object without a prototype. This object is useful for lookup without having to - * guard against prototypically inherited properties via hasOwnProperty. - * - * Related micro-benchmarks: - * - http://jsperf.com/object-create2 - * - http://jsperf.com/proto-map-lookup/2 - * - http://jsperf.com/for-in-vs-object-keys2 - * - * @returns {Object} - */ -function createMap() { - return Object.create(null); -} + /** + * throw error if the argument is falsy. + */ + function assertArg(arg, name, reason) { + if (!arg) { + throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required")); + } + return arg; + } -var NODE_TYPE_ELEMENT = 1; -var NODE_TYPE_ATTRIBUTE = 2; -var NODE_TYPE_TEXT = 3; -var NODE_TYPE_COMMENT = 8; -var NODE_TYPE_DOCUMENT = 9; -var NODE_TYPE_DOCUMENT_FRAGMENT = 11; + function assertArgFn(arg, name, acceptArrayAnnotation) { + if (acceptArrayAnnotation && isArray(arg)) { + arg = arg[arg.length - 1]; + } -/** - * @ngdoc type - * @name angular.Module - * @module ng - * @description - * - * Interface for configuring angular {@link angular.module modules}. - */ + assertArg(isFunction(arg), name, 'not a function, got ' + + (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg)); + return arg; + } + + /** + * throw error if the name given is hasOwnProperty + * @param {String} name the name to test + * @param {String} context the context in which the name is used, such as module or directive + */ + function assertNotHasOwnProperty(name, context) { + if (name === 'hasOwnProperty') { + throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context); + } + } -function setupModuleLoader(window) { + /** + * Return the value accessible from the object by path. Any undefined traversals are ignored + * @param {Object} obj starting object + * @param {String} path path to traverse + * @param {boolean} [bindFnToScope=true] + * @returns {Object} value as accessible by path + */ +//TODO(misko): this function needs to be removed + function getter(obj, path, bindFnToScope) { + if (!path) return obj; + var keys = path.split('.'); + var key; + var lastInstance = obj; + var len = keys.length; + + for (var i = 0; i < len; i++) { + key = keys[i]; + if (obj) { + obj = (lastInstance = obj)[key]; + } + } + if (!bindFnToScope && isFunction(obj)) { + return bind(lastInstance, obj); + } + return obj; + } - var $injectorMinErr = minErr('$injector'); - var ngMinErr = minErr('ng'); + /** + * Return the DOM siblings between the first and last node in the given array. + * @param {Array} array like object + * @returns {Array} the inputted object or a jqLite collection containing the nodes + */ + function getBlockNodes(nodes) { + // TODO(perf): update `nodes` instead of creating a new object? + var node = nodes[0]; + var endNode = nodes[nodes.length - 1]; + var blockNodes; + + for (var i = 1; node !== endNode && (node = node.nextSibling); i++) { + if (blockNodes || nodes[i] !== node) { + if (!blockNodes) { + blockNodes = jqLite(slice.call(nodes, 0, i)); + } + blockNodes.push(node); + } + } - function ensure(obj, name, factory) { - return obj[name] || (obj[name] = factory()); - } + return blockNodes || nodes; + } - var angular = ensure(window, 'angular', Object); - // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap - angular.$$minErr = angular.$$minErr || minErr; + /** + * Creates a new object without a prototype. This object is useful for lookup without having to + * guard against prototypically inherited properties via hasOwnProperty. + * + * Related micro-benchmarks: + * - http://jsperf.com/object-create2 + * - http://jsperf.com/proto-map-lookup/2 + * - http://jsperf.com/for-in-vs-object-keys2 + * + * @returns {Object} + */ + function createMap() { + return Object.create(null); + } - return ensure(angular, 'module', function() { - /** @type {Object.} */ - var modules = {}; + var NODE_TYPE_ELEMENT = 1; + var NODE_TYPE_ATTRIBUTE = 2; + var NODE_TYPE_TEXT = 3; + var NODE_TYPE_COMMENT = 8; + var NODE_TYPE_DOCUMENT = 9; + var NODE_TYPE_DOCUMENT_FRAGMENT = 11; /** - * @ngdoc function - * @name angular.module + * @ngdoc type + * @name angular.Module * @module ng * @description * - * The `angular.module` is a global place for creating, registering and retrieving Angular - * modules. - * All modules (angular core or 3rd party) that should be available to an application must be - * registered using this mechanism. - * - * Passing one argument retrieves an existing {@link angular.Module}, - * whereas passing more than one argument creates a new {@link angular.Module} - * - * - * # Module - * - * A module is a collection of services, directives, controllers, filters, and configuration information. - * `angular.module` is used to configure the {@link auto.$injector $injector}. - * - * ```js - * // Create a new module - * var myModule = angular.module('myModule', []); - * - * // register a new service - * myModule.value('appName', 'MyCoolApp'); - * - * // configure existing services inside initialization blocks. - * myModule.config(['$locationProvider', function($locationProvider) { + * Interface for configuring angular {@link angular.module modules}. + */ + + function setupModuleLoader(window) { + + var $injectorMinErr = minErr('$injector'); + var ngMinErr = minErr('ng'); + + function ensure(obj, name, factory) { + return obj[name] || (obj[name] = factory()); + } + + var angular = ensure(window, 'angular', Object); + + // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap + angular.$$minErr = angular.$$minErr || minErr; + + return ensure(angular, 'module', function () { + /** @type {Object.} */ + var modules = {}; + + /** + * @ngdoc function + * @name angular.module + * @module ng + * @description + * + * The `angular.module` is a global place for creating, registering and retrieving Angular + * modules. + * All modules (angular core or 3rd party) that should be available to an application must be + * registered using this mechanism. + * + * Passing one argument retrieves an existing {@link angular.Module}, + * whereas passing more than one argument creates a new {@link angular.Module} + * + * + * # Module + * + * A module is a collection of services, directives, controllers, filters, and configuration information. + * `angular.module` is used to configure the {@link auto.$injector $injector}. + * + * ```js + * // Create a new module + * var myModule = angular.module('myModule', []); + * + * // register a new service + * myModule.value('appName', 'MyCoolApp'); + * + * // configure existing services inside initialization blocks. + * myModule.config(['$locationProvider', function($locationProvider) { * // Configure existing providers * $locationProvider.hashPrefix('!'); * }]); - * ``` - * - * Then you can create an injector and load your modules like this: - * - * ```js - * var injector = angular.injector(['ng', 'myModule']) - * ``` - * - * However it's more likely that you'll just use - * {@link ng.directive:ngApp ngApp} or - * {@link angular.bootstrap} to simplify this process for you. - * - * @param {!string} name The name of the module to create or retrieve. - * @param {!Array.=} requires If specified then new module is being created. If - * unspecified then the module is being retrieved for further configuration. - * @param {Function=} configFn Optional configuration function for the module. Same as - * {@link angular.Module#config Module#config()}. - * @returns {angular.Module} new module with the {@link angular.Module} api. - */ - return function module(name, requires, configFn) { - var assertNotHasOwnProperty = function(name, context) { - if (name === 'hasOwnProperty') { - throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context); - } - }; + * ``` + * + * Then you can create an injector and load your modules like this: + * + * ```js + * var injector = angular.injector(['ng', 'myModule']) + * ``` + * + * However it's more likely that you'll just use + * {@link ng.directive:ngApp ngApp} or + * {@link angular.bootstrap} to simplify this process for you. + * + * @param {!string} name The name of the module to create or retrieve. + * @param {!Array.=} requires If specified then new module is being created. If + * unspecified then the module is being retrieved for further configuration. + * @param {Function=} configFn Optional configuration function for the module. Same as + * {@link angular.Module#config Module#config()}. + * @returns {angular.Module} new module with the {@link angular.Module} api. + */ + return function module(name, requires, configFn) { + var assertNotHasOwnProperty = function (name, context) { + if (name === 'hasOwnProperty') { + throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context); + } + }; - assertNotHasOwnProperty(name, 'module'); - if (requires && modules.hasOwnProperty(name)) { - modules[name] = null; - } - return ensure(modules, name, function() { - if (!requires) { - throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " + - "the module name or forgot to load it. If registering a module ensure that you " + - "specify the dependencies as the second argument.", name); - } + assertNotHasOwnProperty(name, 'module'); + if (requires && modules.hasOwnProperty(name)) { + modules[name] = null; + } + return ensure(modules, name, function () { + if (!requires) { + throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " + + "the module name or forgot to load it. If registering a module ensure that you " + + "specify the dependencies as the second argument.", name); + } - /** @type {!Array.>} */ - var invokeQueue = []; - - /** @type {!Array.} */ - var configBlocks = []; - - /** @type {!Array.} */ - var runBlocks = []; - - var config = invokeLater('$injector', 'invoke', 'push', configBlocks); - - /** @type {angular.Module} */ - var moduleInstance = { - // Private state - _invokeQueue: invokeQueue, - _configBlocks: configBlocks, - _runBlocks: runBlocks, - - /** - * @ngdoc property - * @name angular.Module#requires - * @module ng - * - * @description - * Holds the list of modules which the injector will load before the current module is - * loaded. - */ - requires: requires, - - /** - * @ngdoc property - * @name angular.Module#name - * @module ng - * - * @description - * Name of the module. - */ - name: name, - - - /** - * @ngdoc method - * @name angular.Module#provider - * @module ng - * @param {string} name service name - * @param {Function} providerType Construction function for creating new instance of the - * service. - * @description - * See {@link auto.$provide#provider $provide.provider()}. - */ - provider: invokeLaterAndSetModuleName('$provide', 'provider'), - - /** - * @ngdoc method - * @name angular.Module#factory - * @module ng - * @param {string} name service name - * @param {Function} providerFunction Function for creating new instance of the service. - * @description - * See {@link auto.$provide#factory $provide.factory()}. - */ - factory: invokeLaterAndSetModuleName('$provide', 'factory'), - - /** - * @ngdoc method - * @name angular.Module#service - * @module ng - * @param {string} name service name - * @param {Function} constructor A constructor function that will be instantiated. - * @description - * See {@link auto.$provide#service $provide.service()}. - */ - service: invokeLaterAndSetModuleName('$provide', 'service'), - - /** - * @ngdoc method - * @name angular.Module#value - * @module ng - * @param {string} name service name - * @param {*} object Service instance object. - * @description - * See {@link auto.$provide#value $provide.value()}. - */ - value: invokeLater('$provide', 'value'), - - /** - * @ngdoc method - * @name angular.Module#constant - * @module ng - * @param {string} name constant name - * @param {*} object Constant value. - * @description - * Because the constants are fixed, they get applied before other provide methods. - * See {@link auto.$provide#constant $provide.constant()}. - */ - constant: invokeLater('$provide', 'constant', 'unshift'), - - /** - * @ngdoc method - * @name angular.Module#decorator - * @module ng - * @param {string} name The name of the service to decorate. - * @param {Function} decorFn This function will be invoked when the service needs to be - * instantiated and should return the decorated service instance. - * @description - * See {@link auto.$provide#decorator $provide.decorator()}. - */ - decorator: invokeLaterAndSetModuleName('$provide', 'decorator'), - - /** - * @ngdoc method - * @name angular.Module#animation - * @module ng - * @param {string} name animation name - * @param {Function} animationFactory Factory function for creating new instance of an - * animation. - * @description - * - * **NOTE**: animations take effect only if the **ngAnimate** module is loaded. - * - * - * Defines an animation hook that can be later used with - * {@link $animate $animate} service and directives that use this service. - * - * ```js - * module.animation('.animation-name', function($inject1, $inject2) { + /** @type {!Array.>} */ + var invokeQueue = []; + + /** @type {!Array.} */ + var configBlocks = []; + + /** @type {!Array.} */ + var runBlocks = []; + + var config = invokeLater('$injector', 'invoke', 'push', configBlocks); + + /** @type {angular.Module} */ + var moduleInstance = { + // Private state + _invokeQueue: invokeQueue, + _configBlocks: configBlocks, + _runBlocks: runBlocks, + + /** + * @ngdoc property + * @name angular.Module#requires + * @module ng + * + * @description + * Holds the list of modules which the injector will load before the current module is + * loaded. + */ + requires: requires, + + /** + * @ngdoc property + * @name angular.Module#name + * @module ng + * + * @description + * Name of the module. + */ + name: name, + + + /** + * @ngdoc method + * @name angular.Module#provider + * @module ng + * @param {string} name service name + * @param {Function} providerType Construction function for creating new instance of the + * service. + * @description + * See {@link auto.$provide#provider $provide.provider()}. + */ + provider: invokeLaterAndSetModuleName('$provide', 'provider'), + + /** + * @ngdoc method + * @name angular.Module#factory + * @module ng + * @param {string} name service name + * @param {Function} providerFunction Function for creating new instance of the service. + * @description + * See {@link auto.$provide#factory $provide.factory()}. + */ + factory: invokeLaterAndSetModuleName('$provide', 'factory'), + + /** + * @ngdoc method + * @name angular.Module#service + * @module ng + * @param {string} name service name + * @param {Function} constructor A constructor function that will be instantiated. + * @description + * See {@link auto.$provide#service $provide.service()}. + */ + service: invokeLaterAndSetModuleName('$provide', 'service'), + + /** + * @ngdoc method + * @name angular.Module#value + * @module ng + * @param {string} name service name + * @param {*} object Service instance object. + * @description + * See {@link auto.$provide#value $provide.value()}. + */ + value: invokeLater('$provide', 'value'), + + /** + * @ngdoc method + * @name angular.Module#constant + * @module ng + * @param {string} name constant name + * @param {*} object Constant value. + * @description + * Because the constants are fixed, they get applied before other provide methods. + * See {@link auto.$provide#constant $provide.constant()}. + */ + constant: invokeLater('$provide', 'constant', 'unshift'), + + /** + * @ngdoc method + * @name angular.Module#decorator + * @module ng + * @param {string} name The name of the service to decorate. + * @param {Function} decorFn This function will be invoked when the service needs to be + * instantiated and should return the decorated service instance. + * @description + * See {@link auto.$provide#decorator $provide.decorator()}. + */ + decorator: invokeLaterAndSetModuleName('$provide', 'decorator'), + + /** + * @ngdoc method + * @name angular.Module#animation + * @module ng + * @param {string} name animation name + * @param {Function} animationFactory Factory function for creating new instance of an + * animation. + * @description + * + * **NOTE**: animations take effect only if the **ngAnimate** module is loaded. + * + * + * Defines an animation hook that can be later used with + * {@link $animate $animate} service and directives that use this service. + * + * ```js + * module.animation('.animation-name', function($inject1, $inject2) { * return { * eventName : function(element, done) { * //code to run the animation @@ -2208,165 +2233,165 @@ function setupModuleLoader(window) { * } * } * }) - * ``` - * - * See {@link ng.$animateProvider#register $animateProvider.register()} and - * {@link ngAnimate ngAnimate module} for more information. - */ - animation: invokeLaterAndSetModuleName('$animateProvider', 'register'), - - /** - * @ngdoc method - * @name angular.Module#filter - * @module ng - * @param {string} name Filter name - this must be a valid angular expression identifier - * @param {Function} filterFactory Factory function for creating new instance of filter. - * @description - * See {@link ng.$filterProvider#register $filterProvider.register()}. - * - *
- * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`. - * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace - * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores - * (`myapp_subsection_filterx`). - *
- */ - filter: invokeLaterAndSetModuleName('$filterProvider', 'register'), - - /** - * @ngdoc method - * @name angular.Module#controller - * @module ng - * @param {string|Object} name Controller name, or an object map of controllers where the - * keys are the names and the values are the constructors. - * @param {Function} constructor Controller constructor function. - * @description - * See {@link ng.$controllerProvider#register $controllerProvider.register()}. - */ - controller: invokeLaterAndSetModuleName('$controllerProvider', 'register'), - - /** - * @ngdoc method - * @name angular.Module#directive - * @module ng - * @param {string|Object} name Directive name, or an object map of directives where the - * keys are the names and the values are the factories. - * @param {Function} directiveFactory Factory function for creating new instance of - * directives. - * @description - * See {@link ng.$compileProvider#directive $compileProvider.directive()}. - */ - directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'), - - /** - * @ngdoc method - * @name angular.Module#component - * @module ng - * @param {string} name Name of the component in camel-case (i.e. myComp which will match as my-comp) - * @param {Object} options Component definition object (a simplified - * {@link ng.$compile#directive-definition-object directive definition object}) - * - * @description - * See {@link ng.$compileProvider#component $compileProvider.component()}. - */ - component: invokeLaterAndSetModuleName('$compileProvider', 'component'), - - /** - * @ngdoc method - * @name angular.Module#config - * @module ng - * @param {Function} configFn Execute this function on module load. Useful for service - * configuration. - * @description - * Use this method to register work which needs to be performed on module loading. - * For more about how to configure services, see - * {@link providers#provider-recipe Provider Recipe}. - */ - config: config, - - /** - * @ngdoc method - * @name angular.Module#run - * @module ng - * @param {Function} initializationFn Execute this function after injector creation. - * Useful for application initialization. - * @description - * Use this method to register work which should be performed when the injector is done - * loading all modules. - */ - run: function(block) { - runBlocks.push(block); - return this; - } - }; - - if (configFn) { - config(configFn); - } + * ``` + * + * See {@link ng.$animateProvider#register $animateProvider.register()} and + * {@link ngAnimate ngAnimate module} for more information. + */ + animation: invokeLaterAndSetModuleName('$animateProvider', 'register'), + + /** + * @ngdoc method + * @name angular.Module#filter + * @module ng + * @param {string} name Filter name - this must be a valid angular expression identifier + * @param {Function} filterFactory Factory function for creating new instance of filter. + * @description + * See {@link ng.$filterProvider#register $filterProvider.register()}. + * + *
+ * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`. + * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace + * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores + * (`myapp_subsection_filterx`). + *
+ */ + filter: invokeLaterAndSetModuleName('$filterProvider', 'register'), + + /** + * @ngdoc method + * @name angular.Module#controller + * @module ng + * @param {string|Object} name Controller name, or an object map of controllers where the + * keys are the names and the values are the constructors. + * @param {Function} constructor Controller constructor function. + * @description + * See {@link ng.$controllerProvider#register $controllerProvider.register()}. + */ + controller: invokeLaterAndSetModuleName('$controllerProvider', 'register'), + + /** + * @ngdoc method + * @name angular.Module#directive + * @module ng + * @param {string|Object} name Directive name, or an object map of directives where the + * keys are the names and the values are the factories. + * @param {Function} directiveFactory Factory function for creating new instance of + * directives. + * @description + * See {@link ng.$compileProvider#directive $compileProvider.directive()}. + */ + directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'), + + /** + * @ngdoc method + * @name angular.Module#component + * @module ng + * @param {string} name Name of the component in camel-case (i.e. myComp which will match as my-comp) + * @param {Object} options Component definition object (a simplified + * {@link ng.$compile#directive-definition-object directive definition object}) + * + * @description + * See {@link ng.$compileProvider#component $compileProvider.component()}. + */ + component: invokeLaterAndSetModuleName('$compileProvider', 'component'), + + /** + * @ngdoc method + * @name angular.Module#config + * @module ng + * @param {Function} configFn Execute this function on module load. Useful for service + * configuration. + * @description + * Use this method to register work which needs to be performed on module loading. + * For more about how to configure services, see + * {@link providers#provider-recipe Provider Recipe}. + */ + config: config, + + /** + * @ngdoc method + * @name angular.Module#run + * @module ng + * @param {Function} initializationFn Execute this function after injector creation. + * Useful for application initialization. + * @description + * Use this method to register work which should be performed when the injector is done + * loading all modules. + */ + run: function (block) { + runBlocks.push(block); + return this; + } + }; + + if (configFn) { + config(configFn); + } - return moduleInstance; + return moduleInstance; + + /** + * @param {string} provider + * @param {string} method + * @param {String=} insertMethod + * @returns {angular.Module} + */ + function invokeLater(provider, method, insertMethod, queue) { + if (!queue) queue = invokeQueue; + return function () { + queue[insertMethod || 'push']([provider, method, arguments]); + return moduleInstance; + }; + } - /** - * @param {string} provider - * @param {string} method - * @param {String=} insertMethod - * @returns {angular.Module} - */ - function invokeLater(provider, method, insertMethod, queue) { - if (!queue) queue = invokeQueue; - return function() { - queue[insertMethod || 'push']([provider, method, arguments]); - return moduleInstance; - }; - } + /** + * @param {string} provider + * @param {string} method + * @returns {angular.Module} + */ + function invokeLaterAndSetModuleName(provider, method) { + return function (recipeName, factoryFunction) { + if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name; + invokeQueue.push([provider, method, arguments]); + return moduleInstance; + }; + } + }); + }; + }); - /** - * @param {string} provider - * @param {string} method - * @returns {angular.Module} - */ - function invokeLaterAndSetModuleName(provider, method) { - return function(recipeName, factoryFunction) { - if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name; - invokeQueue.push([provider, method, arguments]); - return moduleInstance; - }; - } - }); - }; - }); + } -} + /* global: toDebugString: true */ -/* global: toDebugString: true */ + function serializeObject(obj) { + var seen = []; -function serializeObject(obj) { - var seen = []; + return JSON.stringify(obj, function (key, val) { + val = toJsonReplacer(key, val); + if (isObject(val)) { - return JSON.stringify(obj, function(key, val) { - val = toJsonReplacer(key, val); - if (isObject(val)) { + if (seen.indexOf(val) >= 0) return '...'; - if (seen.indexOf(val) >= 0) return '...'; + seen.push(val); + } + return val; + }); + } - seen.push(val); + function toDebugString(obj) { + if (typeof obj === 'function') { + return obj.toString().replace(/ \{[\s\S]*$/, ''); + } else if (isUndefined(obj)) { + return 'undefined'; + } else if (typeof obj !== 'string') { + return serializeObject(obj); + } + return obj; } - return val; - }); -} - -function toDebugString(obj) { - if (typeof obj === 'function') { - return obj.toString().replace(/ \{[\s\S]*$/, ''); - } else if (isUndefined(obj)) { - return 'undefined'; - } else if (typeof obj !== 'string') { - return serializeObject(obj); - } - return obj; -} - -/* global angularModule: true, + + /* global angularModule: true, version: true, $CompileProvider, @@ -2463,170 +2488,166 @@ function toDebugString(obj) { */ -/** - * @ngdoc object - * @name angular.version - * @module ng - * @description - * An object that contains information about the current AngularJS version. - * - * This object has the following properties: - * - * - `full` – `{string}` – Full version string, such as "0.9.18". - * - `major` – `{number}` – Major version number, such as "0". - * - `minor` – `{number}` – Minor version number, such as "9". - * - `dot` – `{number}` – Dot version number, such as "18". - * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat". - */ -var version = { - full: '1.5.5', // all of these placeholder strings will be replaced by grunt's - major: 1, // package task - minor: 5, - dot: 5, - codeName: 'material-conspiration' -}; - - -function publishExternalAPI(angular) { - extend(angular, { - 'bootstrap': bootstrap, - 'copy': copy, - 'extend': extend, - 'merge': merge, - 'equals': equals, - 'element': jqLite, - 'forEach': forEach, - 'injector': createInjector, - 'noop': noop, - 'bind': bind, - 'toJson': toJson, - 'fromJson': fromJson, - 'identity': identity, - 'isUndefined': isUndefined, - 'isDefined': isDefined, - 'isString': isString, - 'isFunction': isFunction, - 'isObject': isObject, - 'isNumber': isNumber, - 'isElement': isElement, - 'isArray': isArray, - 'version': version, - 'isDate': isDate, - 'lowercase': lowercase, - 'uppercase': uppercase, - 'callbacks': {counter: 0}, - 'getTestability': getTestability, - '$$minErr': minErr, - '$$csp': csp, - 'reloadWithDebugInfo': reloadWithDebugInfo - }); + /** + * @ngdoc object + * @name angular.version + * @module ng + * @description + * An object that contains information about the current AngularJS version. + * + * This object has the following properties: + * + * - `full` – `{string}` – Full version string, such as "0.9.18". + * - `major` – `{number}` – Major version number, such as "0". + * - `minor` – `{number}` – Minor version number, such as "9". + * - `dot` – `{number}` – Dot version number, such as "18". + * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat". + */ + var version = { + full: '1.5.5', // all of these placeholder strings will be replaced by grunt's + major: 1, // package task + minor: 5, + dot: 5, + codeName: 'material-conspiration' + }; - angularModule = setupModuleLoader(window); - angularModule('ng', ['ngLocale'], ['$provide', - function ngModule($provide) { - // $$sanitizeUriProvider needs to be before $compileProvider as it is used by it. - $provide.provider({ - $$sanitizeUri: $$SanitizeUriProvider - }); - $provide.provider('$compile', $CompileProvider). - directive({ - a: htmlAnchorDirective, - input: inputDirective, - textarea: inputDirective, - form: formDirective, - script: scriptDirective, - select: selectDirective, - style: styleDirective, - option: optionDirective, - ngBind: ngBindDirective, - ngBindHtml: ngBindHtmlDirective, - ngBindTemplate: ngBindTemplateDirective, - ngClass: ngClassDirective, - ngClassEven: ngClassEvenDirective, - ngClassOdd: ngClassOddDirective, - ngCloak: ngCloakDirective, - ngController: ngControllerDirective, - ngForm: ngFormDirective, - ngHide: ngHideDirective, - ngIf: ngIfDirective, - ngInclude: ngIncludeDirective, - ngInit: ngInitDirective, - ngNonBindable: ngNonBindableDirective, - ngPluralize: ngPluralizeDirective, - ngRepeat: ngRepeatDirective, - ngShow: ngShowDirective, - ngStyle: ngStyleDirective, - ngSwitch: ngSwitchDirective, - ngSwitchWhen: ngSwitchWhenDirective, - ngSwitchDefault: ngSwitchDefaultDirective, - ngOptions: ngOptionsDirective, - ngTransclude: ngTranscludeDirective, - ngModel: ngModelDirective, - ngList: ngListDirective, - ngChange: ngChangeDirective, - pattern: patternDirective, - ngPattern: patternDirective, - required: requiredDirective, - ngRequired: requiredDirective, - minlength: minlengthDirective, - ngMinlength: minlengthDirective, - maxlength: maxlengthDirective, - ngMaxlength: maxlengthDirective, - ngValue: ngValueDirective, - ngModelOptions: ngModelOptionsDirective - }). - directive({ - ngInclude: ngIncludeFillContentDirective - }). - directive(ngAttributeAliasDirectives). - directive(ngEventDirectives); - $provide.provider({ - $anchorScroll: $AnchorScrollProvider, - $animate: $AnimateProvider, - $animateCss: $CoreAnimateCssProvider, - $$animateJs: $$CoreAnimateJsProvider, - $$animateQueue: $$CoreAnimateQueueProvider, - $$AnimateRunner: $$AnimateRunnerFactoryProvider, - $$animateAsyncRun: $$AnimateAsyncRunFactoryProvider, - $browser: $BrowserProvider, - $cacheFactory: $CacheFactoryProvider, - $controller: $ControllerProvider, - $document: $DocumentProvider, - $exceptionHandler: $ExceptionHandlerProvider, - $filter: $FilterProvider, - $$forceReflow: $$ForceReflowProvider, - $interpolate: $InterpolateProvider, - $interval: $IntervalProvider, - $http: $HttpProvider, - $httpParamSerializer: $HttpParamSerializerProvider, - $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider, - $httpBackend: $HttpBackendProvider, - $xhrFactory: $xhrFactoryProvider, - $location: $LocationProvider, - $log: $LogProvider, - $parse: $ParseProvider, - $rootScope: $RootScopeProvider, - $q: $QProvider, - $$q: $$QProvider, - $sce: $SceProvider, - $sceDelegate: $SceDelegateProvider, - $sniffer: $SnifferProvider, - $templateCache: $TemplateCacheProvider, - $templateRequest: $TemplateRequestProvider, - $$testability: $$TestabilityProvider, - $timeout: $TimeoutProvider, - $window: $WindowProvider, - $$rAF: $$RAFProvider, - $$jqLite: $$jqLiteProvider, - $$HashMap: $$HashMapProvider, - $$cookieReader: $$CookieReaderProvider - }); + function publishExternalAPI(angular) { + extend(angular, { + 'bootstrap': bootstrap, + 'copy': copy, + 'extend': extend, + 'merge': merge, + 'equals': equals, + 'element': jqLite, + 'forEach': forEach, + 'injector': createInjector, + 'noop': noop, + 'bind': bind, + 'toJson': toJson, + 'fromJson': fromJson, + 'identity': identity, + 'isUndefined': isUndefined, + 'isDefined': isDefined, + 'isString': isString, + 'isFunction': isFunction, + 'isObject': isObject, + 'isNumber': isNumber, + 'isElement': isElement, + 'isArray': isArray, + 'version': version, + 'isDate': isDate, + 'lowercase': lowercase, + 'uppercase': uppercase, + 'callbacks': {counter: 0}, + 'getTestability': getTestability, + '$$minErr': minErr, + '$$csp': csp, + 'reloadWithDebugInfo': reloadWithDebugInfo + }); + + angularModule = setupModuleLoader(window); + + angularModule('ng', ['ngLocale'], ['$provide', + function ngModule($provide) { + // $$sanitizeUriProvider needs to be before $compileProvider as it is used by it. + $provide.provider({ + $$sanitizeUri: $$SanitizeUriProvider + }); + $provide.provider('$compile', $CompileProvider).directive({ + a: htmlAnchorDirective, + input: inputDirective, + textarea: inputDirective, + form: formDirective, + script: scriptDirective, + select: selectDirective, + style: styleDirective, + option: optionDirective, + ngBind: ngBindDirective, + ngBindHtml: ngBindHtmlDirective, + ngBindTemplate: ngBindTemplateDirective, + ngClass: ngClassDirective, + ngClassEven: ngClassEvenDirective, + ngClassOdd: ngClassOddDirective, + ngCloak: ngCloakDirective, + ngController: ngControllerDirective, + ngForm: ngFormDirective, + ngHide: ngHideDirective, + ngIf: ngIfDirective, + ngInclude: ngIncludeDirective, + ngInit: ngInitDirective, + ngNonBindable: ngNonBindableDirective, + ngPluralize: ngPluralizeDirective, + ngRepeat: ngRepeatDirective, + ngShow: ngShowDirective, + ngStyle: ngStyleDirective, + ngSwitch: ngSwitchDirective, + ngSwitchWhen: ngSwitchWhenDirective, + ngSwitchDefault: ngSwitchDefaultDirective, + ngOptions: ngOptionsDirective, + ngTransclude: ngTranscludeDirective, + ngModel: ngModelDirective, + ngList: ngListDirective, + ngChange: ngChangeDirective, + pattern: patternDirective, + ngPattern: patternDirective, + required: requiredDirective, + ngRequired: requiredDirective, + minlength: minlengthDirective, + ngMinlength: minlengthDirective, + maxlength: maxlengthDirective, + ngMaxlength: maxlengthDirective, + ngValue: ngValueDirective, + ngModelOptions: ngModelOptionsDirective + }).directive({ + ngInclude: ngIncludeFillContentDirective + }).directive(ngAttributeAliasDirectives).directive(ngEventDirectives); + $provide.provider({ + $anchorScroll: $AnchorScrollProvider, + $animate: $AnimateProvider, + $animateCss: $CoreAnimateCssProvider, + $$animateJs: $$CoreAnimateJsProvider, + $$animateQueue: $$CoreAnimateQueueProvider, + $$AnimateRunner: $$AnimateRunnerFactoryProvider, + $$animateAsyncRun: $$AnimateAsyncRunFactoryProvider, + $browser: $BrowserProvider, + $cacheFactory: $CacheFactoryProvider, + $controller: $ControllerProvider, + $document: $DocumentProvider, + $exceptionHandler: $ExceptionHandlerProvider, + $filter: $FilterProvider, + $$forceReflow: $$ForceReflowProvider, + $interpolate: $InterpolateProvider, + $interval: $IntervalProvider, + $http: $HttpProvider, + $httpParamSerializer: $HttpParamSerializerProvider, + $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider, + $httpBackend: $HttpBackendProvider, + $xhrFactory: $xhrFactoryProvider, + $location: $LocationProvider, + $log: $LogProvider, + $parse: $ParseProvider, + $rootScope: $RootScopeProvider, + $q: $QProvider, + $$q: $$QProvider, + $sce: $SceProvider, + $sceDelegate: $SceDelegateProvider, + $sniffer: $SnifferProvider, + $templateCache: $TemplateCacheProvider, + $templateRequest: $TemplateRequestProvider, + $$testability: $$TestabilityProvider, + $timeout: $TimeoutProvider, + $window: $WindowProvider, + $$rAF: $$RAFProvider, + $$jqLite: $$jqLiteProvider, + $$HashMap: $$HashMapProvider, + $$cookieReader: $$CookieReaderProvider + }); + } + ]); } - ]); -} -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Any commits to this file should be reviewed with security in mind. * * Changes to this file can potentially create security vulnerabilities. * * An approval from 2 Core members with history of modifying * @@ -2637,7 +2658,7 @@ function publishExternalAPI(angular) { * Or gives undesired access to variables likes document or window? * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* global JQLitePrototype: true, + /* global JQLitePrototype: true, addEventListenerFn: true, removeEventListenerFn: true, BOOLEAN_ATTR: true, @@ -2648,1553 +2669,1561 @@ function publishExternalAPI(angular) { //JQLite ////////////////////////////////// -/** - * @ngdoc function - * @name angular.element - * @module ng - * @kind function - * - * @description - * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element. - * - * If jQuery is available, `angular.element` is an alias for the - * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element` - * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or **jqLite**. - * - * jqLite is a tiny, API-compatible subset of jQuery that allows - * Angular to manipulate the DOM in a cross-browser compatible way. jqLite implements only the most - * commonly needed functionality with the goal of having a very small footprint. - * - * To use `jQuery`, simply ensure it is loaded before the `angular.js` file. You can also use the - * {@link ngJq `ngJq`} directive to specify that jqlite should be used over jQuery, or to use a - * specific version of jQuery if multiple versions exist on the page. - * - *
**Note:** All element references in Angular are always wrapped with jQuery or - * jqLite (such as the element argument in a directive's compile / link function). They are never raw DOM references.
- * - *
**Note:** Keep in mind that this function will not find elements - * by tag name / CSS selector. For lookups by tag name, try instead `angular.element(document).find(...)` - * or `$document.find()`, or use the standard DOM APIs, e.g. `document.querySelectorAll()`.
- * - * ## Angular's jqLite - * jqLite provides only the following jQuery methods: - * - * - [`addClass()`](http://api.jquery.com/addClass/) - * - [`after()`](http://api.jquery.com/after/) - * - [`append()`](http://api.jquery.com/append/) - * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters - * - [`bind()`](http://api.jquery.com/bind/) - Does not support namespaces, selectors or eventData - * - [`children()`](http://api.jquery.com/children/) - Does not support selectors - * - [`clone()`](http://api.jquery.com/clone/) - * - [`contents()`](http://api.jquery.com/contents/) - * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`. - * As a setter, does not convert numbers to strings or append 'px', and also does not have automatic property prefixing. - * - [`data()`](http://api.jquery.com/data/) - * - [`detach()`](http://api.jquery.com/detach/) - * - [`empty()`](http://api.jquery.com/empty/) - * - [`eq()`](http://api.jquery.com/eq/) - * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name - * - [`hasClass()`](http://api.jquery.com/hasClass/) - * - [`html()`](http://api.jquery.com/html/) - * - [`next()`](http://api.jquery.com/next/) - Does not support selectors - * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData - * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces, selectors or event object as parameter - * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors - * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors - * - [`prepend()`](http://api.jquery.com/prepend/) - * - [`prop()`](http://api.jquery.com/prop/) - * - [`ready()`](http://api.jquery.com/ready/) - * - [`remove()`](http://api.jquery.com/remove/) - * - [`removeAttr()`](http://api.jquery.com/removeAttr/) - * - [`removeClass()`](http://api.jquery.com/removeClass/) - * - [`removeData()`](http://api.jquery.com/removeData/) - * - [`replaceWith()`](http://api.jquery.com/replaceWith/) - * - [`text()`](http://api.jquery.com/text/) - * - [`toggleClass()`](http://api.jquery.com/toggleClass/) - * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers. - * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces or event object as parameter - * - [`val()`](http://api.jquery.com/val/) - * - [`wrap()`](http://api.jquery.com/wrap/) - * - * ## jQuery/jqLite Extras - * Angular also provides the following additional methods and events to both jQuery and jqLite: - * - * ### Events - * - `$destroy` - AngularJS intercepts all jqLite/jQuery's DOM destruction apis and fires this event - * on all DOM nodes being removed. This can be used to clean up any 3rd party bindings to the DOM - * element before it is removed. - * - * ### Methods - * - `controller(name)` - retrieves the controller of the current element or its parent. By default - * retrieves controller associated with the `ngController` directive. If `name` is provided as - * camelCase directive name, then the controller for this directive will be retrieved (e.g. - * `'ngModel'`). - * - `injector()` - retrieves the injector of the current element or its parent. - * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current - * element or its parent. Requires {@link guide/production#disabling-debug-data Debug Data} to - * be enabled. - * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the - * current element. This getter should be used only on elements that contain a directive which starts a new isolate - * scope. Calling `scope()` on this element always returns the original non-isolate scope. - * Requires {@link guide/production#disabling-debug-data Debug Data} to be enabled. - * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top - * parent element is reached. - * - * @knownIssue You cannot spy on `angular.element` if you are using Jasmine version 1.x. See - * https://github.com/angular/angular.js/issues/14251 for more information. - * - * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery. - * @returns {Object} jQuery object. - */ + /** + * @ngdoc function + * @name angular.element + * @module ng + * @kind function + * + * @description + * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element. + * + * If jQuery is available, `angular.element` is an alias for the + * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element` + * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or **jqLite**. + * + * jqLite is a tiny, API-compatible subset of jQuery that allows + * Angular to manipulate the DOM in a cross-browser compatible way. jqLite implements only the most + * commonly needed functionality with the goal of having a very small footprint. + * + * To use `jQuery`, simply ensure it is loaded before the `angular.js` file. You can also use the + * {@link ngJq `ngJq`} directive to specify that jqlite should be used over jQuery, or to use a + * specific version of jQuery if multiple versions exist on the page. + * + *
**Note:** All element references in Angular are always wrapped with jQuery or + * jqLite (such as the element argument in a directive's compile / link function). They are never raw DOM references.
+ * + *
**Note:** Keep in mind that this function will not find elements + * by tag name / CSS selector. For lookups by tag name, try instead `angular.element(document).find(...)` + * or `$document.find()`, or use the standard DOM APIs, e.g. `document.querySelectorAll()`.
+ * + * ## Angular's jqLite + * jqLite provides only the following jQuery methods: + * + * - [`addClass()`](http://api.jquery.com/addClass/) + * - [`after()`](http://api.jquery.com/after/) + * - [`append()`](http://api.jquery.com/append/) + * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters + * - [`bind()`](http://api.jquery.com/bind/) - Does not support namespaces, selectors or eventData + * - [`children()`](http://api.jquery.com/children/) - Does not support selectors + * - [`clone()`](http://api.jquery.com/clone/) + * - [`contents()`](http://api.jquery.com/contents/) + * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`. + * As a setter, does not convert numbers to strings or append 'px', and also does not have automatic property prefixing. + * - [`data()`](http://api.jquery.com/data/) + * - [`detach()`](http://api.jquery.com/detach/) + * - [`empty()`](http://api.jquery.com/empty/) + * - [`eq()`](http://api.jquery.com/eq/) + * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name + * - [`hasClass()`](http://api.jquery.com/hasClass/) + * - [`html()`](http://api.jquery.com/html/) + * - [`next()`](http://api.jquery.com/next/) - Does not support selectors + * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData + * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces, selectors or event object as parameter + * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors + * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors + * - [`prepend()`](http://api.jquery.com/prepend/) + * - [`prop()`](http://api.jquery.com/prop/) + * - [`ready()`](http://api.jquery.com/ready/) + * - [`remove()`](http://api.jquery.com/remove/) + * - [`removeAttr()`](http://api.jquery.com/removeAttr/) + * - [`removeClass()`](http://api.jquery.com/removeClass/) + * - [`removeData()`](http://api.jquery.com/removeData/) + * - [`replaceWith()`](http://api.jquery.com/replaceWith/) + * - [`text()`](http://api.jquery.com/text/) + * - [`toggleClass()`](http://api.jquery.com/toggleClass/) + * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers. + * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces or event object as parameter + * - [`val()`](http://api.jquery.com/val/) + * - [`wrap()`](http://api.jquery.com/wrap/) + * + * ## jQuery/jqLite Extras + * Angular also provides the following additional methods and events to both jQuery and jqLite: + * + * ### Events + * - `$destroy` - AngularJS intercepts all jqLite/jQuery's DOM destruction apis and fires this event + * on all DOM nodes being removed. This can be used to clean up any 3rd party bindings to the DOM + * element before it is removed. + * + * ### Methods + * - `controller(name)` - retrieves the controller of the current element or its parent. By default + * retrieves controller associated with the `ngController` directive. If `name` is provided as + * camelCase directive name, then the controller for this directive will be retrieved (e.g. + * `'ngModel'`). + * - `injector()` - retrieves the injector of the current element or its parent. + * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current + * element or its parent. Requires {@link guide/production#disabling-debug-data Debug Data} to + * be enabled. + * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the + * current element. This getter should be used only on elements that contain a directive which starts a new isolate + * scope. Calling `scope()` on this element always returns the original non-isolate scope. + * Requires {@link guide/production#disabling-debug-data Debug Data} to be enabled. + * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top + * parent element is reached. + * + * @knownIssue You cannot spy on `angular.element` if you are using Jasmine version 1.x. See + * https://github.com/angular/angular.js/issues/14251 for more information. + * + * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery. + * @returns {Object} jQuery object. + */ -JQLite.expando = 'ng339'; + JQLite.expando = 'ng339'; -var jqCache = JQLite.cache = {}, - jqId = 1, - addEventListenerFn = function(element, type, fn) { - element.addEventListener(type, fn, false); - }, - removeEventListenerFn = function(element, type, fn) { - element.removeEventListener(type, fn, false); - }; + var jqCache = JQLite.cache = {}, + jqId = 1, + addEventListenerFn = function (element, type, fn) { + element.addEventListener(type, fn, false); + }, + removeEventListenerFn = function (element, type, fn) { + element.removeEventListener(type, fn, false); + }; -/* + /* * !!! This is an undocumented "private" function !!! */ -JQLite._data = function(node) { - //jQuery always returns an object on cache miss - return this.cache[node[this.expando]] || {}; -}; + JQLite._data = function (node) { + //jQuery always returns an object on cache miss + return this.cache[node[this.expando]] || {}; + }; -function jqNextId() { return ++jqId; } + function jqNextId() { + return ++jqId; + } -var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g; -var MOZ_HACK_REGEXP = /^moz([A-Z])/; -var MOUSE_EVENT_MAP= { mouseleave: "mouseout", mouseenter: "mouseover"}; -var jqLiteMinErr = minErr('jqLite'); + var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g; + var MOZ_HACK_REGEXP = /^moz([A-Z])/; + var MOUSE_EVENT_MAP = {mouseleave: "mouseout", mouseenter: "mouseover"}; + var jqLiteMinErr = minErr('jqLite'); -/** - * Converts snake_case to camelCase. - * Also there is special case for Moz prefix starting with upper case letter. - * @param name Name to normalize - */ -function camelCase(name) { - return name. - replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) { - return offset ? letter.toUpperCase() : letter; - }). - replace(MOZ_HACK_REGEXP, 'Moz$1'); -} - -var SINGLE_TAG_REGEXP = /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/; -var HTML_REGEXP = /<|&#?\w+;/; -var TAG_NAME_REGEXP = /<([\w:-]+)/; -var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi; - -var wrapMap = { - 'option': [1, ''], - - 'thead': [1, '', '
'], - 'col': [2, '', '
'], - 'tr': [2, '', '
'], - 'td': [3, '', '
'], - '_default': [0, "", ""] -}; - -wrapMap.optgroup = wrapMap.option; -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - - -function jqLiteIsTextNode(html) { - return !HTML_REGEXP.test(html); -} - -function jqLiteAcceptsData(node) { - // The window object can accept data but has no nodeType - // Otherwise we are only interested in elements (1) and documents (9) - var nodeType = node.nodeType; - return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT; -} - -function jqLiteHasData(node) { - for (var key in jqCache[node.ng339]) { - return true; - } - return false; -} - -function jqLiteCleanData(nodes) { - for (var i = 0, ii = nodes.length; i < ii; i++) { - jqLiteRemoveData(nodes[i]); - } -} - -function jqLiteBuildFragment(html, context) { - var tmp, tag, wrap, - fragment = context.createDocumentFragment(), - nodes = [], i; - - if (jqLiteIsTextNode(html)) { - // Convert non-html into a text node - nodes.push(context.createTextNode(html)); - } else { - // Convert html into DOM nodes - tmp = tmp || fragment.appendChild(context.createElement("div")); - tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase(); - wrap = wrapMap[tag] || wrapMap._default; - tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1>") + wrap[2]; - - // Descend through wrappers to the right content - i = wrap[0]; - while (i--) { - tmp = tmp.lastChild; + /** + * Converts snake_case to camelCase. + * Also there is special case for Moz prefix starting with upper case letter. + * @param name Name to normalize + */ + function camelCase(name) { + return name.replace(SPECIAL_CHARS_REGEXP, function (_, separator, letter, offset) { + return offset ? letter.toUpperCase() : letter; + }).replace(MOZ_HACK_REGEXP, 'Moz$1'); } - nodes = concat(nodes, tmp.childNodes); + var SINGLE_TAG_REGEXP = /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/; + var HTML_REGEXP = /<|&#?\w+;/; + var TAG_NAME_REGEXP = /<([\w:-]+)/; + var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi; - tmp = fragment.firstChild; - tmp.textContent = ""; - } + var wrapMap = { + 'option': [1, ''], - // Remove wrapper from fragment - fragment.textContent = ""; - fragment.innerHTML = ""; // Clear inner HTML - forEach(nodes, function(node) { - fragment.appendChild(node); - }); + 'thead': [1, '', '
'], + 'col': [2, '', '
'], + 'tr': [2, '', '
'], + 'td': [3, '', '
'], + '_default': [0, "", ""] + }; + + wrapMap.optgroup = wrapMap.option; + wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; + wrapMap.th = wrapMap.td; - return fragment; -} -function jqLiteParseHTML(html, context) { - context = context || window.document; - var parsed; + function jqLiteIsTextNode(html) { + return !HTML_REGEXP.test(html); + } - if ((parsed = SINGLE_TAG_REGEXP.exec(html))) { - return [context.createElement(parsed[1])]; - } + function jqLiteAcceptsData(node) { + // The window object can accept data but has no nodeType + // Otherwise we are only interested in elements (1) and documents (9) + var nodeType = node.nodeType; + return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT; + } - if ((parsed = jqLiteBuildFragment(html, context))) { - return parsed.childNodes; - } + function jqLiteHasData(node) { + for (var key in jqCache[node.ng339]) { + return true; + } + return false; + } - return []; -} + function jqLiteCleanData(nodes) { + for (var i = 0, ii = nodes.length; i < ii; i++) { + jqLiteRemoveData(nodes[i]); + } + } -function jqLiteWrapNode(node, wrapper) { - var parent = node.parentNode; + function jqLiteBuildFragment(html, context) { + var tmp, tag, wrap, + fragment = context.createDocumentFragment(), + nodes = [], i; - if (parent) { - parent.replaceChild(wrapper, node); - } + if (jqLiteIsTextNode(html)) { + // Convert non-html into a text node + nodes.push(context.createTextNode(html)); + } else { + // Convert html into DOM nodes + tmp = tmp || fragment.appendChild(context.createElement("div")); + tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase(); + wrap = wrapMap[tag] || wrapMap._default; + tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1>") + wrap[2]; + + // Descend through wrappers to the right content + i = wrap[0]; + while (i--) { + tmp = tmp.lastChild; + } - wrapper.appendChild(node); -} + nodes = concat(nodes, tmp.childNodes); + tmp = fragment.firstChild; + tmp.textContent = ""; + } -// IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259. -var jqLiteContains = window.Node.prototype.contains || function(arg) { - // jshint bitwise: false - return !!(this.compareDocumentPosition(arg) & 16); - // jshint bitwise: true -}; + // Remove wrapper from fragment + fragment.textContent = ""; + fragment.innerHTML = ""; // Clear inner HTML + forEach(nodes, function (node) { + fragment.appendChild(node); + }); -///////////////////////////////////////////// -function JQLite(element) { - if (element instanceof JQLite) { - return element; - } - - var argIsString; - - if (isString(element)) { - element = trim(element); - argIsString = true; - } - if (!(this instanceof JQLite)) { - if (argIsString && element.charAt(0) != '<') { - throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element'); + return fragment; } - return new JQLite(element); - } - - if (argIsString) { - jqLiteAddNodes(this, jqLiteParseHTML(element)); - } else { - jqLiteAddNodes(this, element); - } -} - -function jqLiteClone(element) { - return element.cloneNode(true); -} - -function jqLiteDealoc(element, onlyDescendants) { - if (!onlyDescendants) jqLiteRemoveData(element); - - if (element.querySelectorAll) { - var descendants = element.querySelectorAll('*'); - for (var i = 0, l = descendants.length; i < l; i++) { - jqLiteRemoveData(descendants[i]); - } - } -} -function jqLiteOff(element, type, fn, unsupported) { - if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument'); + function jqLiteParseHTML(html, context) { + context = context || window.document; + var parsed; - var expandoStore = jqLiteExpandoStore(element); - var events = expandoStore && expandoStore.events; - var handle = expandoStore && expandoStore.handle; + if ((parsed = SINGLE_TAG_REGEXP.exec(html))) { + return [context.createElement(parsed[1])]; + } - if (!handle) return; //no listeners registered + if ((parsed = jqLiteBuildFragment(html, context))) { + return parsed.childNodes; + } - if (!type) { - for (type in events) { - if (type !== '$destroy') { - removeEventListenerFn(element, type, handle); - } - delete events[type]; + return []; } - } else { - - var removeHandler = function(type) { - var listenerFns = events[type]; - if (isDefined(fn)) { - arrayRemove(listenerFns || [], fn); - } - if (!(isDefined(fn) && listenerFns && listenerFns.length > 0)) { - removeEventListenerFn(element, type, handle); - delete events[type]; - } - }; - forEach(type.split(' '), function(type) { - removeHandler(type); - if (MOUSE_EVENT_MAP[type]) { - removeHandler(MOUSE_EVENT_MAP[type]); - } - }); - } -} + function jqLiteWrapNode(node, wrapper) { + var parent = node.parentNode; -function jqLiteRemoveData(element, name) { - var expandoId = element.ng339; - var expandoStore = expandoId && jqCache[expandoId]; + if (parent) { + parent.replaceChild(wrapper, node); + } - if (expandoStore) { - if (name) { - delete expandoStore.data[name]; - return; + wrapper.appendChild(node); } - if (expandoStore.handle) { - if (expandoStore.events.$destroy) { - expandoStore.handle({}, '$destroy'); - } - jqLiteOff(element); - } - delete jqCache[expandoId]; - element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it - } -} +// IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259. + var jqLiteContains = window.Node.prototype.contains || function (arg) { + // jshint bitwise: false + return !!(this.compareDocumentPosition(arg) & 16); + // jshint bitwise: true + }; -function jqLiteExpandoStore(element, createIfNecessary) { - var expandoId = element.ng339, - expandoStore = expandoId && jqCache[expandoId]; +///////////////////////////////////////////// + function JQLite(element) { + if (element instanceof JQLite) { + return element; + } - if (createIfNecessary && !expandoStore) { - element.ng339 = expandoId = jqNextId(); - expandoStore = jqCache[expandoId] = {events: {}, data: {}, handle: undefined}; - } + var argIsString; - return expandoStore; -} + if (isString(element)) { + element = trim(element); + argIsString = true; + } + if (!(this instanceof JQLite)) { + if (argIsString && element.charAt(0) != '<') { + throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element'); + } + return new JQLite(element); + } + if (argIsString) { + jqLiteAddNodes(this, jqLiteParseHTML(element)); + } else { + jqLiteAddNodes(this, element); + } + } -function jqLiteData(element, key, value) { - if (jqLiteAcceptsData(element)) { + function jqLiteClone(element) { + return element.cloneNode(true); + } - var isSimpleSetter = isDefined(value); - var isSimpleGetter = !isSimpleSetter && key && !isObject(key); - var massGetter = !key; - var expandoStore = jqLiteExpandoStore(element, !isSimpleGetter); - var data = expandoStore && expandoStore.data; + function jqLiteDealoc(element, onlyDescendants) { + if (!onlyDescendants) jqLiteRemoveData(element); - if (isSimpleSetter) { // data('key', value) - data[key] = value; - } else { - if (massGetter) { // data() - return data; - } else { - if (isSimpleGetter) { // data('key') - // don't force creation of expandoStore if it doesn't exist yet - return data && data[key]; - } else { // mass-setter: data({key1: val1, key2: val2}) - extend(data, key); + if (element.querySelectorAll) { + var descendants = element.querySelectorAll('*'); + for (var i = 0, l = descendants.length; i < l; i++) { + jqLiteRemoveData(descendants[i]); + } } - } } - } -} - -function jqLiteHasClass(element, selector) { - if (!element.getAttribute) return false; - return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " "). - indexOf(" " + selector + " ") > -1); -} - -function jqLiteRemoveClass(element, cssClasses) { - if (cssClasses && element.setAttribute) { - forEach(cssClasses.split(' '), function(cssClass) { - element.setAttribute('class', trim( - (" " + (element.getAttribute('class') || '') + " ") - .replace(/[\n\t]/g, " ") - .replace(" " + trim(cssClass) + " ", " ")) - ); - }); - } -} - -function jqLiteAddClass(element, cssClasses) { - if (cssClasses && element.setAttribute) { - var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ') - .replace(/[\n\t]/g, " "); - - forEach(cssClasses.split(' '), function(cssClass) { - cssClass = trim(cssClass); - if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) { - existingClasses += cssClass + ' '; - } - }); - element.setAttribute('class', trim(existingClasses)); - } -} + function jqLiteOff(element, type, fn, unsupported) { + if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument'); + var expandoStore = jqLiteExpandoStore(element); + var events = expandoStore && expandoStore.events; + var handle = expandoStore && expandoStore.handle; -function jqLiteAddNodes(root, elements) { - // THIS CODE IS VERY HOT. Don't make changes without benchmarking. + if (!handle) return; //no listeners registered - if (elements) { + if (!type) { + for (type in events) { + if (type !== '$destroy') { + removeEventListenerFn(element, type, handle); + } + delete events[type]; + } + } else { - // if a Node (the most common case) - if (elements.nodeType) { - root[root.length++] = elements; - } else { - var length = elements.length; + var removeHandler = function (type) { + var listenerFns = events[type]; + if (isDefined(fn)) { + arrayRemove(listenerFns || [], fn); + } + if (!(isDefined(fn) && listenerFns && listenerFns.length > 0)) { + removeEventListenerFn(element, type, handle); + delete events[type]; + } + }; - // if an Array or NodeList and not a Window - if (typeof length === 'number' && elements.window !== elements) { - if (length) { - for (var i = 0; i < length; i++) { - root[root.length++] = elements[i]; - } + forEach(type.split(' '), function (type) { + removeHandler(type); + if (MOUSE_EVENT_MAP[type]) { + removeHandler(MOUSE_EVENT_MAP[type]); + } + }); } - } else { - root[root.length++] = elements; - } } - } -} + function jqLiteRemoveData(element, name) { + var expandoId = element.ng339; + var expandoStore = expandoId && jqCache[expandoId]; -function jqLiteController(element, name) { - return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller'); -} - -function jqLiteInheritedData(element, name, value) { - // if element is the document object work with the html element instead - // this makes $(document).scope() possible - if (element.nodeType == NODE_TYPE_DOCUMENT) { - element = element.documentElement; - } - var names = isArray(name) ? name : [name]; + if (expandoStore) { + if (name) { + delete expandoStore.data[name]; + return; + } - while (element) { - for (var i = 0, ii = names.length; i < ii; i++) { - if (isDefined(value = jqLite.data(element, names[i]))) return value; + if (expandoStore.handle) { + if (expandoStore.events.$destroy) { + expandoStore.handle({}, '$destroy'); + } + jqLiteOff(element); + } + delete jqCache[expandoId]; + element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it + } } - // If dealing with a document fragment node with a host element, and no parent, use the host - // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM - // to lookup parent controllers. - element = element.parentNode || (element.nodeType === NODE_TYPE_DOCUMENT_FRAGMENT && element.host); - } -} - -function jqLiteEmpty(element) { - jqLiteDealoc(element, true); - while (element.firstChild) { - element.removeChild(element.firstChild); - } -} - -function jqLiteRemove(element, keepData) { - if (!keepData) jqLiteDealoc(element); - var parent = element.parentNode; - if (parent) parent.removeChild(element); -} - - -function jqLiteDocumentLoaded(action, win) { - win = win || window; - if (win.document.readyState === 'complete') { - // Force the action to be run async for consistent behavior - // from the action's point of view - // i.e. it will definitely not be in a $apply - win.setTimeout(action); - } else { - // No need to unbind this handler as load is only ever called once - jqLite(win).on('load', action); - } -} -////////////////////////////////////////// -// Functions which are declared directly. -////////////////////////////////////////// -var JQLitePrototype = JQLite.prototype = { - ready: function(fn) { - var fired = false; - - function trigger() { - if (fired) return; - fired = true; - fn(); - } + function jqLiteExpandoStore(element, createIfNecessary) { + var expandoId = element.ng339, + expandoStore = expandoId && jqCache[expandoId]; - // check if document is already loaded - if (window.document.readyState === 'complete') { - window.setTimeout(trigger); - } else { - this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9 - // we can not use jqLite since we are not done loading and jQuery could be loaded later. - // jshint -W064 - JQLite(window).on('load', trigger); // fallback to window.onload for others - // jshint +W064 - } - }, - toString: function() { - var value = []; - forEach(this, function(e) { value.push('' + e);}); - return '[' + value.join(', ') + ']'; - }, - - eq: function(index) { - return (index >= 0) ? jqLite(this[index]) : jqLite(this[this.length + index]); - }, - - length: 0, - push: push, - sort: [].sort, - splice: [].splice -}; + if (createIfNecessary && !expandoStore) { + element.ng339 = expandoId = jqNextId(); + expandoStore = jqCache[expandoId] = {events: {}, data: {}, handle: undefined}; + } -////////////////////////////////////////// -// Functions iterating getter/setters. -// these functions return self on setter and -// value on get. -////////////////////////////////////////// -var BOOLEAN_ATTR = {}; -forEach('multiple,selected,checked,disabled,readOnly,required,open'.split(','), function(value) { - BOOLEAN_ATTR[lowercase(value)] = value; -}); -var BOOLEAN_ELEMENTS = {}; -forEach('input,select,option,textarea,button,form,details'.split(','), function(value) { - BOOLEAN_ELEMENTS[value] = true; -}); -var ALIASED_ATTR = { - 'ngMinlength': 'minlength', - 'ngMaxlength': 'maxlength', - 'ngMin': 'min', - 'ngMax': 'max', - 'ngPattern': 'pattern' -}; - -function getBooleanAttrName(element, name) { - // check dom last since we will most likely fail on name - var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()]; - - // booleanAttr is here twice to minimize DOM access - return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr; -} - -function getAliasedAttrName(name) { - return ALIASED_ATTR[name]; -} - -forEach({ - data: jqLiteData, - removeData: jqLiteRemoveData, - hasData: jqLiteHasData, - cleanData: jqLiteCleanData -}, function(fn, name) { - JQLite[name] = fn; -}); - -forEach({ - data: jqLiteData, - inheritedData: jqLiteInheritedData, - - scope: function(element) { - // Can't use jqLiteData here directly so we stay compatible with jQuery! - return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']); - }, - - isolateScope: function(element) { - // Can't use jqLiteData here directly so we stay compatible with jQuery! - return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate'); - }, - - controller: jqLiteController, - - injector: function(element) { - return jqLiteInheritedData(element, '$injector'); - }, - - removeAttr: function(element, name) { - element.removeAttribute(name); - }, - - hasClass: jqLiteHasClass, - - css: function(element, name, value) { - name = camelCase(name); - - if (isDefined(value)) { - element.style[name] = value; - } else { - return element.style[name]; + return expandoStore; } - }, - attr: function(element, name, value) { - var nodeType = element.nodeType; - if (nodeType === NODE_TYPE_TEXT || nodeType === NODE_TYPE_ATTRIBUTE || nodeType === NODE_TYPE_COMMENT) { - return; - } - var lowercasedName = lowercase(name); - if (BOOLEAN_ATTR[lowercasedName]) { - if (isDefined(value)) { - if (!!value) { - element[name] = true; - element.setAttribute(name, lowercasedName); - } else { - element[name] = false; - element.removeAttribute(lowercasedName); + + function jqLiteData(element, key, value) { + if (jqLiteAcceptsData(element)) { + + var isSimpleSetter = isDefined(value); + var isSimpleGetter = !isSimpleSetter && key && !isObject(key); + var massGetter = !key; + var expandoStore = jqLiteExpandoStore(element, !isSimpleGetter); + var data = expandoStore && expandoStore.data; + + if (isSimpleSetter) { // data('key', value) + data[key] = value; + } else { + if (massGetter) { // data() + return data; + } else { + if (isSimpleGetter) { // data('key') + // don't force creation of expandoStore if it doesn't exist yet + return data && data[key]; + } else { // mass-setter: data({key1: val1, key2: val2}) + extend(data, key); + } + } + } } - } else { - return (element[name] || - (element.attributes.getNamedItem(name) || noop).specified) - ? lowercasedName - : undefined; - } - } else if (isDefined(value)) { - element.setAttribute(name, value); - } else if (element.getAttribute) { - // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code - // some elements (e.g. Document) don't have get attribute, so return undefined - var ret = element.getAttribute(name, 2); - // normalize non-existing attributes to undefined (as jQuery) - return ret === null ? undefined : ret; } - }, - prop: function(element, name, value) { - if (isDefined(value)) { - element[name] = value; - } else { - return element[name]; + function jqLiteHasClass(element, selector) { + if (!element.getAttribute) return false; + return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " ").indexOf(" " + selector + " ") > -1); } - }, - text: (function() { - getText.$dv = ''; - return getText; + function jqLiteRemoveClass(element, cssClasses) { + if (cssClasses && element.setAttribute) { + forEach(cssClasses.split(' '), function (cssClass) { + element.setAttribute('class', trim( + (" " + (element.getAttribute('class') || '') + " ") + .replace(/[\n\t]/g, " ") + .replace(" " + trim(cssClass) + " ", " ")) + ); + }); + } + } - function getText(element, value) { - if (isUndefined(value)) { - var nodeType = element.nodeType; - return (nodeType === NODE_TYPE_ELEMENT || nodeType === NODE_TYPE_TEXT) ? element.textContent : ''; - } - element.textContent = value; - } - })(), - - val: function(element, value) { - if (isUndefined(value)) { - if (element.multiple && nodeName_(element) === 'select') { - var result = []; - forEach(element.options, function(option) { - if (option.selected) { - result.push(option.value || option.text); - } - }); - return result.length === 0 ? null : result; - } - return element.value; - } - element.value = value; - }, + function jqLiteAddClass(element, cssClasses) { + if (cssClasses && element.setAttribute) { + var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ') + .replace(/[\n\t]/g, " "); + + forEach(cssClasses.split(' '), function (cssClass) { + cssClass = trim(cssClass); + if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) { + existingClasses += cssClass + ' '; + } + }); - html: function(element, value) { - if (isUndefined(value)) { - return element.innerHTML; + element.setAttribute('class', trim(existingClasses)); + } } - jqLiteDealoc(element, true); - element.innerHTML = value; - }, - - empty: jqLiteEmpty -}, function(fn, name) { - /** - * Properties: writes return selection, reads return first value - */ - JQLite.prototype[name] = function(arg1, arg2) { - var i, key; - var nodeCount = this.length; - - // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it - // in a way that survives minification. - // jqLiteEmpty takes no arguments but is a setter. - if (fn !== jqLiteEmpty && - (isUndefined((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2))) { - if (isObject(arg1)) { - - // we are a write, but the object properties are the key/values - for (i = 0; i < nodeCount; i++) { - if (fn === jqLiteData) { - // data() takes the whole object in jQuery - fn(this[i], arg1); - } else { - for (key in arg1) { - fn(this[i], key, arg1[key]); + + + function jqLiteAddNodes(root, elements) { + // THIS CODE IS VERY HOT. Don't make changes without benchmarking. + + if (elements) { + + // if a Node (the most common case) + if (elements.nodeType) { + root[root.length++] = elements; + } else { + var length = elements.length; + + // if an Array or NodeList and not a Window + if (typeof length === 'number' && elements.window !== elements) { + if (length) { + for (var i = 0; i < length; i++) { + root[root.length++] = elements[i]; + } + } + } else { + root[root.length++] = elements; + } } - } } - // return self for chaining - return this; - } else { - // we are a read, so read the first child. - // TODO: do we still need this? - var value = fn.$dv; - // Only if we have $dv do we iterate over all, otherwise it is just the first element. - var jj = (isUndefined(value)) ? Math.min(nodeCount, 1) : nodeCount; - for (var j = 0; j < jj; j++) { - var nodeValue = fn(this[j], arg1, arg2); - value = value ? value + nodeValue : nodeValue; - } - return value; - } - } else { - // we are a write, so apply to all children - for (i = 0; i < nodeCount; i++) { - fn(this[i], arg1, arg2); - } - // return self for chaining - return this; } - }; -}); - -function createEventHandler(element, events) { - var eventHandler = function(event, type) { - // jQuery specific api - event.isDefaultPrevented = function() { - return event.defaultPrevented; - }; - var eventFns = events[type || event.type]; - var eventFnsLength = eventFns ? eventFns.length : 0; - if (!eventFnsLength) return; + function jqLiteController(element, name) { + return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller'); + } + + function jqLiteInheritedData(element, name, value) { + // if element is the document object work with the html element instead + // this makes $(document).scope() possible + if (element.nodeType == NODE_TYPE_DOCUMENT) { + element = element.documentElement; + } + var names = isArray(name) ? name : [name]; - if (isUndefined(event.immediatePropagationStopped)) { - var originalStopImmediatePropagation = event.stopImmediatePropagation; - event.stopImmediatePropagation = function() { - event.immediatePropagationStopped = true; + while (element) { + for (var i = 0, ii = names.length; i < ii; i++) { + if (isDefined(value = jqLite.data(element, names[i]))) return value; + } - if (event.stopPropagation) { - event.stopPropagation(); + // If dealing with a document fragment node with a host element, and no parent, use the host + // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM + // to lookup parent controllers. + element = element.parentNode || (element.nodeType === NODE_TYPE_DOCUMENT_FRAGMENT && element.host); } + } - if (originalStopImmediatePropagation) { - originalStopImmediatePropagation.call(event); + function jqLiteEmpty(element) { + jqLiteDealoc(element, true); + while (element.firstChild) { + element.removeChild(element.firstChild); } - }; } - event.isImmediatePropagationStopped = function() { - return event.immediatePropagationStopped === true; - }; + function jqLiteRemove(element, keepData) { + if (!keepData) jqLiteDealoc(element); + var parent = element.parentNode; + if (parent) parent.removeChild(element); + } - // Some events have special handlers that wrap the real handler - var handlerWrapper = eventFns.specialHandlerWrapper || defaultHandlerWrapper; - // Copy event handlers in case event handlers array is modified during execution. - if ((eventFnsLength > 1)) { - eventFns = shallowCopy(eventFns); + function jqLiteDocumentLoaded(action, win) { + win = win || window; + if (win.document.readyState === 'complete') { + // Force the action to be run async for consistent behavior + // from the action's point of view + // i.e. it will definitely not be in a $apply + win.setTimeout(action); + } else { + // No need to unbind this handler as load is only ever called once + jqLite(win).on('load', action); + } } - for (var i = 0; i < eventFnsLength; i++) { - if (!event.isImmediatePropagationStopped()) { - handlerWrapper(element, event, eventFns[i]); - } - } - }; - - // TODO: this is a hack for angularMocks/clearDataCache that makes it possible to deregister all - // events on `element` - eventHandler.elem = element; - return eventHandler; -} - -function defaultHandlerWrapper(element, event, handler) { - handler.call(element, event); -} - -function specialMouseHandlerWrapper(target, event, handler) { - // Refer to jQuery's implementation of mouseenter & mouseleave - // Read about mouseenter and mouseleave: - // http://www.quirksmode.org/js/events_mouse.html#link8 - var related = event.relatedTarget; - // For mousenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if (!related || (related !== target && !jqLiteContains.call(target, related))) { - handler.call(target, event); - } -} +////////////////////////////////////////// +// Functions which are declared directly. +////////////////////////////////////////// + var JQLitePrototype = JQLite.prototype = { + ready: function (fn) { + var fired = false; + + function trigger() { + if (fired) return; + fired = true; + fn(); + } + + // check if document is already loaded + if (window.document.readyState === 'complete') { + window.setTimeout(trigger); + } else { + this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9 + // we can not use jqLite since we are not done loading and jQuery could be loaded later. + // jshint -W064 + JQLite(window).on('load', trigger); // fallback to window.onload for others + // jshint +W064 + } + }, + toString: function () { + var value = []; + forEach(this, function (e) { + value.push('' + e); + }); + return '[' + value.join(', ') + ']'; + }, + + eq: function (index) { + return (index >= 0) ? jqLite(this[index]) : jqLite(this[this.length + index]); + }, + + length: 0, + push: push, + sort: [].sort, + splice: [].splice + }; ////////////////////////////////////////// -// Functions iterating traversal. -// These functions chain results into a single -// selector. +// Functions iterating getter/setters. +// these functions return self on setter and +// value on get. ////////////////////////////////////////// -forEach({ - removeData: jqLiteRemoveData, + var BOOLEAN_ATTR = {}; + forEach('multiple,selected,checked,disabled,readOnly,required,open'.split(','), function (value) { + BOOLEAN_ATTR[lowercase(value)] = value; + }); + var BOOLEAN_ELEMENTS = {}; + forEach('input,select,option,textarea,button,form,details'.split(','), function (value) { + BOOLEAN_ELEMENTS[value] = true; + }); + var ALIASED_ATTR = { + 'ngMinlength': 'minlength', + 'ngMaxlength': 'maxlength', + 'ngMin': 'min', + 'ngMax': 'max', + 'ngPattern': 'pattern' + }; - on: function jqLiteOn(element, type, fn, unsupported) { - if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters'); + function getBooleanAttrName(element, name) { + // check dom last since we will most likely fail on name + var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()]; - // Do not add event handlers to non-elements because they will not be cleaned up. - if (!jqLiteAcceptsData(element)) { - return; + // booleanAttr is here twice to minimize DOM access + return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr; } - var expandoStore = jqLiteExpandoStore(element, true); - var events = expandoStore.events; - var handle = expandoStore.handle; - - if (!handle) { - handle = expandoStore.handle = createEventHandler(element, events); + function getAliasedAttrName(name) { + return ALIASED_ATTR[name]; } - // http://jsperf.com/string-indexof-vs-split - var types = type.indexOf(' ') >= 0 ? type.split(' ') : [type]; - var i = types.length; + forEach({ + data: jqLiteData, + removeData: jqLiteRemoveData, + hasData: jqLiteHasData, + cleanData: jqLiteCleanData + }, function (fn, name) { + JQLite[name] = fn; + }); - var addHandler = function(type, specialHandlerWrapper, noEventListener) { - var eventFns = events[type]; + forEach({ + data: jqLiteData, + inheritedData: jqLiteInheritedData, - if (!eventFns) { - eventFns = events[type] = []; - eventFns.specialHandlerWrapper = specialHandlerWrapper; - if (type !== '$destroy' && !noEventListener) { - addEventListenerFn(element, type, handle); - } - } + scope: function (element) { + // Can't use jqLiteData here directly so we stay compatible with jQuery! + return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']); + }, - eventFns.push(fn); - }; + isolateScope: function (element) { + // Can't use jqLiteData here directly so we stay compatible with jQuery! + return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate'); + }, - while (i--) { - type = types[i]; - if (MOUSE_EVENT_MAP[type]) { - addHandler(MOUSE_EVENT_MAP[type], specialMouseHandlerWrapper); - addHandler(type, undefined, true); - } else { - addHandler(type); - } - } - }, + controller: jqLiteController, - off: jqLiteOff, + injector: function (element) { + return jqLiteInheritedData(element, '$injector'); + }, - one: function(element, type, fn) { - element = jqLite(element); + removeAttr: function (element, name) { + element.removeAttribute(name); + }, - //add the listener twice so that when it is called - //you can remove the original function and still be - //able to call element.off(ev, fn) normally - element.on(type, function onFn() { - element.off(type, fn); - element.off(type, onFn); - }); - element.on(type, fn); - }, - - replaceWith: function(element, replaceNode) { - var index, parent = element.parentNode; - jqLiteDealoc(element); - forEach(new JQLite(replaceNode), function(node) { - if (index) { - parent.insertBefore(node, index.nextSibling); - } else { - parent.replaceChild(node, element); - } - index = node; - }); - }, + hasClass: jqLiteHasClass, - children: function(element) { - var children = []; - forEach(element.childNodes, function(element) { - if (element.nodeType === NODE_TYPE_ELEMENT) { - children.push(element); - } + css: function (element, name, value) { + name = camelCase(name); + + if (isDefined(value)) { + element.style[name] = value; + } else { + return element.style[name]; + } + }, + + attr: function (element, name, value) { + var nodeType = element.nodeType; + if (nodeType === NODE_TYPE_TEXT || nodeType === NODE_TYPE_ATTRIBUTE || nodeType === NODE_TYPE_COMMENT) { + return; + } + var lowercasedName = lowercase(name); + if (BOOLEAN_ATTR[lowercasedName]) { + if (isDefined(value)) { + if (!!value) { + element[name] = true; + element.setAttribute(name, lowercasedName); + } else { + element[name] = false; + element.removeAttribute(lowercasedName); + } + } else { + return (element[name] || + (element.attributes.getNamedItem(name) || noop).specified) + ? lowercasedName + : undefined; + } + } else if (isDefined(value)) { + element.setAttribute(name, value); + } else if (element.getAttribute) { + // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code + // some elements (e.g. Document) don't have get attribute, so return undefined + var ret = element.getAttribute(name, 2); + // normalize non-existing attributes to undefined (as jQuery) + return ret === null ? undefined : ret; + } + }, + + prop: function (element, name, value) { + if (isDefined(value)) { + element[name] = value; + } else { + return element[name]; + } + }, + + text: (function () { + getText.$dv = ''; + return getText; + + function getText(element, value) { + if (isUndefined(value)) { + var nodeType = element.nodeType; + return (nodeType === NODE_TYPE_ELEMENT || nodeType === NODE_TYPE_TEXT) ? element.textContent : ''; + } + element.textContent = value; + } + })(), + + val: function (element, value) { + if (isUndefined(value)) { + if (element.multiple && nodeName_(element) === 'select') { + var result = []; + forEach(element.options, function (option) { + if (option.selected) { + result.push(option.value || option.text); + } + }); + return result.length === 0 ? null : result; + } + return element.value; + } + element.value = value; + }, + + html: function (element, value) { + if (isUndefined(value)) { + return element.innerHTML; + } + jqLiteDealoc(element, true); + element.innerHTML = value; + }, + + empty: jqLiteEmpty + }, function (fn, name) { + /** + * Properties: writes return selection, reads return first value + */ + JQLite.prototype[name] = function (arg1, arg2) { + var i, key; + var nodeCount = this.length; + + // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it + // in a way that survives minification. + // jqLiteEmpty takes no arguments but is a setter. + if (fn !== jqLiteEmpty && + (isUndefined((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2))) { + if (isObject(arg1)) { + + // we are a write, but the object properties are the key/values + for (i = 0; i < nodeCount; i++) { + if (fn === jqLiteData) { + // data() takes the whole object in jQuery + fn(this[i], arg1); + } else { + for (key in arg1) { + fn(this[i], key, arg1[key]); + } + } + } + // return self for chaining + return this; + } else { + // we are a read, so read the first child. + // TODO: do we still need this? + var value = fn.$dv; + // Only if we have $dv do we iterate over all, otherwise it is just the first element. + var jj = (isUndefined(value)) ? Math.min(nodeCount, 1) : nodeCount; + for (var j = 0; j < jj; j++) { + var nodeValue = fn(this[j], arg1, arg2); + value = value ? value + nodeValue : nodeValue; + } + return value; + } + } else { + // we are a write, so apply to all children + for (i = 0; i < nodeCount; i++) { + fn(this[i], arg1, arg2); + } + // return self for chaining + return this; + } + }; }); - return children; - }, - contents: function(element) { - return element.contentDocument || element.childNodes || []; - }, + function createEventHandler(element, events) { + var eventHandler = function (event, type) { + // jQuery specific api + event.isDefaultPrevented = function () { + return event.defaultPrevented; + }; + + var eventFns = events[type || event.type]; + var eventFnsLength = eventFns ? eventFns.length : 0; - append: function(element, node) { - var nodeType = element.nodeType; - if (nodeType !== NODE_TYPE_ELEMENT && nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT) return; + if (!eventFnsLength) return; - node = new JQLite(node); + if (isUndefined(event.immediatePropagationStopped)) { + var originalStopImmediatePropagation = event.stopImmediatePropagation; + event.stopImmediatePropagation = function () { + event.immediatePropagationStopped = true; - for (var i = 0, ii = node.length; i < ii; i++) { - var child = node[i]; - element.appendChild(child); - } - }, + if (event.stopPropagation) { + event.stopPropagation(); + } - prepend: function(element, node) { - if (element.nodeType === NODE_TYPE_ELEMENT) { - var index = element.firstChild; - forEach(new JQLite(node), function(child) { - element.insertBefore(child, index); - }); - } - }, + if (originalStopImmediatePropagation) { + originalStopImmediatePropagation.call(event); + } + }; + } - wrap: function(element, wrapNode) { - jqLiteWrapNode(element, jqLite(wrapNode).eq(0).clone()[0]); - }, + event.isImmediatePropagationStopped = function () { + return event.immediatePropagationStopped === true; + }; - remove: jqLiteRemove, + // Some events have special handlers that wrap the real handler + var handlerWrapper = eventFns.specialHandlerWrapper || defaultHandlerWrapper; - detach: function(element) { - jqLiteRemove(element, true); - }, + // Copy event handlers in case event handlers array is modified during execution. + if ((eventFnsLength > 1)) { + eventFns = shallowCopy(eventFns); + } - after: function(element, newElement) { - var index = element, parent = element.parentNode; - newElement = new JQLite(newElement); + for (var i = 0; i < eventFnsLength; i++) { + if (!event.isImmediatePropagationStopped()) { + handlerWrapper(element, event, eventFns[i]); + } + } + }; - for (var i = 0, ii = newElement.length; i < ii; i++) { - var node = newElement[i]; - parent.insertBefore(node, index.nextSibling); - index = node; + // TODO: this is a hack for angularMocks/clearDataCache that makes it possible to deregister all + // events on `element` + eventHandler.elem = element; + return eventHandler; } - }, - addClass: jqLiteAddClass, - removeClass: jqLiteRemoveClass, + function defaultHandlerWrapper(element, event, handler) { + handler.call(element, event); + } - toggleClass: function(element, selector, condition) { - if (selector) { - forEach(selector.split(' '), function(className) { - var classCondition = condition; - if (isUndefined(classCondition)) { - classCondition = !jqLiteHasClass(element, className); + function specialMouseHandlerWrapper(target, event, handler) { + // Refer to jQuery's implementation of mouseenter & mouseleave + // Read about mouseenter and mouseleave: + // http://www.quirksmode.org/js/events_mouse.html#link8 + var related = event.relatedTarget; + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if (!related || (related !== target && !jqLiteContains.call(target, related))) { + handler.call(target, event); } - (classCondition ? jqLiteAddClass : jqLiteRemoveClass)(element, className); - }); - } - }, - - parent: function(element) { - var parent = element.parentNode; - return parent && parent.nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT ? parent : null; - }, - - next: function(element) { - return element.nextElementSibling; - }, - - find: function(element, selector) { - if (element.getElementsByTagName) { - return element.getElementsByTagName(selector); - } else { - return []; } - }, - - clone: jqLiteClone, - - triggerHandler: function(element, event, extraParameters) { - - var dummyEvent, eventFnsCopy, handlerArgs; - var eventName = event.type || event; - var expandoStore = jqLiteExpandoStore(element); - var events = expandoStore && expandoStore.events; - var eventFns = events && events[eventName]; - - if (eventFns) { - // Create a dummy event to pass to the handlers - dummyEvent = { - preventDefault: function() { this.defaultPrevented = true; }, - isDefaultPrevented: function() { return this.defaultPrevented === true; }, - stopImmediatePropagation: function() { this.immediatePropagationStopped = true; }, - isImmediatePropagationStopped: function() { return this.immediatePropagationStopped === true; }, - stopPropagation: noop, - type: eventName, - target: element - }; - // If a custom event was provided then extend our dummy event with it - if (event.type) { - dummyEvent = extend(dummyEvent, event); - } +////////////////////////////////////////// +// Functions iterating traversal. +// These functions chain results into a single +// selector. +////////////////////////////////////////// + forEach({ + removeData: jqLiteRemoveData, - // Copy event handlers in case event handlers array is modified during execution. - eventFnsCopy = shallowCopy(eventFns); - handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent]; + on: function jqLiteOn(element, type, fn, unsupported) { + if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters'); - forEach(eventFnsCopy, function(fn) { - if (!dummyEvent.isImmediatePropagationStopped()) { - fn.apply(element, handlerArgs); - } - }); - } - } -}, function(fn, name) { - /** - * chaining functions - */ - JQLite.prototype[name] = function(arg1, arg2, arg3) { - var value; - - for (var i = 0, ii = this.length; i < ii; i++) { - if (isUndefined(value)) { - value = fn(this[i], arg1, arg2, arg3); - if (isDefined(value)) { - // any function which returns a value needs to be wrapped - value = jqLite(value); - } - } else { - jqLiteAddNodes(value, fn(this[i], arg1, arg2, arg3)); - } - } - return isDefined(value) ? value : this; - }; + // Do not add event handlers to non-elements because they will not be cleaned up. + if (!jqLiteAcceptsData(element)) { + return; + } - // bind legacy bind/unbind to on/off - JQLite.prototype.bind = JQLite.prototype.on; - JQLite.prototype.unbind = JQLite.prototype.off; -}); + var expandoStore = jqLiteExpandoStore(element, true); + var events = expandoStore.events; + var handle = expandoStore.handle; + if (!handle) { + handle = expandoStore.handle = createEventHandler(element, events); + } -// Provider for private $$jqLite service -function $$jqLiteProvider() { - this.$get = function $$jqLite() { - return extend(JQLite, { - hasClass: function(node, classes) { - if (node.attr) node = node[0]; - return jqLiteHasClass(node, classes); - }, - addClass: function(node, classes) { - if (node.attr) node = node[0]; - return jqLiteAddClass(node, classes); - }, - removeClass: function(node, classes) { - if (node.attr) node = node[0]; - return jqLiteRemoveClass(node, classes); - } - }); - }; -} + // http://jsperf.com/string-indexof-vs-split + var types = type.indexOf(' ') >= 0 ? type.split(' ') : [type]; + var i = types.length; -/** - * Computes a hash of an 'obj'. - * Hash of a: - * string is string - * number is number as string - * object is either result of calling $$hashKey function on the object or uniquely generated id, - * that is also assigned to the $$hashKey property of the object. - * - * @param obj - * @returns {string} hash string such that the same input will have the same hash string. - * The resulting string key is in 'type:hashKey' format. - */ -function hashKey(obj, nextUidFn) { - var key = obj && obj.$$hashKey; + var addHandler = function (type, specialHandlerWrapper, noEventListener) { + var eventFns = events[type]; - if (key) { - if (typeof key === 'function') { - key = obj.$$hashKey(); - } - return key; - } + if (!eventFns) { + eventFns = events[type] = []; + eventFns.specialHandlerWrapper = specialHandlerWrapper; + if (type !== '$destroy' && !noEventListener) { + addEventListenerFn(element, type, handle); + } + } - var objType = typeof obj; - if (objType == 'function' || (objType == 'object' && obj !== null)) { - key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)(); - } else { - key = objType + ':' + obj; - } + eventFns.push(fn); + }; - return key; -} + while (i--) { + type = types[i]; + if (MOUSE_EVENT_MAP[type]) { + addHandler(MOUSE_EVENT_MAP[type], specialMouseHandlerWrapper); + addHandler(type, undefined, true); + } else { + addHandler(type); + } + } + }, -/** - * HashMap which can use objects as keys - */ -function HashMap(array, isolatedUid) { - if (isolatedUid) { - var uid = 0; - this.nextUid = function() { - return ++uid; - }; - } - forEach(array, this.put, this); -} -HashMap.prototype = { - /** - * Store key value pair - * @param key key to store can be any type - * @param value value to store can be any type - */ - put: function(key, value) { - this[hashKey(key, this.nextUid)] = value; - }, + off: jqLiteOff, - /** - * @param key - * @returns {Object} the value for the key - */ - get: function(key) { - return this[hashKey(key, this.nextUid)]; - }, + one: function (element, type, fn) { + element = jqLite(element); - /** - * Remove the key/value pair - * @param key - */ - remove: function(key) { - var value = this[key = hashKey(key, this.nextUid)]; - delete this[key]; - return value; - } -}; - -var $$HashMapProvider = [function() { - this.$get = [function() { - return HashMap; - }]; -}]; + //add the listener twice so that when it is called + //you can remove the original function and still be + //able to call element.off(ev, fn) normally + element.on(type, function onFn() { + element.off(type, fn); + element.off(type, onFn); + }); + element.on(type, fn); + }, -/** - * @ngdoc function - * @module ng - * @name angular.injector - * @kind function - * - * @description - * Creates an injector object that can be used for retrieving services as well as for - * dependency injection (see {@link guide/di dependency injection}). - * - * @param {Array.} modules A list of module functions or their aliases. See - * {@link angular.module}. The `ng` module must be explicitly added. - * @param {boolean=} [strictDi=false] Whether the injector should be in strict mode, which - * disallows argument name annotation inference. - * @returns {injector} Injector object. See {@link auto.$injector $injector}. - * - * @example - * Typical usage - * ```js - * // create an injector - * var $injector = angular.injector(['ng']); - * - * // use the injector to kick off your application - * // use the type inference to auto inject arguments, or use implicit injection - * $injector.invoke(function($rootScope, $compile, $document) { - * $compile($document)($rootScope); - * $rootScope.$digest(); - * }); - * ``` - * - * Sometimes you want to get access to the injector of a currently running Angular app - * from outside Angular. Perhaps, you want to inject and compile some markup after the - * application has been bootstrapped. You can do this using the extra `injector()` added - * to JQuery/jqLite elements. See {@link angular.element}. - * - * *This is fairly rare but could be the case if a third party library is injecting the - * markup.* - * - * In the following example a new block of HTML containing a `ng-controller` - * directive is added to the end of the document body by JQuery. We then compile and link - * it into the current AngularJS scope. - * - * ```js - * var $div = $('
{{content.label}}
'); - * $(document.body).append($div); - * - * angular.element(document).injector().invoke(function($compile) { - * var scope = angular.element($div).scope(); - * $compile($div)(scope); - * }); - * ``` - */ + replaceWith: function (element, replaceNode) { + var index, parent = element.parentNode; + jqLiteDealoc(element); + forEach(new JQLite(replaceNode), function (node) { + if (index) { + parent.insertBefore(node, index.nextSibling); + } else { + parent.replaceChild(node, element); + } + index = node; + }); + }, + children: function (element) { + var children = []; + forEach(element.childNodes, function (element) { + if (element.nodeType === NODE_TYPE_ELEMENT) { + children.push(element); + } + }); + return children; + }, -/** - * @ngdoc module - * @name auto - * @installation - * @description - * - * Implicit module which gets automatically added to each {@link auto.$injector $injector}. - */ + contents: function (element) { + return element.contentDocument || element.childNodes || []; + }, -var ARROW_ARG = /^([^\(]+?)=>/; -var FN_ARGS = /^[^\(]*\(\s*([^\)]*)\)/m; -var FN_ARG_SPLIT = /,/; -var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/; -var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg; -var $injectorMinErr = minErr('$injector'); - -function extractArgs(fn) { - var fnText = Function.prototype.toString.call(fn).replace(STRIP_COMMENTS, ''), - args = fnText.match(ARROW_ARG) || fnText.match(FN_ARGS); - return args; -} - -function anonFn(fn) { - // For anonymous functions, showing at the very least the function signature can help in - // debugging. - var args = extractArgs(fn); - if (args) { - return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')'; - } - return 'fn'; -} - -function annotate(fn, strictDi, name) { - var $inject, - argDecl, - last; - - if (typeof fn === 'function') { - if (!($inject = fn.$inject)) { - $inject = []; - if (fn.length) { - if (strictDi) { - if (!isString(name) || !name) { - name = fn.name || anonFn(fn); - } - throw $injectorMinErr('strictdi', - '{0} is not using explicit annotation and cannot be invoked in strict mode', name); - } - argDecl = extractArgs(fn); - forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg) { - arg.replace(FN_ARG, function(all, underscore, name) { - $inject.push(name); - }); - }); - } - fn.$inject = $inject; - } - } else if (isArray(fn)) { - last = fn.length - 1; - assertArgFn(fn[last], 'fn'); - $inject = fn.slice(0, last); - } else { - assertArgFn(fn, 'fn', true); - } - return $inject; -} + append: function (element, node) { + var nodeType = element.nodeType; + if (nodeType !== NODE_TYPE_ELEMENT && nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT) return; -/////////////////////////////////////// + node = new JQLite(node); -/** - * @ngdoc service - * @name $injector - * - * @description - * - * `$injector` is used to retrieve object instances as defined by - * {@link auto.$provide provider}, instantiate types, invoke methods, - * and load modules. - * - * The following always holds true: - * - * ```js - * var $injector = angular.injector(); - * expect($injector.get('$injector')).toBe($injector); - * expect($injector.invoke(function($injector) { - * return $injector; - * })).toBe($injector); - * ``` - * - * # Injection Function Annotation - * - * JavaScript does not have annotations, and annotations are needed for dependency injection. The - * following are all valid ways of annotating function with injection arguments and are equivalent. - * - * ```js - * // inferred (only works if code not minified/obfuscated) - * $injector.invoke(function(serviceA){}); - * - * // annotated - * function explicit(serviceA) {}; - * explicit.$inject = ['serviceA']; - * $injector.invoke(explicit); - * - * // inline - * $injector.invoke(['serviceA', function(serviceA){}]); - * ``` - * - * ## Inference - * - * In JavaScript calling `toString()` on a function returns the function definition. The definition - * can then be parsed and the function arguments can be extracted. This method of discovering - * annotations is disallowed when the injector is in strict mode. - * *NOTE:* This does not work with minification, and obfuscation tools since these tools change the - * argument names. - * - * ## `$inject` Annotation - * By adding an `$inject` property onto a function the injection parameters can be specified. - * - * ## Inline - * As an array of injection names, where the last item in the array is the function to call. - */ + for (var i = 0, ii = node.length; i < ii; i++) { + var child = node[i]; + element.appendChild(child); + } + }, -/** - * @ngdoc method - * @name $injector#get - * - * @description - * Return an instance of the service. - * - * @param {string} name The name of the instance to retrieve. - * @param {string=} caller An optional string to provide the origin of the function call for error messages. - * @return {*} The instance. - */ + prepend: function (element, node) { + if (element.nodeType === NODE_TYPE_ELEMENT) { + var index = element.firstChild; + forEach(new JQLite(node), function (child) { + element.insertBefore(child, index); + }); + } + }, -/** - * @ngdoc method - * @name $injector#invoke - * - * @description - * Invoke the method and supply the method arguments from the `$injector`. - * - * @param {Function|Array.} fn The injectable function to invoke. Function parameters are - * injected according to the {@link guide/di $inject Annotation} rules. - * @param {Object=} self The `this` for the invoked method. - * @param {Object=} locals Optional object. If preset then any argument names are read from this - * object first, before the `$injector` is consulted. - * @returns {*} the value returned by the invoked `fn` function. - */ + wrap: function (element, wrapNode) { + jqLiteWrapNode(element, jqLite(wrapNode).eq(0).clone()[0]); + }, -/** - * @ngdoc method - * @name $injector#has - * - * @description - * Allows the user to query if the particular service exists. - * - * @param {string} name Name of the service to query. - * @returns {boolean} `true` if injector has given service. - */ + remove: jqLiteRemove, -/** - * @ngdoc method - * @name $injector#instantiate - * @description - * Create a new instance of JS type. The method takes a constructor function, invokes the new - * operator, and supplies all of the arguments to the constructor function as specified by the - * constructor annotation. - * - * @param {Function} Type Annotated constructor function. - * @param {Object=} locals Optional object. If preset then any argument names are read from this - * object first, before the `$injector` is consulted. - * @returns {Object} new instance of `Type`. - */ + detach: function (element) { + jqLiteRemove(element, true); + }, -/** - * @ngdoc method - * @name $injector#annotate - * - * @description - * Returns an array of service names which the function is requesting for injection. This API is - * used by the injector to determine which services need to be injected into the function when the - * function is invoked. There are three ways in which the function can be annotated with the needed - * dependencies. - * - * # Argument names - * - * The simplest form is to extract the dependencies from the arguments of the function. This is done - * by converting the function into a string using `toString()` method and extracting the argument - * names. - * ```js - * // Given - * function MyController($scope, $route) { - * // ... - * } - * - * // Then - * expect(injector.annotate(MyController)).toEqual(['$scope', '$route']); - * ``` - * - * You can disallow this method by using strict injection mode. - * - * This method does not work with code minification / obfuscation. For this reason the following - * annotation strategies are supported. - * - * # The `$inject` property - * - * If a function has an `$inject` property and its value is an array of strings, then the strings - * represent names of services to be injected into the function. - * ```js - * // Given - * var MyController = function(obfuscatedScope, obfuscatedRoute) { - * // ... - * } - * // Define function dependencies - * MyController['$inject'] = ['$scope', '$route']; - * - * // Then - * expect(injector.annotate(MyController)).toEqual(['$scope', '$route']); - * ``` - * - * # The array notation - * - * It is often desirable to inline Injected functions and that's when setting the `$inject` property - * is very inconvenient. In these situations using the array notation to specify the dependencies in - * a way that survives minification is a better choice: - * - * ```js - * // We wish to write this (not minification / obfuscation safe) - * injector.invoke(function($compile, $rootScope) { + after: function (element, newElement) { + var index = element, parent = element.parentNode; + newElement = new JQLite(newElement); + + for (var i = 0, ii = newElement.length; i < ii; i++) { + var node = newElement[i]; + parent.insertBefore(node, index.nextSibling); + index = node; + } + }, + + addClass: jqLiteAddClass, + removeClass: jqLiteRemoveClass, + + toggleClass: function (element, selector, condition) { + if (selector) { + forEach(selector.split(' '), function (className) { + var classCondition = condition; + if (isUndefined(classCondition)) { + classCondition = !jqLiteHasClass(element, className); + } + (classCondition ? jqLiteAddClass : jqLiteRemoveClass)(element, className); + }); + } + }, + + parent: function (element) { + var parent = element.parentNode; + return parent && parent.nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT ? parent : null; + }, + + next: function (element) { + return element.nextElementSibling; + }, + + find: function (element, selector) { + if (element.getElementsByTagName) { + return element.getElementsByTagName(selector); + } else { + return []; + } + }, + + clone: jqLiteClone, + + triggerHandler: function (element, event, extraParameters) { + + var dummyEvent, eventFnsCopy, handlerArgs; + var eventName = event.type || event; + var expandoStore = jqLiteExpandoStore(element); + var events = expandoStore && expandoStore.events; + var eventFns = events && events[eventName]; + + if (eventFns) { + // Create a dummy event to pass to the handlers + dummyEvent = { + preventDefault: function () { + this.defaultPrevented = true; + }, + isDefaultPrevented: function () { + return this.defaultPrevented === true; + }, + stopImmediatePropagation: function () { + this.immediatePropagationStopped = true; + }, + isImmediatePropagationStopped: function () { + return this.immediatePropagationStopped === true; + }, + stopPropagation: noop, + type: eventName, + target: element + }; + + // If a custom event was provided then extend our dummy event with it + if (event.type) { + dummyEvent = extend(dummyEvent, event); + } + + // Copy event handlers in case event handlers array is modified during execution. + eventFnsCopy = shallowCopy(eventFns); + handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent]; + + forEach(eventFnsCopy, function (fn) { + if (!dummyEvent.isImmediatePropagationStopped()) { + fn.apply(element, handlerArgs); + } + }); + } + } + }, function (fn, name) { + /** + * chaining functions + */ + JQLite.prototype[name] = function (arg1, arg2, arg3) { + var value; + + for (var i = 0, ii = this.length; i < ii; i++) { + if (isUndefined(value)) { + value = fn(this[i], arg1, arg2, arg3); + if (isDefined(value)) { + // any function which returns a value needs to be wrapped + value = jqLite(value); + } + } else { + jqLiteAddNodes(value, fn(this[i], arg1, arg2, arg3)); + } + } + return isDefined(value) ? value : this; + }; + + // bind legacy bind/unbind to on/off + JQLite.prototype.bind = JQLite.prototype.on; + JQLite.prototype.unbind = JQLite.prototype.off; + }); + + +// Provider for private $$jqLite service + function $$jqLiteProvider() { + this.$get = function $$jqLite() { + return extend(JQLite, { + hasClass: function (node, classes) { + if (node.attr) node = node[0]; + return jqLiteHasClass(node, classes); + }, + addClass: function (node, classes) { + if (node.attr) node = node[0]; + return jqLiteAddClass(node, classes); + }, + removeClass: function (node, classes) { + if (node.attr) node = node[0]; + return jqLiteRemoveClass(node, classes); + } + }); + }; + } + + /** + * Computes a hash of an 'obj'. + * Hash of a: + * string is string + * number is number as string + * object is either result of calling $$hashKey function on the object or uniquely generated id, + * that is also assigned to the $$hashKey property of the object. + * + * @param obj + * @returns {string} hash string such that the same input will have the same hash string. + * The resulting string key is in 'type:hashKey' format. + */ + function hashKey(obj, nextUidFn) { + var key = obj && obj.$$hashKey; + + if (key) { + if (typeof key === 'function') { + key = obj.$$hashKey(); + } + return key; + } + + var objType = typeof obj; + if (objType == 'function' || (objType == 'object' && obj !== null)) { + key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)(); + } else { + key = objType + ':' + obj; + } + + return key; + } + + /** + * HashMap which can use objects as keys + */ + function HashMap(array, isolatedUid) { + if (isolatedUid) { + var uid = 0; + this.nextUid = function () { + return ++uid; + }; + } + forEach(array, this.put, this); + } + + HashMap.prototype = { + /** + * Store key value pair + * @param key key to store can be any type + * @param value value to store can be any type + */ + put: function (key, value) { + this[hashKey(key, this.nextUid)] = value; + }, + + /** + * @param key + * @returns {Object} the value for the key + */ + get: function (key) { + return this[hashKey(key, this.nextUid)]; + }, + + /** + * Remove the key/value pair + * @param key + */ + remove: function (key) { + var value = this[key = hashKey(key, this.nextUid)]; + delete this[key]; + return value; + } + }; + + var $$HashMapProvider = [function () { + this.$get = [function () { + return HashMap; + }]; + }]; + + /** + * @ngdoc function + * @module ng + * @name angular.injector + * @kind function + * + * @description + * Creates an injector object that can be used for retrieving services as well as for + * dependency injection (see {@link guide/di dependency injection}). + * + * @param {Array.} modules A list of module functions or their aliases. See + * {@link angular.module}. The `ng` module must be explicitly added. + * @param {boolean=} [strictDi=false] Whether the injector should be in strict mode, which + * disallows argument name annotation inference. + * @returns {injector} Injector object. See {@link auto.$injector $injector}. + * + * @example + * Typical usage + * ```js + * // create an injector + * var $injector = angular.injector(['ng']); + * + * // use the injector to kick off your application + * // use the type inference to auto inject arguments, or use implicit injection + * $injector.invoke(function($rootScope, $compile, $document) { + * $compile($document)($rootScope); + * $rootScope.$digest(); + * }); + * ``` + * + * Sometimes you want to get access to the injector of a currently running Angular app + * from outside Angular. Perhaps, you want to inject and compile some markup after the + * application has been bootstrapped. You can do this using the extra `injector()` added + * to JQuery/jqLite elements. See {@link angular.element}. + * + * *This is fairly rare but could be the case if a third party library is injecting the + * markup.* + * + * In the following example a new block of HTML containing a `ng-controller` + * directive is added to the end of the document body by JQuery. We then compile and link + * it into the current AngularJS scope. + * + * ```js + * var $div = $('
{{content.label}}
'); + * $(document.body).append($div); + * + * angular.element(document).injector().invoke(function($compile) { + * var scope = angular.element($div).scope(); + * $compile($div)(scope); + * }); + * ``` + */ + + + /** + * @ngdoc module + * @name auto + * @installation + * @description + * + * Implicit module which gets automatically added to each {@link auto.$injector $injector}. + */ + + var ARROW_ARG = /^([^\(]+?)=>/; + var FN_ARGS = /^[^\(]*\(\s*([^\)]*)\)/m; + var FN_ARG_SPLIT = /,/; + var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/; + var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg; + var $injectorMinErr = minErr('$injector'); + + function extractArgs(fn) { + var fnText = Function.prototype.toString.call(fn).replace(STRIP_COMMENTS, ''), + args = fnText.match(ARROW_ARG) || fnText.match(FN_ARGS); + return args; + } + + function anonFn(fn) { + // For anonymous functions, showing at the very least the function signature can help in + // debugging. + var args = extractArgs(fn); + if (args) { + return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')'; + } + return 'fn'; + } + + function annotate(fn, strictDi, name) { + var $inject, + argDecl, + last; + + if (typeof fn === 'function') { + if (!($inject = fn.$inject)) { + $inject = []; + if (fn.length) { + if (strictDi) { + if (!isString(name) || !name) { + name = fn.name || anonFn(fn); + } + throw $injectorMinErr('strictdi', + '{0} is not using explicit annotation and cannot be invoked in strict mode', name); + } + argDecl = extractArgs(fn); + forEach(argDecl[1].split(FN_ARG_SPLIT), function (arg) { + arg.replace(FN_ARG, function (all, underscore, name) { + $inject.push(name); + }); + }); + } + fn.$inject = $inject; + } + } else if (isArray(fn)) { + last = fn.length - 1; + assertArgFn(fn[last], 'fn'); + $inject = fn.slice(0, last); + } else { + assertArgFn(fn, 'fn', true); + } + return $inject; + } + +/////////////////////////////////////// + + /** + * @ngdoc service + * @name $injector + * + * @description + * + * `$injector` is used to retrieve object instances as defined by + * {@link auto.$provide provider}, instantiate types, invoke methods, + * and load modules. + * + * The following always holds true: + * + * ```js + * var $injector = angular.injector(); + * expect($injector.get('$injector')).toBe($injector); + * expect($injector.invoke(function($injector) { + * return $injector; + * })).toBe($injector); + * ``` + * + * # Injection Function Annotation + * + * JavaScript does not have annotations, and annotations are needed for dependency injection. The + * following are all valid ways of annotating function with injection arguments and are equivalent. + * + * ```js + * // inferred (only works if code not minified/obfuscated) + * $injector.invoke(function(serviceA){}); + * + * // annotated + * function explicit(serviceA) {}; + * explicit.$inject = ['serviceA']; + * $injector.invoke(explicit); + * + * // inline + * $injector.invoke(['serviceA', function(serviceA){}]); + * ``` + * + * ## Inference + * + * In JavaScript calling `toString()` on a function returns the function definition. The definition + * can then be parsed and the function arguments can be extracted. This method of discovering + * annotations is disallowed when the injector is in strict mode. + * *NOTE:* This does not work with minification, and obfuscation tools since these tools change the + * argument names. + * + * ## `$inject` Annotation + * By adding an `$inject` property onto a function the injection parameters can be specified. + * + * ## Inline + * As an array of injection names, where the last item in the array is the function to call. + */ + + /** + * @ngdoc method + * @name $injector#get + * + * @description + * Return an instance of the service. + * + * @param {string} name The name of the instance to retrieve. + * @param {string=} caller An optional string to provide the origin of the function call for error messages. + * @return {*} The instance. + */ + + /** + * @ngdoc method + * @name $injector#invoke + * + * @description + * Invoke the method and supply the method arguments from the `$injector`. + * + * @param {Function|Array.} fn The injectable function to invoke. Function parameters are + * injected according to the {@link guide/di $inject Annotation} rules. + * @param {Object=} self The `this` for the invoked method. + * @param {Object=} locals Optional object. If preset then any argument names are read from this + * object first, before the `$injector` is consulted. + * @returns {*} the value returned by the invoked `fn` function. + */ + + /** + * @ngdoc method + * @name $injector#has + * + * @description + * Allows the user to query if the particular service exists. + * + * @param {string} name Name of the service to query. + * @returns {boolean} `true` if injector has given service. + */ + + /** + * @ngdoc method + * @name $injector#instantiate + * @description + * Create a new instance of JS type. The method takes a constructor function, invokes the new + * operator, and supplies all of the arguments to the constructor function as specified by the + * constructor annotation. + * + * @param {Function} Type Annotated constructor function. + * @param {Object=} locals Optional object. If preset then any argument names are read from this + * object first, before the `$injector` is consulted. + * @returns {Object} new instance of `Type`. + */ + + /** + * @ngdoc method + * @name $injector#annotate + * + * @description + * Returns an array of service names which the function is requesting for injection. This API is + * used by the injector to determine which services need to be injected into the function when the + * function is invoked. There are three ways in which the function can be annotated with the needed + * dependencies. + * + * # Argument names + * + * The simplest form is to extract the dependencies from the arguments of the function. This is done + * by converting the function into a string using `toString()` method and extracting the argument + * names. + * ```js + * // Given + * function MyController($scope, $route) { + * // ... + * } + * + * // Then + * expect(injector.annotate(MyController)).toEqual(['$scope', '$route']); + * ``` + * + * You can disallow this method by using strict injection mode. + * + * This method does not work with code minification / obfuscation. For this reason the following + * annotation strategies are supported. + * + * # The `$inject` property + * + * If a function has an `$inject` property and its value is an array of strings, then the strings + * represent names of services to be injected into the function. + * ```js + * // Given + * var MyController = function(obfuscatedScope, obfuscatedRoute) { + * // ... + * } + * // Define function dependencies + * MyController['$inject'] = ['$scope', '$route']; + * + * // Then + * expect(injector.annotate(MyController)).toEqual(['$scope', '$route']); + * ``` + * + * # The array notation + * + * It is often desirable to inline Injected functions and that's when setting the `$inject` property + * is very inconvenient. In these situations using the array notation to specify the dependencies in + * a way that survives minification is a better choice: + * + * ```js + * // We wish to write this (not minification / obfuscation safe) + * injector.invoke(function($compile, $rootScope) { * // ... * }); - * - * // We are forced to write break inlining - * var tmpFn = function(obfuscatedCompile, obfuscatedRootScope) { + * + * // We are forced to write break inlining + * var tmpFn = function(obfuscatedCompile, obfuscatedRootScope) { * // ... * }; - * tmpFn.$inject = ['$compile', '$rootScope']; - * injector.invoke(tmpFn); - * - * // To better support inline function the inline annotation is supported - * injector.invoke(['$compile', '$rootScope', function(obfCompile, obfRootScope) { + * tmpFn.$inject = ['$compile', '$rootScope']; + * injector.invoke(tmpFn); + * + * // To better support inline function the inline annotation is supported + * injector.invoke(['$compile', '$rootScope', function(obfCompile, obfRootScope) { * // ... * }]); - * - * // Therefore - * expect(injector.annotate( - * ['$compile', '$rootScope', function(obfus_$compile, obfus_$rootScope) {}]) - * ).toEqual(['$compile', '$rootScope']); - * ``` - * - * @param {Function|Array.} fn Function for which dependent service names need to - * be retrieved as described above. - * - * @param {boolean=} [strictDi=false] Disallow argument name annotation inference. - * - * @returns {Array.} The names of the services which the function requires. - */ - - + * + * // Therefore + * expect(injector.annotate( + * ['$compile', '$rootScope', function(obfus_$compile, obfus_$rootScope) {}]) + * ).toEqual(['$compile', '$rootScope']); + * ``` + * + * @param {Function|Array.} fn Function for which dependent service names need to + * be retrieved as described above. + * + * @param {boolean=} [strictDi=false] Disallow argument name annotation inference. + * + * @returns {Array.} The names of the services which the function requires. + */ -/** - * @ngdoc service - * @name $provide - * - * @description - * - * The {@link auto.$provide $provide} service has a number of methods for registering components - * with the {@link auto.$injector $injector}. Many of these functions are also exposed on - * {@link angular.Module}. - * - * An Angular **service** is a singleton object created by a **service factory**. These **service - * factories** are functions which, in turn, are created by a **service provider**. - * The **service providers** are constructor functions. When instantiated they must contain a - * property called `$get`, which holds the **service factory** function. - * - * When you request a service, the {@link auto.$injector $injector} is responsible for finding the - * correct **service provider**, instantiating it and then calling its `$get` **service factory** - * function to get the instance of the **service**. - * - * Often services have no configuration options and there is no need to add methods to the service - * provider. The provider will be no more than a constructor function with a `$get` property. For - * these cases the {@link auto.$provide $provide} service has additional helper methods to register - * services without specifying a provider. - * - * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the - * {@link auto.$injector $injector} - * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by - * providers and services. - * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by - * services, not providers. - * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`, - * that will be wrapped in a **service provider** object, whose `$get` property will contain the - * given factory function. - * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class` - * that will be wrapped in a **service provider** object, whose `$get` property will instantiate - * a new object using the given constructor function. - * - * See the individual methods for more information and examples. - */ + /** + * @ngdoc service + * @name $provide + * + * @description + * + * The {@link auto.$provide $provide} service has a number of methods for registering components + * with the {@link auto.$injector $injector}. Many of these functions are also exposed on + * {@link angular.Module}. + * + * An Angular **service** is a singleton object created by a **service factory**. These **service + * factories** are functions which, in turn, are created by a **service provider**. + * The **service providers** are constructor functions. When instantiated they must contain a + * property called `$get`, which holds the **service factory** function. + * + * When you request a service, the {@link auto.$injector $injector} is responsible for finding the + * correct **service provider**, instantiating it and then calling its `$get` **service factory** + * function to get the instance of the **service**. + * + * Often services have no configuration options and there is no need to add methods to the service + * provider. The provider will be no more than a constructor function with a `$get` property. For + * these cases the {@link auto.$provide $provide} service has additional helper methods to register + * services without specifying a provider. + * + * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the + * {@link auto.$injector $injector} + * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by + * providers and services. + * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by + * services, not providers. + * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`, + * that will be wrapped in a **service provider** object, whose `$get` property will contain the + * given factory function. + * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class` + * that will be wrapped in a **service provider** object, whose `$get` property will instantiate + * a new object using the given constructor function. + * + * See the individual methods for more information and examples. + */ -/** - * @ngdoc method - * @name $provide#provider - * @description - * - * Register a **provider function** with the {@link auto.$injector $injector}. Provider functions - * are constructor functions, whose instances are responsible for "providing" a factory for a - * service. - * - * Service provider names start with the name of the service they provide followed by `Provider`. - * For example, the {@link ng.$log $log} service has a provider called - * {@link ng.$logProvider $logProvider}. - * - * Service provider objects can have additional methods which allow configuration of the provider - * and its service. Importantly, you can configure what kind of service is created by the `$get` - * method, or how that service will act. For example, the {@link ng.$logProvider $logProvider} has a - * method {@link ng.$logProvider#debugEnabled debugEnabled} - * which lets you specify whether the {@link ng.$log $log} service will log debug messages to the - * console or not. - * - * @param {string} name The name of the instance. NOTE: the provider will be available under `name + - 'Provider'` key. - * @param {(Object|function())} provider If the provider is: - * - * - `Object`: then it should have a `$get` method. The `$get` method will be invoked using - * {@link auto.$injector#invoke $injector.invoke()} when an instance needs to be created. - * - `Constructor`: a new instance of the provider will be created using - * {@link auto.$injector#instantiate $injector.instantiate()}, then treated as `object`. - * - * @returns {Object} registered provider instance + /** + * @ngdoc method + * @name $provide#provider + * @description + * + * Register a **provider function** with the {@link auto.$injector $injector}. Provider functions + * are constructor functions, whose instances are responsible for "providing" a factory for a + * service. + * + * Service provider names start with the name of the service they provide followed by `Provider`. + * For example, the {@link ng.$log $log} service has a provider called + * {@link ng.$logProvider $logProvider}. + * + * Service provider objects can have additional methods which allow configuration of the provider + * and its service. Importantly, you can configure what kind of service is created by the `$get` + * method, or how that service will act. For example, the {@link ng.$logProvider $logProvider} has a + * method {@link ng.$logProvider#debugEnabled debugEnabled} + * which lets you specify whether the {@link ng.$log $log} service will log debug messages to the + * console or not. + * + * @param {string} name The name of the instance. NOTE: the provider will be available under `name + + 'Provider'` key. + * @param {(Object|function())} provider If the provider is: + * + * - `Object`: then it should have a `$get` method. The `$get` method will be invoked using + * {@link auto.$injector#invoke $injector.invoke()} when an instance needs to be created. + * - `Constructor`: a new instance of the provider will be created using + * {@link auto.$injector#instantiate $injector.instantiate()}, then treated as `object`. + * + * @returns {Object} registered provider instance - * @example - * - * The following example shows how to create a simple event tracking service and register it using - * {@link auto.$provide#provider $provide.provider()}. - * - * ```js - * // Define the eventTracker provider - * function EventTrackerProvider() { + * @example + * + * The following example shows how to create a simple event tracking service and register it using + * {@link auto.$provide#provider $provide.provider()}. + * + * ```js + * // Define the eventTracker provider + * function EventTrackerProvider() { * var trackingUrl = '/track'; * * // A provider method for configuring where the tracked events should been saved @@ -4220,8 +4249,8 @@ function annotate(fn, strictDi, name) { * }; * }]; * } - * - * describe('eventTracker', function() { + * + * describe('eventTracker', function() { * var postSpy; * * beforeEach(module(function($provide) { @@ -4249,537 +4278,541 @@ function annotate(fn, strictDi, name) { * expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 }); * })); * }); - * ``` - */ + * ``` + */ -/** - * @ngdoc method - * @name $provide#factory - * @description - * - * Register a **service factory**, which will be called to return the service instance. - * This is short for registering a service where its provider consists of only a `$get` property, - * which is the given service factory function. - * You should use {@link auto.$provide#factory $provide.factory(getFn)} if you do not need to - * configure your service in a provider. - * - * @param {string} name The name of the instance. - * @param {Function|Array.} $getFn The injectable $getFn for the instance creation. - * Internally this is a short hand for `$provide.provider(name, {$get: $getFn})`. - * @returns {Object} registered provider instance - * - * @example - * Here is an example of registering a service - * ```js - * $provide.factory('ping', ['$http', function($http) { + /** + * @ngdoc method + * @name $provide#factory + * @description + * + * Register a **service factory**, which will be called to return the service instance. + * This is short for registering a service where its provider consists of only a `$get` property, + * which is the given service factory function. + * You should use {@link auto.$provide#factory $provide.factory(getFn)} if you do not need to + * configure your service in a provider. + * + * @param {string} name The name of the instance. + * @param {Function|Array.} $getFn The injectable $getFn for the instance creation. + * Internally this is a short hand for `$provide.provider(name, {$get: $getFn})`. + * @returns {Object} registered provider instance + * + * @example + * Here is an example of registering a service + * ```js + * $provide.factory('ping', ['$http', function($http) { * return function ping() { * return $http.send('/ping'); * }; * }]); - * ``` - * You would then inject and use this service like this: - * ```js - * someModule.controller('Ctrl', ['ping', function(ping) { + * ``` + * You would then inject and use this service like this: + * ```js + * someModule.controller('Ctrl', ['ping', function(ping) { * ping(); * }]); - * ``` - */ + * ``` + */ -/** - * @ngdoc method - * @name $provide#service - * @description - * - * Register a **service constructor**, which will be invoked with `new` to create the service - * instance. - * This is short for registering a service where its provider's `$get` property is a factory - * function that returns an instance instantiated by the injector from the service constructor - * function. - * - * Internally it looks a bit like this: - * - * ``` - * { + /** + * @ngdoc method + * @name $provide#service + * @description + * + * Register a **service constructor**, which will be invoked with `new` to create the service + * instance. + * This is short for registering a service where its provider's `$get` property is a factory + * function that returns an instance instantiated by the injector from the service constructor + * function. + * + * Internally it looks a bit like this: + * + * ``` + * { * $get: function() { * return $injector.instantiate(constructor); * } * } - * ``` - * - * - * You should use {@link auto.$provide#service $provide.service(class)} if you define your service - * as a type/class. - * - * @param {string} name The name of the instance. - * @param {Function|Array.} constructor An injectable class (constructor function) - * that will be instantiated. - * @returns {Object} registered provider instance - * - * @example - * Here is an example of registering a service using - * {@link auto.$provide#service $provide.service(class)}. - * ```js - * var Ping = function($http) { + * ``` + * + * + * You should use {@link auto.$provide#service $provide.service(class)} if you define your service + * as a type/class. + * + * @param {string} name The name of the instance. + * @param {Function|Array.} constructor An injectable class (constructor function) + * that will be instantiated. + * @returns {Object} registered provider instance + * + * @example + * Here is an example of registering a service using + * {@link auto.$provide#service $provide.service(class)}. + * ```js + * var Ping = function($http) { * this.$http = $http; * }; - * - * Ping.$inject = ['$http']; - * - * Ping.prototype.send = function() { + * + * Ping.$inject = ['$http']; + * + * Ping.prototype.send = function() { * return this.$http.get('/ping'); * }; - * $provide.service('ping', Ping); - * ``` - * You would then inject and use this service like this: - * ```js - * someModule.controller('Ctrl', ['ping', function(ping) { + * $provide.service('ping', Ping); + * ``` + * You would then inject and use this service like this: + * ```js + * someModule.controller('Ctrl', ['ping', function(ping) { * ping.send(); * }]); - * ``` - */ + * ``` + */ -/** - * @ngdoc method - * @name $provide#value - * @description - * - * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a - * number, an array, an object or a function. This is short for registering a service where its - * provider's `$get` property is a factory function that takes no arguments and returns the **value - * service**. That also means it is not possible to inject other services into a value service. - * - * Value services are similar to constant services, except that they cannot be injected into a - * module configuration function (see {@link angular.Module#config}) but they can be overridden by - * an Angular {@link auto.$provide#decorator decorator}. - * - * @param {string} name The name of the instance. - * @param {*} value The value. - * @returns {Object} registered provider instance - * - * @example - * Here are some examples of creating value services. - * ```js - * $provide.value('ADMIN_USER', 'admin'); - * - * $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 }); - * - * $provide.value('halfOf', function(value) { + /** + * @ngdoc method + * @name $provide#value + * @description + * + * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a + * number, an array, an object or a function. This is short for registering a service where its + * provider's `$get` property is a factory function that takes no arguments and returns the **value + * service**. That also means it is not possible to inject other services into a value service. + * + * Value services are similar to constant services, except that they cannot be injected into a + * module configuration function (see {@link angular.Module#config}) but they can be overridden by + * an Angular {@link auto.$provide#decorator decorator}. + * + * @param {string} name The name of the instance. + * @param {*} value The value. + * @returns {Object} registered provider instance + * + * @example + * Here are some examples of creating value services. + * ```js + * $provide.value('ADMIN_USER', 'admin'); + * + * $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 }); + * + * $provide.value('halfOf', function(value) { * return value / 2; * }); - * ``` - */ + * ``` + */ -/** - * @ngdoc method - * @name $provide#constant - * @description - * - * Register a **constant service** with the {@link auto.$injector $injector}, such as a string, - * a number, an array, an object or a function. Like the {@link auto.$provide#value value}, it is not - * possible to inject other services into a constant. - * - * But unlike {@link auto.$provide#value value}, a constant can be - * injected into a module configuration function (see {@link angular.Module#config}) and it cannot - * be overridden by an Angular {@link auto.$provide#decorator decorator}. - * - * @param {string} name The name of the constant. - * @param {*} value The constant value. - * @returns {Object} registered instance - * - * @example - * Here a some examples of creating constants: - * ```js - * $provide.constant('SHARD_HEIGHT', 306); - * - * $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']); - * - * $provide.constant('double', function(value) { + /** + * @ngdoc method + * @name $provide#constant + * @description + * + * Register a **constant service** with the {@link auto.$injector $injector}, such as a string, + * a number, an array, an object or a function. Like the {@link auto.$provide#value value}, it is not + * possible to inject other services into a constant. + * + * But unlike {@link auto.$provide#value value}, a constant can be + * injected into a module configuration function (see {@link angular.Module#config}) and it cannot + * be overridden by an Angular {@link auto.$provide#decorator decorator}. + * + * @param {string} name The name of the constant. + * @param {*} value The constant value. + * @returns {Object} registered instance + * + * @example + * Here a some examples of creating constants: + * ```js + * $provide.constant('SHARD_HEIGHT', 306); + * + * $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']); + * + * $provide.constant('double', function(value) { * return value * 2; * }); - * ``` - */ + * ``` + */ -/** - * @ngdoc method - * @name $provide#decorator - * @description - * - * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator - * intercepts the creation of a service, allowing it to override or modify the behavior of the - * service. The object returned by the decorator may be the original service, or a new service - * object which replaces or wraps and delegates to the original service. - * - * @param {string} name The name of the service to decorate. - * @param {Function|Array.} decorator This function will be invoked when the service needs to be - * instantiated and should return the decorated service instance. The function is called using - * the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable. - * Local injection arguments: - * - * * `$delegate` - The original service instance, which can be monkey patched, configured, - * decorated or delegated to. - * - * @example - * Here we decorate the {@link ng.$log $log} service to convert warnings to errors by intercepting - * calls to {@link ng.$log#error $log.warn()}. - * ```js - * $provide.decorator('$log', ['$delegate', function($delegate) { + /** + * @ngdoc method + * @name $provide#decorator + * @description + * + * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator + * intercepts the creation of a service, allowing it to override or modify the behavior of the + * service. The object returned by the decorator may be the original service, or a new service + * object which replaces or wraps and delegates to the original service. + * + * @param {string} name The name of the service to decorate. + * @param {Function|Array.} decorator This function will be invoked when the service needs to be + * instantiated and should return the decorated service instance. The function is called using + * the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable. + * Local injection arguments: + * + * * `$delegate` - The original service instance, which can be monkey patched, configured, + * decorated or delegated to. + * + * @example + * Here we decorate the {@link ng.$log $log} service to convert warnings to errors by intercepting + * calls to {@link ng.$log#error $log.warn()}. + * ```js + * $provide.decorator('$log', ['$delegate', function($delegate) { * $delegate.warn = $delegate.error; * return $delegate; * }]); - * ``` - */ + * ``` + */ -function createInjector(modulesToLoad, strictDi) { - strictDi = (strictDi === true); - var INSTANTIATING = {}, - providerSuffix = 'Provider', - path = [], - loadedModules = new HashMap([], true), - providerCache = { - $provide: { - provider: supportObject(provider), - factory: supportObject(factory), - service: supportObject(service), - value: supportObject(value), - constant: supportObject(constant), - decorator: decorator - } - }, - providerInjector = (providerCache.$injector = - createInternalInjector(providerCache, function(serviceName, caller) { - if (angular.isString(caller)) { - path.push(caller); - } - throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- ')); - })), - instanceCache = {}, - protoInstanceInjector = - createInternalInjector(instanceCache, function(serviceName, caller) { - var provider = providerInjector.get(serviceName + providerSuffix, caller); - return instanceInjector.invoke( - provider.$get, provider, undefined, serviceName); - }), - instanceInjector = protoInstanceInjector; - - providerCache['$injector' + providerSuffix] = { $get: valueFn(protoInstanceInjector) }; - var runBlocks = loadModules(modulesToLoad); - instanceInjector = protoInstanceInjector.get('$injector'); - instanceInjector.strictDi = strictDi; - forEach(runBlocks, function(fn) { if (fn) instanceInjector.invoke(fn); }); - - return instanceInjector; - - //////////////////////////////////// - // $provider - //////////////////////////////////// - - function supportObject(delegate) { - return function(key, value) { - if (isObject(key)) { - forEach(key, reverseParams(delegate)); - } else { - return delegate(key, value); - } - }; - } + function createInjector(modulesToLoad, strictDi) { + strictDi = (strictDi === true); + var INSTANTIATING = {}, + providerSuffix = 'Provider', + path = [], + loadedModules = new HashMap([], true), + providerCache = { + $provide: { + provider: supportObject(provider), + factory: supportObject(factory), + service: supportObject(service), + value: supportObject(value), + constant: supportObject(constant), + decorator: decorator + } + }, + providerInjector = (providerCache.$injector = + createInternalInjector(providerCache, function (serviceName, caller) { + if (angular.isString(caller)) { + path.push(caller); + } + throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- ')); + })), + instanceCache = {}, + protoInstanceInjector = + createInternalInjector(instanceCache, function (serviceName, caller) { + var provider = providerInjector.get(serviceName + providerSuffix, caller); + return instanceInjector.invoke( + provider.$get, provider, undefined, serviceName); + }), + instanceInjector = protoInstanceInjector; + + providerCache['$injector' + providerSuffix] = {$get: valueFn(protoInstanceInjector)}; + var runBlocks = loadModules(modulesToLoad); + instanceInjector = protoInstanceInjector.get('$injector'); + instanceInjector.strictDi = strictDi; + forEach(runBlocks, function (fn) { + if (fn) instanceInjector.invoke(fn); + }); - function provider(name, provider_) { - assertNotHasOwnProperty(name, 'service'); - if (isFunction(provider_) || isArray(provider_)) { - provider_ = providerInjector.instantiate(provider_); - } - if (!provider_.$get) { - throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name); - } - return providerCache[name + providerSuffix] = provider_; - } - - function enforceReturnValue(name, factory) { - return function enforcedReturnValue() { - var result = instanceInjector.invoke(factory, this); - if (isUndefined(result)) { - throw $injectorMinErr('undef', "Provider '{0}' must return a value from $get factory method.", name); - } - return result; - }; - } + return instanceInjector; - function factory(name, factoryFn, enforce) { - return provider(name, { - $get: enforce !== false ? enforceReturnValue(name, factoryFn) : factoryFn - }); - } + //////////////////////////////////// + // $provider + //////////////////////////////////// - function service(name, constructor) { - return factory(name, ['$injector', function($injector) { - return $injector.instantiate(constructor); - }]); - } + function supportObject(delegate) { + return function (key, value) { + if (isObject(key)) { + forEach(key, reverseParams(delegate)); + } else { + return delegate(key, value); + } + }; + } - function value(name, val) { return factory(name, valueFn(val), false); } + function provider(name, provider_) { + assertNotHasOwnProperty(name, 'service'); + if (isFunction(provider_) || isArray(provider_)) { + provider_ = providerInjector.instantiate(provider_); + } + if (!provider_.$get) { + throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name); + } + return providerCache[name + providerSuffix] = provider_; + } - function constant(name, value) { - assertNotHasOwnProperty(name, 'constant'); - providerCache[name] = value; - instanceCache[name] = value; - } + function enforceReturnValue(name, factory) { + return function enforcedReturnValue() { + var result = instanceInjector.invoke(factory, this); + if (isUndefined(result)) { + throw $injectorMinErr('undef', "Provider '{0}' must return a value from $get factory method.", name); + } + return result; + }; + } - function decorator(serviceName, decorFn) { - var origProvider = providerInjector.get(serviceName + providerSuffix), - orig$get = origProvider.$get; + function factory(name, factoryFn, enforce) { + return provider(name, { + $get: enforce !== false ? enforceReturnValue(name, factoryFn) : factoryFn + }); + } - origProvider.$get = function() { - var origInstance = instanceInjector.invoke(orig$get, origProvider); - return instanceInjector.invoke(decorFn, null, {$delegate: origInstance}); - }; - } - - //////////////////////////////////// - // Module Loading - //////////////////////////////////// - function loadModules(modulesToLoad) { - assertArg(isUndefined(modulesToLoad) || isArray(modulesToLoad), 'modulesToLoad', 'not an array'); - var runBlocks = [], moduleFn; - forEach(modulesToLoad, function(module) { - if (loadedModules.get(module)) return; - loadedModules.put(module, true); - - function runInvokeQueue(queue) { - var i, ii; - for (i = 0, ii = queue.length; i < ii; i++) { - var invokeArgs = queue[i], - provider = providerInjector.get(invokeArgs[0]); - - provider[invokeArgs[1]].apply(provider, invokeArgs[2]); + function service(name, constructor) { + return factory(name, ['$injector', function ($injector) { + return $injector.instantiate(constructor); + }]); } - } - try { - if (isString(module)) { - moduleFn = angularModule(module); - runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks); - runInvokeQueue(moduleFn._invokeQueue); - runInvokeQueue(moduleFn._configBlocks); - } else if (isFunction(module)) { - runBlocks.push(providerInjector.invoke(module)); - } else if (isArray(module)) { - runBlocks.push(providerInjector.invoke(module)); - } else { - assertArgFn(module, 'module'); + function value(name, val) { + return factory(name, valueFn(val), false); } - } catch (e) { - if (isArray(module)) { - module = module[module.length - 1]; + + function constant(name, value) { + assertNotHasOwnProperty(name, 'constant'); + providerCache[name] = value; + instanceCache[name] = value; } - if (e.message && e.stack && e.stack.indexOf(e.message) == -1) { - // Safari & FF's stack traces don't contain error.message content - // unlike those of Chrome and IE - // So if stack doesn't contain message, we create a new string that contains both. - // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here. - /* jshint -W022 */ - e = e.message + '\n' + e.stack; + + function decorator(serviceName, decorFn) { + var origProvider = providerInjector.get(serviceName + providerSuffix), + orig$get = origProvider.$get; + + origProvider.$get = function () { + var origInstance = instanceInjector.invoke(orig$get, origProvider); + return instanceInjector.invoke(decorFn, null, {$delegate: origInstance}); + }; } - throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}", - module, e.stack || e.message || e); - } - }); - return runBlocks; - } - //////////////////////////////////// - // internal Injector - //////////////////////////////////// + //////////////////////////////////// + // Module Loading + //////////////////////////////////// + function loadModules(modulesToLoad) { + assertArg(isUndefined(modulesToLoad) || isArray(modulesToLoad), 'modulesToLoad', 'not an array'); + var runBlocks = [], moduleFn; + forEach(modulesToLoad, function (module) { + if (loadedModules.get(module)) return; + loadedModules.put(module, true); - function createInternalInjector(cache, factory) { + function runInvokeQueue(queue) { + var i, ii; + for (i = 0, ii = queue.length; i < ii; i++) { + var invokeArgs = queue[i], + provider = providerInjector.get(invokeArgs[0]); - function getService(serviceName, caller) { - if (cache.hasOwnProperty(serviceName)) { - if (cache[serviceName] === INSTANTIATING) { - throw $injectorMinErr('cdep', 'Circular dependency found: {0}', - serviceName + ' <- ' + path.join(' <- ')); - } - return cache[serviceName]; - } else { - try { - path.unshift(serviceName); - cache[serviceName] = INSTANTIATING; - return cache[serviceName] = factory(serviceName, caller); - } catch (err) { - if (cache[serviceName] === INSTANTIATING) { - delete cache[serviceName]; - } - throw err; - } finally { - path.shift(); + provider[invokeArgs[1]].apply(provider, invokeArgs[2]); + } + } + + try { + if (isString(module)) { + moduleFn = angularModule(module); + runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks); + runInvokeQueue(moduleFn._invokeQueue); + runInvokeQueue(moduleFn._configBlocks); + } else if (isFunction(module)) { + runBlocks.push(providerInjector.invoke(module)); + } else if (isArray(module)) { + runBlocks.push(providerInjector.invoke(module)); + } else { + assertArgFn(module, 'module'); + } + } catch (e) { + if (isArray(module)) { + module = module[module.length - 1]; + } + if (e.message && e.stack && e.stack.indexOf(e.message) == -1) { + // Safari & FF's stack traces don't contain error.message content + // unlike those of Chrome and IE + // So if stack doesn't contain message, we create a new string that contains both. + // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here. + /* jshint -W022 */ + e = e.message + '\n' + e.stack; + } + throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}", + module, e.stack || e.message || e); + } + }); + return runBlocks; } - } - } + //////////////////////////////////// + // internal Injector + //////////////////////////////////// - function injectionArgs(fn, locals, serviceName) { - var args = [], - $inject = createInjector.$$annotate(fn, strictDi, serviceName); + function createInternalInjector(cache, factory) { - for (var i = 0, length = $inject.length; i < length; i++) { - var key = $inject[i]; - if (typeof key !== 'string') { - throw $injectorMinErr('itkn', - 'Incorrect injection token! Expected service name as string, got {0}', key); - } - args.push(locals && locals.hasOwnProperty(key) ? locals[key] : - getService(key, serviceName)); - } - return args; - } + function getService(serviceName, caller) { + if (cache.hasOwnProperty(serviceName)) { + if (cache[serviceName] === INSTANTIATING) { + throw $injectorMinErr('cdep', 'Circular dependency found: {0}', + serviceName + ' <- ' + path.join(' <- ')); + } + return cache[serviceName]; + } else { + try { + path.unshift(serviceName); + cache[serviceName] = INSTANTIATING; + return cache[serviceName] = factory(serviceName, caller); + } catch (err) { + if (cache[serviceName] === INSTANTIATING) { + delete cache[serviceName]; + } + throw err; + } finally { + path.shift(); + } + } + } - function isClass(func) { - // IE 9-11 do not support classes and IE9 leaks with the code below. - if (msie <= 11) { - return false; - } - // Workaround for MS Edge. - // Check https://connect.microsoft.com/IE/Feedback/Details/2211653 - return typeof func === 'function' - && /^(?:class\s|constructor\()/.test(Function.prototype.toString.call(func)); - } - function invoke(fn, self, locals, serviceName) { - if (typeof locals === 'string') { - serviceName = locals; - locals = null; - } + function injectionArgs(fn, locals, serviceName) { + var args = [], + $inject = createInjector.$$annotate(fn, strictDi, serviceName); - var args = injectionArgs(fn, locals, serviceName); - if (isArray(fn)) { - fn = fn[fn.length - 1]; - } + for (var i = 0, length = $inject.length; i < length; i++) { + var key = $inject[i]; + if (typeof key !== 'string') { + throw $injectorMinErr('itkn', + 'Incorrect injection token! Expected service name as string, got {0}', key); + } + args.push(locals && locals.hasOwnProperty(key) ? locals[key] : + getService(key, serviceName)); + } + return args; + } - if (!isClass(fn)) { - // http://jsperf.com/angularjs-invoke-apply-vs-switch - // #5388 - return fn.apply(self, args); - } else { - args.unshift(null); - return new (Function.prototype.bind.apply(fn, args))(); - } - } + function isClass(func) { + // IE 9-11 do not support classes and IE9 leaks with the code below. + if (msie <= 11) { + return false; + } + // Workaround for MS Edge. + // Check https://connect.microsoft.com/IE/Feedback/Details/2211653 + return typeof func === 'function' + && /^(?:class\s|constructor\()/.test(Function.prototype.toString.call(func)); + } + function invoke(fn, self, locals, serviceName) { + if (typeof locals === 'string') { + serviceName = locals; + locals = null; + } - function instantiate(Type, locals, serviceName) { - // Check if Type is annotated and use just the given function at n-1 as parameter - // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]); - var ctor = (isArray(Type) ? Type[Type.length - 1] : Type); - var args = injectionArgs(Type, locals, serviceName); - // Empty object at position 0 is ignored for invocation with `new`, but required. - args.unshift(null); - return new (Function.prototype.bind.apply(ctor, args))(); - } + var args = injectionArgs(fn, locals, serviceName); + if (isArray(fn)) { + fn = fn[fn.length - 1]; + } + if (!isClass(fn)) { + // http://jsperf.com/angularjs-invoke-apply-vs-switch + // #5388 + return fn.apply(self, args); + } else { + args.unshift(null); + return new (Function.prototype.bind.apply(fn, args))(); + } + } - return { - invoke: invoke, - instantiate: instantiate, - get: getService, - annotate: createInjector.$$annotate, - has: function(name) { - return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name); - } - }; - } -} -createInjector.$$annotate = annotate; + function instantiate(Type, locals, serviceName) { + // Check if Type is annotated and use just the given function at n-1 as parameter + // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]); + var ctor = (isArray(Type) ? Type[Type.length - 1] : Type); + var args = injectionArgs(Type, locals, serviceName); + // Empty object at position 0 is ignored for invocation with `new`, but required. + args.unshift(null); + return new (Function.prototype.bind.apply(ctor, args))(); + } -/** - * @ngdoc provider - * @name $anchorScrollProvider - * - * @description - * Use `$anchorScrollProvider` to disable automatic scrolling whenever - * {@link ng.$location#hash $location.hash()} changes. - */ -function $AnchorScrollProvider() { - var autoScrollingEnabled = true; + return { + invoke: invoke, + instantiate: instantiate, + get: getService, + annotate: createInjector.$$annotate, + has: function (name) { + return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name); + } + }; + } + } - /** - * @ngdoc method - * @name $anchorScrollProvider#disableAutoScrolling - * - * @description - * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to - * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.
- * Use this method to disable automatic scrolling. - * - * If automatic scrolling is disabled, one must explicitly call - * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the - * current hash. - */ - this.disableAutoScrolling = function() { - autoScrollingEnabled = false; - }; - - /** - * @ngdoc service - * @name $anchorScroll - * @kind function - * @requires $window - * @requires $location - * @requires $rootScope - * - * @description - * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the - * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified - * in the - * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#the-indicated-part-of-the-document). - * - * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to - * match any anchor whenever it changes. This can be disabled by calling - * {@link ng.$anchorScrollProvider#disableAutoScrolling $anchorScrollProvider.disableAutoScrolling()}. - * - * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a - * vertical scroll-offset (either fixed or dynamic). - * - * @param {string=} hash The hash specifying the element to scroll to. If omitted, the value of - * {@link ng.$location#hash $location.hash()} will be used. - * - * @property {(number|function|jqLite)} yOffset - * If set, specifies a vertical scroll-offset. This is often useful when there are fixed - * positioned elements at the top of the page, such as navbars, headers etc. - * - * `yOffset` can be specified in various ways: - * - **number**: A fixed number of pixels to be used as offset.

- * - **function**: A getter function called everytime `$anchorScroll()` is executed. Must return - * a number representing the offset (in pixels).

- * - **jqLite**: A jqLite/jQuery element to be used for specifying the offset. The distance from - * the top of the page to the element's bottom will be used as offset.
- * **Note**: The element will be taken into account only as long as its `position` is set to - * `fixed`. This option is useful, when dealing with responsive navbars/headers that adjust - * their height and/or positioning according to the viewport's size. - * - *
- *
- * In order for `yOffset` to work properly, scrolling should take place on the document's root and - * not some child element. - *
- * - * @example - - + createInjector.$$annotate = annotate; + + /** + * @ngdoc provider + * @name $anchorScrollProvider + * + * @description + * Use `$anchorScrollProvider` to disable automatic scrolling whenever + * {@link ng.$location#hash $location.hash()} changes. + */ + function $AnchorScrollProvider() { + + var autoScrollingEnabled = true; + + /** + * @ngdoc method + * @name $anchorScrollProvider#disableAutoScrolling + * + * @description + * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to + * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.
+ * Use this method to disable automatic scrolling. + * + * If automatic scrolling is disabled, one must explicitly call + * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the + * current hash. + */ + this.disableAutoScrolling = function () { + autoScrollingEnabled = false; + }; + + /** + * @ngdoc service + * @name $anchorScroll + * @kind function + * @requires $window + * @requires $location + * @requires $rootScope + * + * @description + * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the + * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified + * in the + * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#the-indicated-part-of-the-document). + * + * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to + * match any anchor whenever it changes. This can be disabled by calling + * {@link ng.$anchorScrollProvider#disableAutoScrolling $anchorScrollProvider.disableAutoScrolling()}. + * + * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a + * vertical scroll-offset (either fixed or dynamic). + * + * @param {string=} hash The hash specifying the element to scroll to. If omitted, the value of + * {@link ng.$location#hash $location.hash()} will be used. + * + * @property {(number|function|jqLite)} yOffset + * If set, specifies a vertical scroll-offset. This is often useful when there are fixed + * positioned elements at the top of the page, such as navbars, headers etc. + * + * `yOffset` can be specified in various ways: + * - **number**: A fixed number of pixels to be used as offset.

+ * - **function**: A getter function called everytime `$anchorScroll()` is executed. Must return + * a number representing the offset (in pixels).

+ * - **jqLite**: A jqLite/jQuery element to be used for specifying the offset. The distance from + * the top of the page to the element's bottom will be used as offset.
+ * **Note**: The element will be taken into account only as long as its `position` is set to + * `fixed`. This option is useful, when dealing with responsive navbars/headers that adjust + * their height and/or positioning according to the viewport's size. + * + *
+ *
+ * In order for `yOffset` to work properly, scrolling should take place on the document's root and + * not some child element. + *
+ * + * @example + +
- Go to bottom - You're at the bottom! + Go to bottom + You're at the bottom!
- - + + angular.module('anchorScrollExample', []) - .controller('ScrollController', ['$scope', '$location', '$anchorScroll', - function ($scope, $location, $anchorScroll) { + .controller('ScrollController', ['$scope', '$location', '$anchorScroll', + function ($scope, $location, $anchorScroll) { $scope.gotoBottom = function() { // set the location.hash to the id of // the element you wish to scroll to. @@ -4789,8 +4822,8 @@ function $AnchorScrollProvider() { $anchorScroll(); }; }]); - - + + #scrollArea { height: 280px; overflow: auto; @@ -4800,32 +4833,32 @@ function $AnchorScrollProvider() { display: block; margin-top: 2000px; } - - - * - *
- * The example below illustrates the use of a vertical scroll-offset (specified as a fixed value). - * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details. - * - * @example - - + + + * + *
+ * The example below illustrates the use of a vertical scroll-offset (specified as a fixed value). + * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details. + * + * @example + +
- - Go to anchor {{x}} - + + Go to anchor {{x}} +
- Anchor {{x}} of 5 + Anchor {{x}} of 5
- - + + angular.module('anchorScrollOffsetExample', []) - .run(['$anchorScroll', function($anchorScroll) { + .run(['$anchorScroll', function($anchorScroll) { $anchorScroll.yOffset = 50; // always scroll by 50 extra pixels }]) - .controller('headerCtrl', ['$anchorScroll', '$location', '$scope', - function ($anchorScroll, $location, $scope) { + .controller('headerCtrl', ['$anchorScroll', '$location', '$scope', + function ($anchorScroll, $location, $scope) { $scope.gotoAnchor = function(x) { var newHash = 'anchor' + x; if ($location.hash() !== newHash) { @@ -4839,9 +4872,9 @@ function $AnchorScrollProvider() { } }; } - ]); - - + ]); + + body { padding-top: 50px; } @@ -4862,149 +4895,151 @@ function $AnchorScrollProvider() { display: inline-block; margin: 5px 15px; } - - - */ - this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) { - var document = $window.document; - - // Helper function to get first anchor from a NodeList - // (using `Array#some()` instead of `angular#forEach()` since it's more performant - // and working in all supported browsers.) - function getFirstAnchor(list) { - var result = null; - Array.prototype.some.call(list, function(element) { - if (nodeName_(element) === 'a') { - result = element; - return true; - } - }); - return result; - } + + + */ + this.$get = ['$window', '$location', '$rootScope', function ($window, $location, $rootScope) { + var document = $window.document; + + // Helper function to get first anchor from a NodeList + // (using `Array#some()` instead of `angular#forEach()` since it's more performant + // and working in all supported browsers.) + function getFirstAnchor(list) { + var result = null; + Array.prototype.some.call(list, function (element) { + if (nodeName_(element) === 'a') { + result = element; + return true; + } + }); + return result; + } - function getYOffset() { + function getYOffset() { - var offset = scroll.yOffset; + var offset = scroll.yOffset; - if (isFunction(offset)) { - offset = offset(); - } else if (isElement(offset)) { - var elem = offset[0]; - var style = $window.getComputedStyle(elem); - if (style.position !== 'fixed') { - offset = 0; - } else { - offset = elem.getBoundingClientRect().bottom; - } - } else if (!isNumber(offset)) { - offset = 0; - } + if (isFunction(offset)) { + offset = offset(); + } else if (isElement(offset)) { + var elem = offset[0]; + var style = $window.getComputedStyle(elem); + if (style.position !== 'fixed') { + offset = 0; + } else { + offset = elem.getBoundingClientRect().bottom; + } + } else if (!isNumber(offset)) { + offset = 0; + } - return offset; - } + return offset; + } - function scrollTo(elem) { - if (elem) { - elem.scrollIntoView(); - - var offset = getYOffset(); - - if (offset) { - // `offset` is the number of pixels we should scroll UP in order to align `elem` properly. - // This is true ONLY if the call to `elem.scrollIntoView()` initially aligns `elem` at the - // top of the viewport. - // - // IF the number of pixels from the top of `elem` to the end of the page's content is less - // than the height of the viewport, then `elem.scrollIntoView()` will align the `elem` some - // way down the page. - // - // This is often the case for elements near the bottom of the page. - // - // In such cases we do not need to scroll the whole `offset` up, just the difference between - // the top of the element and the offset, which is enough to align the top of `elem` at the - // desired position. - var elemTop = elem.getBoundingClientRect().top; - $window.scrollBy(0, elemTop - offset); - } - } else { - $window.scrollTo(0, 0); - } - } + function scrollTo(elem) { + if (elem) { + elem.scrollIntoView(); + + var offset = getYOffset(); + + if (offset) { + // `offset` is the number of pixels we should scroll UP in order to align `elem` properly. + // This is true ONLY if the call to `elem.scrollIntoView()` initially aligns `elem` at the + // top of the viewport. + // + // IF the number of pixels from the top of `elem` to the end of the page's content is less + // than the height of the viewport, then `elem.scrollIntoView()` will align the `elem` some + // way down the page. + // + // This is often the case for elements near the bottom of the page. + // + // In such cases we do not need to scroll the whole `offset` up, just the difference between + // the top of the element and the offset, which is enough to align the top of `elem` at the + // desired position. + var elemTop = elem.getBoundingClientRect().top; + $window.scrollBy(0, elemTop - offset); + } + } else { + $window.scrollTo(0, 0); + } + } + + function scroll(hash) { + hash = isString(hash) ? hash : $location.hash(); + var elm; - function scroll(hash) { - hash = isString(hash) ? hash : $location.hash(); - var elm; + // empty hash, scroll to the top of the page + if (!hash) scrollTo(null); - // empty hash, scroll to the top of the page - if (!hash) scrollTo(null); + // element with given id + else if ((elm = document.getElementById(hash))) scrollTo(elm); - // element with given id - else if ((elm = document.getElementById(hash))) scrollTo(elm); + // first anchor with given name :-D + else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm); - // first anchor with given name :-D - else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm); + // no element and hash == 'top', scroll to the top of the page + else if (hash === 'top') scrollTo(null); + } + + // does not scroll when user clicks on anchor link that is currently on + // (no url change, no $location.hash() change), browser native does scroll + if (autoScrollingEnabled) { + $rootScope.$watch(function autoScrollWatch() { + return $location.hash(); + }, + function autoScrollWatchAction(newVal, oldVal) { + // skip the initial scroll if $location.hash is empty + if (newVal === oldVal && newVal === '') return; + + jqLiteDocumentLoaded(function () { + $rootScope.$evalAsync(scroll); + }); + }); + } - // no element and hash == 'top', scroll to the top of the page - else if (hash === 'top') scrollTo(null); + return scroll; + }]; } - // does not scroll when user clicks on anchor link that is currently on - // (no url change, no $location.hash() change), browser native does scroll - if (autoScrollingEnabled) { - $rootScope.$watch(function autoScrollWatch() {return $location.hash();}, - function autoScrollWatchAction(newVal, oldVal) { - // skip the initial scroll if $location.hash is empty - if (newVal === oldVal && newVal === '') return; + var $animateMinErr = minErr('$animate'); + var ELEMENT_NODE = 1; + var NG_ANIMATE_CLASSNAME = 'ng-animate'; - jqLiteDocumentLoaded(function() { - $rootScope.$evalAsync(scroll); - }); - }); + function mergeClasses(a, b) { + if (!a && !b) return ''; + if (!a) return b; + if (!b) return a; + if (isArray(a)) a = a.join(' '); + if (isArray(b)) b = b.join(' '); + return a + ' ' + b; } - return scroll; - }]; -} - -var $animateMinErr = minErr('$animate'); -var ELEMENT_NODE = 1; -var NG_ANIMATE_CLASSNAME = 'ng-animate'; - -function mergeClasses(a,b) { - if (!a && !b) return ''; - if (!a) return b; - if (!b) return a; - if (isArray(a)) a = a.join(' '); - if (isArray(b)) b = b.join(' '); - return a + ' ' + b; -} - -function extractElementNode(element) { - for (var i = 0; i < element.length; i++) { - var elm = element[i]; - if (elm.nodeType === ELEMENT_NODE) { - return elm; + function extractElementNode(element) { + for (var i = 0; i < element.length; i++) { + var elm = element[i]; + if (elm.nodeType === ELEMENT_NODE) { + return elm; + } + } } - } -} - -function splitClasses(classes) { - if (isString(classes)) { - classes = classes.split(' '); - } - - // Use createMap() to prevent class assumptions involving property names in - // Object.prototype - var obj = createMap(); - forEach(classes, function(klass) { - // sometimes the split leaves empty string values - // incase extra spaces were applied to the options - if (klass.length) { - obj[klass] = true; + + function splitClasses(classes) { + if (isString(classes)) { + classes = classes.split(' '); + } + + // Use createMap() to prevent class assumptions involving property names in + // Object.prototype + var obj = createMap(); + forEach(classes, function (klass) { + // sometimes the split leaves empty string values + // incase extra spaces were applied to the options + if (klass.length) { + obj[klass] = true; + } + }); + return obj; } - }); - return obj; -} // if any other type of options value besides an Object value is // passed into the $animate.method() animation then this helper code @@ -5013,155 +5048,155 @@ function splitClasses(classes) { // $animate to either call the callback (< 1.2) or return a promise // that can be changed. This helper function ensures that the options // are wiped clean incase a callback function is provided. -function prepareAnimateOptions(options) { - return isObject(options) - ? options - : {}; -} + function prepareAnimateOptions(options) { + return isObject(options) + ? options + : {}; + } -var $$CoreAnimateJsProvider = function() { - this.$get = noop; -}; + var $$CoreAnimateJsProvider = function () { + this.$get = noop; + }; // this is prefixed with Core since it conflicts with // the animateQueueProvider defined in ngAnimate/animateQueue.js -var $$CoreAnimateQueueProvider = function() { - var postDigestQueue = new HashMap(); - var postDigestElements = []; - - this.$get = ['$$AnimateRunner', '$rootScope', - function($$AnimateRunner, $rootScope) { - return { - enabled: noop, - on: noop, - off: noop, - pin: noop, - - push: function(element, event, options, domOperation) { - domOperation && domOperation(); - - options = options || {}; - options.from && element.css(options.from); - options.to && element.css(options.to); - - if (options.addClass || options.removeClass) { - addRemoveClassesPostDigest(element, options.addClass, options.removeClass); - } - - var runner = new $$AnimateRunner(); // jshint ignore:line - - // since there are no animations to run the runner needs to be - // notified that the animation call is complete. - runner.complete(); - return runner; - } - }; - + var $$CoreAnimateQueueProvider = function () { + var postDigestQueue = new HashMap(); + var postDigestElements = []; + + this.$get = ['$$AnimateRunner', '$rootScope', + function ($$AnimateRunner, $rootScope) { + return { + enabled: noop, + on: noop, + off: noop, + pin: noop, + + push: function (element, event, options, domOperation) { + domOperation && domOperation(); + + options = options || {}; + options.from && element.css(options.from); + options.to && element.css(options.to); + + if (options.addClass || options.removeClass) { + addRemoveClassesPostDigest(element, options.addClass, options.removeClass); + } + + var runner = new $$AnimateRunner(); // jshint ignore:line + + // since there are no animations to run the runner needs to be + // notified that the animation call is complete. + runner.complete(); + return runner; + } + }; - function updateData(data, classes, value) { - var changed = false; - if (classes) { - classes = isString(classes) ? classes.split(' ') : - isArray(classes) ? classes : []; - forEach(classes, function(className) { - if (className) { - changed = true; - data[className] = value; - } - }); - } - return changed; - } - function handleCSSClassChanges() { - forEach(postDigestElements, function(element) { - var data = postDigestQueue.get(element); - if (data) { - var existing = splitClasses(element.attr('class')); - var toAdd = ''; - var toRemove = ''; - forEach(data, function(status, className) { - var hasClass = !!existing[className]; - if (status !== hasClass) { - if (status) { - toAdd += (toAdd.length ? ' ' : '') + className; - } else { - toRemove += (toRemove.length ? ' ' : '') + className; - } - } - }); + function updateData(data, classes, value) { + var changed = false; + if (classes) { + classes = isString(classes) ? classes.split(' ') : + isArray(classes) ? classes : []; + forEach(classes, function (className) { + if (className) { + changed = true; + data[className] = value; + } + }); + } + return changed; + } - forEach(element, function(elm) { - toAdd && jqLiteAddClass(elm, toAdd); - toRemove && jqLiteRemoveClass(elm, toRemove); - }); - postDigestQueue.remove(element); - } - }); - postDigestElements.length = 0; - } + function handleCSSClassChanges() { + forEach(postDigestElements, function (element) { + var data = postDigestQueue.get(element); + if (data) { + var existing = splitClasses(element.attr('class')); + var toAdd = ''; + var toRemove = ''; + forEach(data, function (status, className) { + var hasClass = !!existing[className]; + if (status !== hasClass) { + if (status) { + toAdd += (toAdd.length ? ' ' : '') + className; + } else { + toRemove += (toRemove.length ? ' ' : '') + className; + } + } + }); + + forEach(element, function (elm) { + toAdd && jqLiteAddClass(elm, toAdd); + toRemove && jqLiteRemoveClass(elm, toRemove); + }); + postDigestQueue.remove(element); + } + }); + postDigestElements.length = 0; + } - function addRemoveClassesPostDigest(element, add, remove) { - var data = postDigestQueue.get(element) || {}; + function addRemoveClassesPostDigest(element, add, remove) { + var data = postDigestQueue.get(element) || {}; - var classesAdded = updateData(data, add, true); - var classesRemoved = updateData(data, remove, false); + var classesAdded = updateData(data, add, true); + var classesRemoved = updateData(data, remove, false); - if (classesAdded || classesRemoved) { + if (classesAdded || classesRemoved) { - postDigestQueue.put(element, data); - postDigestElements.push(element); + postDigestQueue.put(element, data); + postDigestElements.push(element); - if (postDigestElements.length === 1) { - $rootScope.$$postDigest(handleCSSClassChanges); - } - } - } - }]; -}; + if (postDigestElements.length === 1) { + $rootScope.$$postDigest(handleCSSClassChanges); + } + } + } + }]; + }; -/** - * @ngdoc provider - * @name $animateProvider - * - * @description - * Default implementation of $animate that doesn't perform any animations, instead just - * synchronously performs DOM updates and resolves the returned runner promise. - * - * In order to enable animations the `ngAnimate` module has to be loaded. - * - * To see the functional implementation check out `src/ngAnimate/animate.js`. - */ -var $AnimateProvider = ['$provide', function($provide) { - var provider = this; + /** + * @ngdoc provider + * @name $animateProvider + * + * @description + * Default implementation of $animate that doesn't perform any animations, instead just + * synchronously performs DOM updates and resolves the returned runner promise. + * + * In order to enable animations the `ngAnimate` module has to be loaded. + * + * To see the functional implementation check out `src/ngAnimate/animate.js`. + */ + var $AnimateProvider = ['$provide', function ($provide) { + var provider = this; - this.$$registeredAnimations = Object.create(null); + this.$$registeredAnimations = Object.create(null); - /** - * @ngdoc method - * @name $animateProvider#register - * - * @description - * Registers a new injectable animation factory function. The factory function produces the - * animation object which contains callback functions for each event that is expected to be - * animated. - * - * * `eventFn`: `function(element, ... , doneFunction, options)` - * The element to animate, the `doneFunction` and the options fed into the animation. Depending - * on the type of animation additional arguments will be injected into the animation function. The - * list below explains the function signatures for the different animation methods: - * - * - setClass: function(element, addedClasses, removedClasses, doneFunction, options) - * - addClass: function(element, addedClasses, doneFunction, options) - * - removeClass: function(element, removedClasses, doneFunction, options) - * - enter, leave, move: function(element, doneFunction, options) - * - animate: function(element, fromStyles, toStyles, doneFunction, options) - * - * Make sure to trigger the `doneFunction` once the animation is fully complete. - * - * ```js - * return { + /** + * @ngdoc method + * @name $animateProvider#register + * + * @description + * Registers a new injectable animation factory function. The factory function produces the + * animation object which contains callback functions for each event that is expected to be + * animated. + * + * * `eventFn`: `function(element, ... , doneFunction, options)` + * The element to animate, the `doneFunction` and the options fed into the animation. Depending + * on the type of animation additional arguments will be injected into the animation function. The + * list below explains the function signatures for the different animation methods: + * + * - setClass: function(element, addedClasses, removedClasses, doneFunction, options) + * - addClass: function(element, addedClasses, doneFunction, options) + * - removeClass: function(element, removedClasses, doneFunction, options) + * - enter, leave, move: function(element, doneFunction, options) + * - animate: function(element, fromStyles, toStyles, doneFunction, options) + * + * Make sure to trigger the `doneFunction` once the animation is fully complete. + * + * ```js + * return { * //enter, leave, move signature * eventFn : function(element, done, options) { * //code to run the animation @@ -5171,367 +5206,367 @@ var $AnimateProvider = ['$provide', function($provide) { * } * } * } - * ``` - * - * @param {string} name The name of the animation (this is what the class-based CSS value will be compared to). - * @param {Function} factory The factory function that will be executed to return the animation - * object. - */ - this.register = function(name, factory) { - if (name && name.charAt(0) !== '.') { - throw $animateMinErr('notcsel', "Expecting class selector starting with '.' got '{0}'.", name); - } + * ``` + * + * @param {string} name The name of the animation (this is what the class-based CSS value will be compared to). + * @param {Function} factory The factory function that will be executed to return the animation + * object. + */ + this.register = function (name, factory) { + if (name && name.charAt(0) !== '.') { + throw $animateMinErr('notcsel', "Expecting class selector starting with '.' got '{0}'.", name); + } - var key = name + '-animation'; - provider.$$registeredAnimations[name.substr(1)] = key; - $provide.factory(key, factory); - }; + var key = name + '-animation'; + provider.$$registeredAnimations[name.substr(1)] = key; + $provide.factory(key, factory); + }; - /** - * @ngdoc method - * @name $animateProvider#classNameFilter - * - * @description - * Sets and/or returns the CSS class regular expression that is checked when performing - * an animation. Upon bootstrap the classNameFilter value is not set at all and will - * therefore enable $animate to attempt to perform an animation on any element that is triggered. - * When setting the `classNameFilter` value, animations will only be performed on elements - * that successfully match the filter expression. This in turn can boost performance - * for low-powered devices as well as applications containing a lot of structural operations. - * @param {RegExp=} expression The className expression which will be checked against all animations - * @return {RegExp} The current CSS className expression value. If null then there is no expression value - */ - this.classNameFilter = function(expression) { - if (arguments.length === 1) { - this.$$classNameFilter = (expression instanceof RegExp) ? expression : null; - if (this.$$classNameFilter) { - var reservedRegex = new RegExp("(\\s+|\\/)" + NG_ANIMATE_CLASSNAME + "(\\s+|\\/)"); - if (reservedRegex.test(this.$$classNameFilter.toString())) { - throw $animateMinErr('nongcls','$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME); + /** + * @ngdoc method + * @name $animateProvider#classNameFilter + * + * @description + * Sets and/or returns the CSS class regular expression that is checked when performing + * an animation. Upon bootstrap the classNameFilter value is not set at all and will + * therefore enable $animate to attempt to perform an animation on any element that is triggered. + * When setting the `classNameFilter` value, animations will only be performed on elements + * that successfully match the filter expression. This in turn can boost performance + * for low-powered devices as well as applications containing a lot of structural operations. + * @param {RegExp=} expression The className expression which will be checked against all animations + * @return {RegExp} The current CSS className expression value. If null then there is no expression value + */ + this.classNameFilter = function (expression) { + if (arguments.length === 1) { + this.$$classNameFilter = (expression instanceof RegExp) ? expression : null; + if (this.$$classNameFilter) { + var reservedRegex = new RegExp("(\\s+|\\/)" + NG_ANIMATE_CLASSNAME + "(\\s+|\\/)"); + if (reservedRegex.test(this.$$classNameFilter.toString())) { + throw $animateMinErr('nongcls', '$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME); - } - } - } - return this.$$classNameFilter; - }; - - this.$get = ['$$animateQueue', function($$animateQueue) { - function domInsert(element, parentElement, afterElement) { - // if for some reason the previous element was removed - // from the dom sometime before this code runs then let's - // just stick to using the parent element as the anchor - if (afterElement) { - var afterNode = extractElementNode(afterElement); - if (afterNode && !afterNode.parentNode && !afterNode.previousElementSibling) { - afterElement = null; - } - } - afterElement ? afterElement.after(element) : parentElement.prepend(element); - } + } + } + } + return this.$$classNameFilter; + }; - /** - * @ngdoc service - * @name $animate - * @description The $animate service exposes a series of DOM utility methods that provide support - * for animation hooks. The default behavior is the application of DOM operations, however, - * when an animation is detected (and animations are enabled), $animate will do the heavy lifting - * to ensure that animation runs with the triggered DOM operation. - * - * By default $animate doesn't trigger any animations. This is because the `ngAnimate` module isn't - * included and only when it is active then the animation hooks that `$animate` triggers will be - * functional. Once active then all structural `ng-` directives will trigger animations as they perform - * their DOM-related operations (enter, leave and move). Other directives such as `ngClass`, - * `ngShow`, `ngHide` and `ngMessages` also provide support for animations. - * - * It is recommended that the`$animate` service is always used when executing DOM-related procedures within directives. - * - * To learn more about enabling animation support, click here to visit the - * {@link ngAnimate ngAnimate module page}. - */ - return { - // we don't call it directly since non-existant arguments may - // be interpreted as null within the sub enabled function + this.$get = ['$$animateQueue', function ($$animateQueue) { + function domInsert(element, parentElement, afterElement) { + // if for some reason the previous element was removed + // from the dom sometime before this code runs then let's + // just stick to using the parent element as the anchor + if (afterElement) { + var afterNode = extractElementNode(afterElement); + if (afterNode && !afterNode.parentNode && !afterNode.previousElementSibling) { + afterElement = null; + } + } + afterElement ? afterElement.after(element) : parentElement.prepend(element); + } - /** - * - * @ngdoc method - * @name $animate#on - * @kind function - * @description Sets up an event listener to fire whenever the animation event (enter, leave, move, etc...) - * has fired on the given element or among any of its children. Once the listener is fired, the provided callback - * is fired with the following params: - * - * ```js - * $animate.on('enter', container, - * function callback(element, phase) { + /** + * @ngdoc service + * @name $animate + * @description The $animate service exposes a series of DOM utility methods that provide support + * for animation hooks. The default behavior is the application of DOM operations, however, + * when an animation is detected (and animations are enabled), $animate will do the heavy lifting + * to ensure that animation runs with the triggered DOM operation. + * + * By default $animate doesn't trigger any animations. This is because the `ngAnimate` module isn't + * included and only when it is active then the animation hooks that `$animate` triggers will be + * functional. Once active then all structural `ng-` directives will trigger animations as they perform + * their DOM-related operations (enter, leave and move). Other directives such as `ngClass`, + * `ngShow`, `ngHide` and `ngMessages` also provide support for animations. + * + * It is recommended that the`$animate` service is always used when executing DOM-related procedures within directives. + * + * To learn more about enabling animation support, click here to visit the + * {@link ngAnimate ngAnimate module page}. + */ + return { + // we don't call it directly since non-existant arguments may + // be interpreted as null within the sub enabled function + + /** + * + * @ngdoc method + * @name $animate#on + * @kind function + * @description Sets up an event listener to fire whenever the animation event (enter, leave, move, etc...) + * has fired on the given element or among any of its children. Once the listener is fired, the provided callback + * is fired with the following params: + * + * ```js + * $animate.on('enter', container, + * function callback(element, phase) { * // cool we detected an enter animation within the container * } - * ); - * ``` - * - * @param {string} event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...) - * @param {DOMElement} container the container element that will capture each of the animation events that are fired on itself - * as well as among its children - * @param {Function} callback the callback function that will be fired when the listener is triggered - * - * The arguments present in the callback function are: - * * `element` - The captured DOM element that the animation was fired on. - * * `phase` - The phase of the animation. The two possible phases are **start** (when the animation starts) and **close** (when it ends). - */ - on: $$animateQueue.on, - - /** - * - * @ngdoc method - * @name $animate#off - * @kind function - * @description Deregisters an event listener based on the event which has been associated with the provided element. This method - * can be used in three different ways depending on the arguments: - * - * ```js - * // remove all the animation event listeners listening for `enter` - * $animate.off('enter'); - * - * // remove listeners for all animation events from the container element - * $animate.off(container); - * - * // remove all the animation event listeners listening for `enter` on the given element and its children - * $animate.off('enter', container); - * - * // remove the event listener function provided by `callback` that is set - * // to listen for `enter` on the given `container` as well as its children - * $animate.off('enter', container, callback); - * ``` - * - * @param {string|DOMElement} event|container the animation event (e.g. enter, leave, move, - * addClass, removeClass, etc...), or the container element. If it is the element, all other - * arguments are ignored. - * @param {DOMElement=} container the container element the event listener was placed on - * @param {Function=} callback the callback function that was registered as the listener - */ - off: $$animateQueue.off, - - /** - * @ngdoc method - * @name $animate#pin - * @kind function - * @description Associates the provided element with a host parent element to allow the element to be animated even if it exists - * outside of the DOM structure of the Angular application. By doing so, any animation triggered via `$animate` can be issued on the - * element despite being outside the realm of the application or within another application. Say for example if the application - * was bootstrapped on an element that is somewhere inside of the `` tag, but we wanted to allow for an element to be situated - * as a direct child of `document.body`, then this can be achieved by pinning the element via `$animate.pin(element)`. Keep in mind - * that calling `$animate.pin(element, parentElement)` will not actually insert into the DOM anywhere; it will just create the association. - * - * Note that this feature is only active when the `ngAnimate` module is used. - * - * @param {DOMElement} element the external element that will be pinned - * @param {DOMElement} parentElement the host parent element that will be associated with the external element - */ - pin: $$animateQueue.pin, - - /** - * - * @ngdoc method - * @name $animate#enabled - * @kind function - * @description Used to get and set whether animations are enabled or not on the entire application or on an element and its children. This - * function can be called in four ways: - * - * ```js - * // returns true or false - * $animate.enabled(); - * - * // changes the enabled state for all animations - * $animate.enabled(false); - * $animate.enabled(true); - * - * // returns true or false if animations are enabled for an element - * $animate.enabled(element); - * - * // changes the enabled state for an element and its children - * $animate.enabled(element, true); - * $animate.enabled(element, false); - * ``` - * - * @param {DOMElement=} element the element that will be considered for checking/setting the enabled state - * @param {boolean=} enabled whether or not the animations will be enabled for the element - * - * @return {boolean} whether or not animations are enabled - */ - enabled: $$animateQueue.enabled, - - /** - * @ngdoc method - * @name $animate#cancel - * @kind function - * @description Cancels the provided animation. - * - * @param {Promise} animationPromise The animation promise that is returned when an animation is started. - */ - cancel: function(runner) { - runner.end && runner.end(); - }, - - /** - * - * @ngdoc method - * @name $animate#enter - * @kind function - * @description Inserts the element into the DOM either after the `after` element (if provided) or - * as the first child within the `parent` element and then triggers an animation. - * A promise is returned that will be resolved during the next digest once the animation - * has completed. - * - * @param {DOMElement} element the element which will be inserted into the DOM - * @param {DOMElement} parent the parent element which will append the element as - * a child (so long as the after element is not present) - * @param {DOMElement=} after the sibling element after which the element will be appended - * @param {object=} options an optional collection of options/styles that will be applied to the element - * - * @return {Promise} the animation callback promise - */ - enter: function(element, parent, after, options) { - parent = parent && jqLite(parent); - after = after && jqLite(after); - parent = parent || after.parent(); - domInsert(element, parent, after); - return $$animateQueue.push(element, 'enter', prepareAnimateOptions(options)); - }, - - /** - * - * @ngdoc method - * @name $animate#move - * @kind function - * @description Inserts (moves) the element into its new position in the DOM either after - * the `after` element (if provided) or as the first child within the `parent` element - * and then triggers an animation. A promise is returned that will be resolved - * during the next digest once the animation has completed. - * - * @param {DOMElement} element the element which will be moved into the new DOM position - * @param {DOMElement} parent the parent element which will append the element as - * a child (so long as the after element is not present) - * @param {DOMElement=} after the sibling element after which the element will be appended - * @param {object=} options an optional collection of options/styles that will be applied to the element - * - * @return {Promise} the animation callback promise - */ - move: function(element, parent, after, options) { - parent = parent && jqLite(parent); - after = after && jqLite(after); - parent = parent || after.parent(); - domInsert(element, parent, after); - return $$animateQueue.push(element, 'move', prepareAnimateOptions(options)); - }, - - /** - * @ngdoc method - * @name $animate#leave - * @kind function - * @description Triggers an animation and then removes the element from the DOM. - * When the function is called a promise is returned that will be resolved during the next - * digest once the animation has completed. - * - * @param {DOMElement} element the element which will be removed from the DOM - * @param {object=} options an optional collection of options/styles that will be applied to the element - * - * @return {Promise} the animation callback promise - */ - leave: function(element, options) { - return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function() { - element.remove(); - }); - }, - - /** - * @ngdoc method - * @name $animate#addClass - * @kind function - * - * @description Triggers an addClass animation surrounding the addition of the provided CSS class(es). Upon - * execution, the addClass operation will only be handled after the next digest and it will not trigger an - * animation if element already contains the CSS class or if the class is removed at a later step. - * Note that class-based animations are treated differently compared to structural animations - * (like enter, move and leave) since the CSS classes may be added/removed at different points - * depending if CSS or JavaScript animations are used. - * - * @param {DOMElement} element the element which the CSS classes will be applied to - * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces) - * @param {object=} options an optional collection of options/styles that will be applied to the element - * - * @return {Promise} the animation callback promise - */ - addClass: function(element, className, options) { - options = prepareAnimateOptions(options); - options.addClass = mergeClasses(options.addclass, className); - return $$animateQueue.push(element, 'addClass', options); - }, - - /** - * @ngdoc method - * @name $animate#removeClass - * @kind function - * - * @description Triggers a removeClass animation surrounding the removal of the provided CSS class(es). Upon - * execution, the removeClass operation will only be handled after the next digest and it will not trigger an - * animation if element does not contain the CSS class or if the class is added at a later step. - * Note that class-based animations are treated differently compared to structural animations - * (like enter, move and leave) since the CSS classes may be added/removed at different points - * depending if CSS or JavaScript animations are used. - * - * @param {DOMElement} element the element which the CSS classes will be applied to - * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces) - * @param {object=} options an optional collection of options/styles that will be applied to the element - * - * @return {Promise} the animation callback promise - */ - removeClass: function(element, className, options) { - options = prepareAnimateOptions(options); - options.removeClass = mergeClasses(options.removeClass, className); - return $$animateQueue.push(element, 'removeClass', options); - }, - - /** - * @ngdoc method - * @name $animate#setClass - * @kind function - * - * @description Performs both the addition and removal of a CSS classes on an element and (during the process) - * triggers an animation surrounding the class addition/removal. Much like `$animate.addClass` and - * `$animate.removeClass`, `setClass` will only evaluate the classes being added/removed once a digest has - * passed. Note that class-based animations are treated differently compared to structural animations - * (like enter, move and leave) since the CSS classes may be added/removed at different points - * depending if CSS or JavaScript animations are used. - * - * @param {DOMElement} element the element which the CSS classes will be applied to - * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces) - * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces) - * @param {object=} options an optional collection of options/styles that will be applied to the element - * - * @return {Promise} the animation callback promise - */ - setClass: function(element, add, remove, options) { - options = prepareAnimateOptions(options); - options.addClass = mergeClasses(options.addClass, add); - options.removeClass = mergeClasses(options.removeClass, remove); - return $$animateQueue.push(element, 'setClass', options); - }, - - /** - * @ngdoc method - * @name $animate#animate - * @kind function - * - * @description Performs an inline animation on the element which applies the provided to and from CSS styles to the element. - * If any detected CSS transition, keyframe or JavaScript matches the provided className value, then the animation will take - * on the provided styles. For example, if a transition animation is set for the given classNamem, then the provided `from` and - * `to` styles will be applied alongside the given transition. If the CSS style provided in `from` does not have a corresponding - * style in `to`, the style in `from` is applied immediately, and no animation is run. - * If a JavaScript animation is detected then the provided styles will be given in as function parameters into the `animate` - * method (or as part of the `options` parameter): - * - * ```js - * ngModule.animation('.my-inline-animation', function() { + * ); + * ``` + * + * @param {string} event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...) + * @param {DOMElement} container the container element that will capture each of the animation events that are fired on itself + * as well as among its children + * @param {Function} callback the callback function that will be fired when the listener is triggered + * + * The arguments present in the callback function are: + * * `element` - The captured DOM element that the animation was fired on. + * * `phase` - The phase of the animation. The two possible phases are **start** (when the animation starts) and **close** (when it ends). + */ + on: $$animateQueue.on, + + /** + * + * @ngdoc method + * @name $animate#off + * @kind function + * @description Deregisters an event listener based on the event which has been associated with the provided element. This method + * can be used in three different ways depending on the arguments: + * + * ```js + * // remove all the animation event listeners listening for `enter` + * $animate.off('enter'); + * + * // remove listeners for all animation events from the container element + * $animate.off(container); + * + * // remove all the animation event listeners listening for `enter` on the given element and its children + * $animate.off('enter', container); + * + * // remove the event listener function provided by `callback` that is set + * // to listen for `enter` on the given `container` as well as its children + * $animate.off('enter', container, callback); + * ``` + * + * @param {string|DOMElement} event|container the animation event (e.g. enter, leave, move, + * addClass, removeClass, etc...), or the container element. If it is the element, all other + * arguments are ignored. + * @param {DOMElement=} container the container element the event listener was placed on + * @param {Function=} callback the callback function that was registered as the listener + */ + off: $$animateQueue.off, + + /** + * @ngdoc method + * @name $animate#pin + * @kind function + * @description Associates the provided element with a host parent element to allow the element to be animated even if it exists + * outside of the DOM structure of the Angular application. By doing so, any animation triggered via `$animate` can be issued on the + * element despite being outside the realm of the application or within another application. Say for example if the application + * was bootstrapped on an element that is somewhere inside of the `` tag, but we wanted to allow for an element to be situated + * as a direct child of `document.body`, then this can be achieved by pinning the element via `$animate.pin(element)`. Keep in mind + * that calling `$animate.pin(element, parentElement)` will not actually insert into the DOM anywhere; it will just create the association. + * + * Note that this feature is only active when the `ngAnimate` module is used. + * + * @param {DOMElement} element the external element that will be pinned + * @param {DOMElement} parentElement the host parent element that will be associated with the external element + */ + pin: $$animateQueue.pin, + + /** + * + * @ngdoc method + * @name $animate#enabled + * @kind function + * @description Used to get and set whether animations are enabled or not on the entire application or on an element and its children. This + * function can be called in four ways: + * + * ```js + * // returns true or false + * $animate.enabled(); + * + * // changes the enabled state for all animations + * $animate.enabled(false); + * $animate.enabled(true); + * + * // returns true or false if animations are enabled for an element + * $animate.enabled(element); + * + * // changes the enabled state for an element and its children + * $animate.enabled(element, true); + * $animate.enabled(element, false); + * ``` + * + * @param {DOMElement=} element the element that will be considered for checking/setting the enabled state + * @param {boolean=} enabled whether or not the animations will be enabled for the element + * + * @return {boolean} whether or not animations are enabled + */ + enabled: $$animateQueue.enabled, + + /** + * @ngdoc method + * @name $animate#cancel + * @kind function + * @description Cancels the provided animation. + * + * @param {Promise} animationPromise The animation promise that is returned when an animation is started. + */ + cancel: function (runner) { + runner.end && runner.end(); + }, + + /** + * + * @ngdoc method + * @name $animate#enter + * @kind function + * @description Inserts the element into the DOM either after the `after` element (if provided) or + * as the first child within the `parent` element and then triggers an animation. + * A promise is returned that will be resolved during the next digest once the animation + * has completed. + * + * @param {DOMElement} element the element which will be inserted into the DOM + * @param {DOMElement} parent the parent element which will append the element as + * a child (so long as the after element is not present) + * @param {DOMElement=} after the sibling element after which the element will be appended + * @param {object=} options an optional collection of options/styles that will be applied to the element + * + * @return {Promise} the animation callback promise + */ + enter: function (element, parent, after, options) { + parent = parent && jqLite(parent); + after = after && jqLite(after); + parent = parent || after.parent(); + domInsert(element, parent, after); + return $$animateQueue.push(element, 'enter', prepareAnimateOptions(options)); + }, + + /** + * + * @ngdoc method + * @name $animate#move + * @kind function + * @description Inserts (moves) the element into its new position in the DOM either after + * the `after` element (if provided) or as the first child within the `parent` element + * and then triggers an animation. A promise is returned that will be resolved + * during the next digest once the animation has completed. + * + * @param {DOMElement} element the element which will be moved into the new DOM position + * @param {DOMElement} parent the parent element which will append the element as + * a child (so long as the after element is not present) + * @param {DOMElement=} after the sibling element after which the element will be appended + * @param {object=} options an optional collection of options/styles that will be applied to the element + * + * @return {Promise} the animation callback promise + */ + move: function (element, parent, after, options) { + parent = parent && jqLite(parent); + after = after && jqLite(after); + parent = parent || after.parent(); + domInsert(element, parent, after); + return $$animateQueue.push(element, 'move', prepareAnimateOptions(options)); + }, + + /** + * @ngdoc method + * @name $animate#leave + * @kind function + * @description Triggers an animation and then removes the element from the DOM. + * When the function is called a promise is returned that will be resolved during the next + * digest once the animation has completed. + * + * @param {DOMElement} element the element which will be removed from the DOM + * @param {object=} options an optional collection of options/styles that will be applied to the element + * + * @return {Promise} the animation callback promise + */ + leave: function (element, options) { + return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function () { + element.remove(); + }); + }, + + /** + * @ngdoc method + * @name $animate#addClass + * @kind function + * + * @description Triggers an addClass animation surrounding the addition of the provided CSS class(es). Upon + * execution, the addClass operation will only be handled after the next digest and it will not trigger an + * animation if element already contains the CSS class or if the class is removed at a later step. + * Note that class-based animations are treated differently compared to structural animations + * (like enter, move and leave) since the CSS classes may be added/removed at different points + * depending if CSS or JavaScript animations are used. + * + * @param {DOMElement} element the element which the CSS classes will be applied to + * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces) + * @param {object=} options an optional collection of options/styles that will be applied to the element + * + * @return {Promise} the animation callback promise + */ + addClass: function (element, className, options) { + options = prepareAnimateOptions(options); + options.addClass = mergeClasses(options.addclass, className); + return $$animateQueue.push(element, 'addClass', options); + }, + + /** + * @ngdoc method + * @name $animate#removeClass + * @kind function + * + * @description Triggers a removeClass animation surrounding the removal of the provided CSS class(es). Upon + * execution, the removeClass operation will only be handled after the next digest and it will not trigger an + * animation if element does not contain the CSS class or if the class is added at a later step. + * Note that class-based animations are treated differently compared to structural animations + * (like enter, move and leave) since the CSS classes may be added/removed at different points + * depending if CSS or JavaScript animations are used. + * + * @param {DOMElement} element the element which the CSS classes will be applied to + * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces) + * @param {object=} options an optional collection of options/styles that will be applied to the element + * + * @return {Promise} the animation callback promise + */ + removeClass: function (element, className, options) { + options = prepareAnimateOptions(options); + options.removeClass = mergeClasses(options.removeClass, className); + return $$animateQueue.push(element, 'removeClass', options); + }, + + /** + * @ngdoc method + * @name $animate#setClass + * @kind function + * + * @description Performs both the addition and removal of a CSS classes on an element and (during the process) + * triggers an animation surrounding the class addition/removal. Much like `$animate.addClass` and + * `$animate.removeClass`, `setClass` will only evaluate the classes being added/removed once a digest has + * passed. Note that class-based animations are treated differently compared to structural animations + * (like enter, move and leave) since the CSS classes may be added/removed at different points + * depending if CSS or JavaScript animations are used. + * + * @param {DOMElement} element the element which the CSS classes will be applied to + * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces) + * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces) + * @param {object=} options an optional collection of options/styles that will be applied to the element + * + * @return {Promise} the animation callback promise + */ + setClass: function (element, add, remove, options) { + options = prepareAnimateOptions(options); + options.addClass = mergeClasses(options.addClass, add); + options.removeClass = mergeClasses(options.removeClass, remove); + return $$animateQueue.push(element, 'setClass', options); + }, + + /** + * @ngdoc method + * @name $animate#animate + * @kind function + * + * @description Performs an inline animation on the element which applies the provided to and from CSS styles to the element. + * If any detected CSS transition, keyframe or JavaScript matches the provided className value, then the animation will take + * on the provided styles. For example, if a transition animation is set for the given classNamem, then the provided `from` and + * `to` styles will be applied alongside the given transition. If the CSS style provided in `from` does not have a corresponding + * style in `to`, the style in `from` is applied immediately, and no animation is run. + * If a JavaScript animation is detected then the provided styles will be given in as function parameters into the `animate` + * method (or as part of the `options` parameter): + * + * ```js + * ngModule.animation('.my-inline-animation', function() { * return { * animate : function(element, from, to, done, options) { * //animation @@ -5539,709 +5574,713 @@ var $AnimateProvider = ['$provide', function($provide) { * } * } * }); - * ``` - * - * @param {DOMElement} element the element which the CSS styles will be applied to - * @param {object} from the from (starting) CSS styles that will be applied to the element and across the animation. - * @param {object} to the to (destination) CSS styles that will be applied to the element and across the animation. - * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If - * this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element. - * (Note that if no animation is detected then this value will not be applied to the element.) - * @param {object=} options an optional collection of options/styles that will be applied to the element - * - * @return {Promise} the animation callback promise - */ - animate: function(element, from, to, className, options) { - options = prepareAnimateOptions(options); - options.from = options.from ? extend(options.from, from) : from; - options.to = options.to ? extend(options.to, to) : to; - - className = className || 'ng-inline-animate'; - options.tempClasses = mergeClasses(options.tempClasses, className); - return $$animateQueue.push(element, 'animate', options); - } - }; - }]; -}]; - -var $$AnimateAsyncRunFactoryProvider = function() { - this.$get = ['$$rAF', function($$rAF) { - var waitQueue = []; - - function waitForTick(fn) { - waitQueue.push(fn); - if (waitQueue.length > 1) return; - $$rAF(function() { - for (var i = 0; i < waitQueue.length; i++) { - waitQueue[i](); - } - waitQueue = []; - }); - } + * ``` + * + * @param {DOMElement} element the element which the CSS styles will be applied to + * @param {object} from the from (starting) CSS styles that will be applied to the element and across the animation. + * @param {object} to the to (destination) CSS styles that will be applied to the element and across the animation. + * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If + * this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element. + * (Note that if no animation is detected then this value will not be applied to the element.) + * @param {object=} options an optional collection of options/styles that will be applied to the element + * + * @return {Promise} the animation callback promise + */ + animate: function (element, from, to, className, options) { + options = prepareAnimateOptions(options); + options.from = options.from ? extend(options.from, from) : from; + options.to = options.to ? extend(options.to, to) : to; + + className = className || 'ng-inline-animate'; + options.tempClasses = mergeClasses(options.tempClasses, className); + return $$animateQueue.push(element, 'animate', options); + } + }; + }]; + }]; - return function() { - var passed = false; - waitForTick(function() { - passed = true; - }); - return function(callback) { - passed ? callback() : waitForTick(callback); - }; - }; - }]; -}; + var $$AnimateAsyncRunFactoryProvider = function () { + this.$get = ['$$rAF', function ($$rAF) { + var waitQueue = []; -var $$AnimateRunnerFactoryProvider = function() { - this.$get = ['$q', '$sniffer', '$$animateAsyncRun', '$document', '$timeout', - function($q, $sniffer, $$animateAsyncRun, $document, $timeout) { + function waitForTick(fn) { + waitQueue.push(fn); + if (waitQueue.length > 1) return; + $$rAF(function () { + for (var i = 0; i < waitQueue.length; i++) { + waitQueue[i](); + } + waitQueue = []; + }); + } - var INITIAL_STATE = 0; - var DONE_PENDING_STATE = 1; - var DONE_COMPLETE_STATE = 2; + return function () { + var passed = false; + waitForTick(function () { + passed = true; + }); + return function (callback) { + passed ? callback() : waitForTick(callback); + }; + }; + }]; + }; - AnimateRunner.chain = function(chain, callback) { - var index = 0; + var $$AnimateRunnerFactoryProvider = function () { + this.$get = ['$q', '$sniffer', '$$animateAsyncRun', '$document', '$timeout', + function ($q, $sniffer, $$animateAsyncRun, $document, $timeout) { - next(); - function next() { - if (index === chain.length) { - callback(true); - return; - } + var INITIAL_STATE = 0; + var DONE_PENDING_STATE = 1; + var DONE_COMPLETE_STATE = 2; - chain[index](function(response) { - if (response === false) { - callback(false); - return; - } - index++; - next(); - }); - } - }; + AnimateRunner.chain = function (chain, callback) { + var index = 0; - AnimateRunner.all = function(runners, callback) { - var count = 0; - var status = true; - forEach(runners, function(runner) { - runner.done(onProgress); - }); + next(); - function onProgress(response) { - status = status && response; - if (++count === runners.length) { - callback(status); - } - } - }; + function next() { + if (index === chain.length) { + callback(true); + return; + } - function AnimateRunner(host) { - this.setHost(host); + chain[index](function (response) { + if (response === false) { + callback(false); + return; + } + index++; + next(); + }); + } + }; - var rafTick = $$animateAsyncRun(); - var timeoutTick = function(fn) { - $timeout(fn, 0, false); - }; + AnimateRunner.all = function (runners, callback) { + var count = 0; + var status = true; + forEach(runners, function (runner) { + runner.done(onProgress); + }); + + function onProgress(response) { + status = status && response; + if (++count === runners.length) { + callback(status); + } + } + }; - this._doneCallbacks = []; - this._tick = function(fn) { - var doc = $document[0]; + function AnimateRunner(host) { + this.setHost(host); + + var rafTick = $$animateAsyncRun(); + var timeoutTick = function (fn) { + $timeout(fn, 0, false); + }; + + this._doneCallbacks = []; + this._tick = function (fn) { + var doc = $document[0]; + + // the document may not be ready or attached + // to the module for some internal tests + if (doc && doc.hidden) { + timeoutTick(fn); + } else { + rafTick(fn); + } + }; + this._state = 0; + } - // the document may not be ready or attached - // to the module for some internal tests - if (doc && doc.hidden) { - timeoutTick(fn); - } else { - rafTick(fn); - } - }; - this._state = 0; - } + AnimateRunner.prototype = { + setHost: function (host) { + this.host = host || {}; + }, + + done: function (fn) { + if (this._state === DONE_COMPLETE_STATE) { + fn(); + } else { + this._doneCallbacks.push(fn); + } + }, + + progress: noop, + + getPromise: function () { + if (!this.promise) { + var self = this; + this.promise = $q(function (resolve, reject) { + self.done(function (status) { + status === false ? reject() : resolve(); + }); + }); + } + return this.promise; + }, + + then: function (resolveHandler, rejectHandler) { + return this.getPromise().then(resolveHandler, rejectHandler); + }, + + 'catch': function (handler) { + return this.getPromise()['catch'](handler); + }, + + 'finally': function (handler) { + return this.getPromise()['finally'](handler); + }, + + pause: function () { + if (this.host.pause) { + this.host.pause(); + } + }, + + resume: function () { + if (this.host.resume) { + this.host.resume(); + } + }, + + end: function () { + if (this.host.end) { + this.host.end(); + } + this._resolve(true); + }, + + cancel: function () { + if (this.host.cancel) { + this.host.cancel(); + } + this._resolve(false); + }, + + complete: function (response) { + var self = this; + if (self._state === INITIAL_STATE) { + self._state = DONE_PENDING_STATE; + self._tick(function () { + self._resolve(response); + }); + } + }, + + _resolve: function (response) { + if (this._state !== DONE_COMPLETE_STATE) { + forEach(this._doneCallbacks, function (fn) { + fn(response); + }); + this._doneCallbacks.length = 0; + this._state = DONE_COMPLETE_STATE; + } + } + }; - AnimateRunner.prototype = { - setHost: function(host) { - this.host = host || {}; - }, + return AnimateRunner; + }]; + }; - done: function(fn) { - if (this._state === DONE_COMPLETE_STATE) { - fn(); - } else { - this._doneCallbacks.push(fn); - } - }, + /** + * @ngdoc service + * @name $animateCss + * @kind object + * + * @description + * This is the core version of `$animateCss`. By default, only when the `ngAnimate` is included, + * then the `$animateCss` service will actually perform animations. + * + * Click here {@link ngAnimate.$animateCss to read the documentation for $animateCss}. + */ + var $CoreAnimateCssProvider = function () { + this.$get = ['$$rAF', '$q', '$$AnimateRunner', function ($$rAF, $q, $$AnimateRunner) { + + return function (element, initialOptions) { + // all of the animation functions should create + // a copy of the options data, however, if a + // parent service has already created a copy then + // we should stick to using that + var options = initialOptions || {}; + if (!options.$$prepared) { + options = copy(options); + } - progress: noop, + // there is no point in applying the styles since + // there is no animation that goes on at all in + // this version of $animateCss. + if (options.cleanupStyles) { + options.from = options.to = null; + } - getPromise: function() { - if (!this.promise) { - var self = this; - this.promise = $q(function(resolve, reject) { - self.done(function(status) { - status === false ? reject() : resolve(); - }); - }); - } - return this.promise; - }, + if (options.from) { + element.css(options.from); + options.from = null; + } - then: function(resolveHandler, rejectHandler) { - return this.getPromise().then(resolveHandler, rejectHandler); - }, + /* jshint newcap: false */ + var closed, runner = new $$AnimateRunner(); + return { + start: run, + end: run + }; - 'catch': function(handler) { - return this.getPromise()['catch'](handler); - }, + function run() { + $$rAF(function () { + applyAnimationContents(); + if (!closed) { + runner.complete(); + } + closed = true; + }); + return runner; + } - 'finally': function(handler) { - return this.getPromise()['finally'](handler); - }, + function applyAnimationContents() { + if (options.addClass) { + element.addClass(options.addClass); + options.addClass = null; + } + if (options.removeClass) { + element.removeClass(options.removeClass); + options.removeClass = null; + } + if (options.to) { + element.css(options.to); + options.to = null; + } + } + }; + }]; + }; - pause: function() { - if (this.host.pause) { - this.host.pause(); - } - }, + /* global stripHash: true */ - resume: function() { - if (this.host.resume) { - this.host.resume(); - } - }, + /** + * ! This is a private undocumented service ! + * + * @name $browser + * @requires $log + * @description + * This object has two goals: + * + * - hide all the global state in the browser caused by the window object + * - abstract away all the browser specific features and inconsistencies + * + * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser` + * service, which can be used for convenient testing of the application without the interaction with + * the real browser apis. + */ + /** + * @param {object} window The global window object. + * @param {object} document jQuery wrapped document. + * @param {object} $log window.console or an object with the same interface. + * @param {object} $sniffer $sniffer service + */ + function Browser(window, document, $log, $sniffer) { + var self = this, + location = window.location, + history = window.history, + setTimeout = window.setTimeout, + clearTimeout = window.clearTimeout, + pendingDeferIds = {}; + + self.isMock = false; + + var outstandingRequestCount = 0; + var outstandingRequestCallbacks = []; + + // TODO(vojta): remove this temporary api + self.$$completeOutstandingRequest = completeOutstandingRequest; + self.$$incOutstandingRequestCount = function () { + outstandingRequestCount++; + }; - end: function() { - if (this.host.end) { - this.host.end(); + /** + * Executes the `fn` function(supports currying) and decrements the `outstandingRequestCallbacks` + * counter. If the counter reaches 0, all the `outstandingRequestCallbacks` are executed. + */ + function completeOutstandingRequest(fn) { + try { + fn.apply(null, sliceArgs(arguments, 1)); + } finally { + outstandingRequestCount--; + if (outstandingRequestCount === 0) { + while (outstandingRequestCallbacks.length) { + try { + outstandingRequestCallbacks.pop()(); + } catch (e) { + $log.error(e); + } + } + } + } } - this._resolve(true); - }, - cancel: function() { - if (this.host.cancel) { - this.host.cancel(); + function getHash(url) { + var index = url.indexOf('#'); + return index === -1 ? '' : url.substr(index); } - this._resolve(false); - }, - - complete: function(response) { - var self = this; - if (self._state === INITIAL_STATE) { - self._state = DONE_PENDING_STATE; - self._tick(function() { - self._resolve(response); - }); - } - }, - _resolve: function(response) { - if (this._state !== DONE_COMPLETE_STATE) { - forEach(this._doneCallbacks, function(fn) { - fn(response); - }); - this._doneCallbacks.length = 0; - this._state = DONE_COMPLETE_STATE; - } - } - }; + /** + * @private + * Note: this method is used only by scenario runner + * TODO(vojta): prefix this method with $$ ? + * @param {function()} callback Function that will be called when no outstanding request + */ + self.notifyWhenNoOutstandingRequests = function (callback) { + if (outstandingRequestCount === 0) { + callback(); + } else { + outstandingRequestCallbacks.push(callback); + } + }; - return AnimateRunner; - }]; -}; + ////////////////////////////////////////////////////////////// + // URL API + ////////////////////////////////////////////////////////////// -/** - * @ngdoc service - * @name $animateCss - * @kind object - * - * @description - * This is the core version of `$animateCss`. By default, only when the `ngAnimate` is included, - * then the `$animateCss` service will actually perform animations. - * - * Click here {@link ngAnimate.$animateCss to read the documentation for $animateCss}. - */ -var $CoreAnimateCssProvider = function() { - this.$get = ['$$rAF', '$q', '$$AnimateRunner', function($$rAF, $q, $$AnimateRunner) { - - return function(element, initialOptions) { - // all of the animation functions should create - // a copy of the options data, however, if a - // parent service has already created a copy then - // we should stick to using that - var options = initialOptions || {}; - if (!options.$$prepared) { - options = copy(options); - } - - // there is no point in applying the styles since - // there is no animation that goes on at all in - // this version of $animateCss. - if (options.cleanupStyles) { - options.from = options.to = null; - } + var cachedState, lastHistoryState, + lastBrowserUrl = location.href, + baseElement = document.find('base'), + pendingLocation = null, + getCurrentState = !$sniffer.history ? noop : function getCurrentState() { + try { + return history.state; + } catch (e) { + // MSIE can reportedly throw when there is no state (UNCONFIRMED). + } + }; - if (options.from) { - element.css(options.from); - options.from = null; - } + cacheState(); + lastHistoryState = cachedState; - /* jshint newcap: false */ - var closed, runner = new $$AnimateRunner(); - return { - start: run, - end: run - }; + /** + * @name $browser#url + * + * @description + * GETTER: + * Without any argument, this method just returns current value of location.href. + * + * SETTER: + * With at least one argument, this method sets url to new value. + * If html5 history api supported, pushState/replaceState is used, otherwise + * location.href/location.replace is used. + * Returns its own instance to allow chaining + * + * NOTE: this api is intended for use only by the $location service. Please use the + * {@link ng.$location $location service} to change url. + * + * @param {string} url New url (when used as setter) + * @param {boolean=} replace Should new url replace current history record? + * @param {object=} state object to use with pushState/replaceState + */ + self.url = function (url, replace, state) { + // In modern browsers `history.state` is `null` by default; treating it separately + // from `undefined` would cause `$browser.url('/foo')` to change `history.state` + // to undefined via `pushState`. Instead, let's change `undefined` to `null` here. + if (isUndefined(state)) { + state = null; + } - function run() { - $$rAF(function() { - applyAnimationContents(); - if (!closed) { - runner.complete(); - } - closed = true; - }); - return runner; - } + // Android Browser BFCache causes location, history reference to become stale. + if (location !== window.location) location = window.location; + if (history !== window.history) history = window.history; - function applyAnimationContents() { - if (options.addClass) { - element.addClass(options.addClass); - options.addClass = null; - } - if (options.removeClass) { - element.removeClass(options.removeClass); - options.removeClass = null; - } - if (options.to) { - element.css(options.to); - options.to = null; - } - } - }; - }]; -}; + // setter + if (url) { + var sameState = lastHistoryState === state; -/* global stripHash: true */ + // Don't change anything if previous and current URLs and states match. This also prevents + // IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode. + // See https://github.com/angular/angular.js/commit/ffb2701 + if (lastBrowserUrl === url && (!$sniffer.history || sameState)) { + return self; + } + var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url); + lastBrowserUrl = url; + lastHistoryState = state; + // Don't use history API if only the hash changed + // due to a bug in IE10/IE11 which leads + // to not firing a `hashchange` nor `popstate` event + // in some cases (see #9143). + if ($sniffer.history && (!sameBase || !sameState)) { + history[replace ? 'replaceState' : 'pushState'](state, '', url); + cacheState(); + // Do the assignment again so that those two variables are referentially identical. + lastHistoryState = cachedState; + } else { + if (!sameBase || pendingLocation) { + pendingLocation = url; + } + if (replace) { + location.replace(url); + } else if (!sameBase) { + location.href = url; + } else { + location.hash = getHash(url); + } + if (location.href !== url) { + pendingLocation = url; + } + } + return self; + // getter + } else { + // - pendingLocation is needed as browsers don't allow to read out + // the new location.href if a reload happened or if there is a bug like in iOS 9 (see + // https://openradar.appspot.com/22186109). + // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172 + return pendingLocation || location.href.replace(/%27/g, "'"); + } + }; -/** - * ! This is a private undocumented service ! - * - * @name $browser - * @requires $log - * @description - * This object has two goals: - * - * - hide all the global state in the browser caused by the window object - * - abstract away all the browser specific features and inconsistencies - * - * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser` - * service, which can be used for convenient testing of the application without the interaction with - * the real browser apis. - */ -/** - * @param {object} window The global window object. - * @param {object} document jQuery wrapped document. - * @param {object} $log window.console or an object with the same interface. - * @param {object} $sniffer $sniffer service - */ -function Browser(window, document, $log, $sniffer) { - var self = this, - location = window.location, - history = window.history, - setTimeout = window.setTimeout, - clearTimeout = window.clearTimeout, - pendingDeferIds = {}; - - self.isMock = false; - - var outstandingRequestCount = 0; - var outstandingRequestCallbacks = []; - - // TODO(vojta): remove this temporary api - self.$$completeOutstandingRequest = completeOutstandingRequest; - self.$$incOutstandingRequestCount = function() { outstandingRequestCount++; }; - - /** - * Executes the `fn` function(supports currying) and decrements the `outstandingRequestCallbacks` - * counter. If the counter reaches 0, all the `outstandingRequestCallbacks` are executed. - */ - function completeOutstandingRequest(fn) { - try { - fn.apply(null, sliceArgs(arguments, 1)); - } finally { - outstandingRequestCount--; - if (outstandingRequestCount === 0) { - while (outstandingRequestCallbacks.length) { - try { - outstandingRequestCallbacks.pop()(); - } catch (e) { - $log.error(e); - } - } - } - } - } - - function getHash(url) { - var index = url.indexOf('#'); - return index === -1 ? '' : url.substr(index); - } - - /** - * @private - * Note: this method is used only by scenario runner - * TODO(vojta): prefix this method with $$ ? - * @param {function()} callback Function that will be called when no outstanding request - */ - self.notifyWhenNoOutstandingRequests = function(callback) { - if (outstandingRequestCount === 0) { - callback(); - } else { - outstandingRequestCallbacks.push(callback); - } - }; + /** + * @name $browser#state + * + * @description + * This method is a getter. + * + * Return history.state or null if history.state is undefined. + * + * @returns {object} state + */ + self.state = function () { + return cachedState; + }; - ////////////////////////////////////////////////////////////// - // URL API - ////////////////////////////////////////////////////////////// + var urlChangeListeners = [], + urlChangeInit = false; - var cachedState, lastHistoryState, - lastBrowserUrl = location.href, - baseElement = document.find('base'), - pendingLocation = null, - getCurrentState = !$sniffer.history ? noop : function getCurrentState() { - try { - return history.state; - } catch (e) { - // MSIE can reportedly throw when there is no state (UNCONFIRMED). + function cacheStateAndFireUrlChange() { + pendingLocation = null; + cacheState(); + fireUrlChange(); } - }; - cacheState(); - lastHistoryState = cachedState; + // This variable should be used *only* inside the cacheState function. + var lastCachedState = null; - /** - * @name $browser#url - * - * @description - * GETTER: - * Without any argument, this method just returns current value of location.href. - * - * SETTER: - * With at least one argument, this method sets url to new value. - * If html5 history api supported, pushState/replaceState is used, otherwise - * location.href/location.replace is used. - * Returns its own instance to allow chaining - * - * NOTE: this api is intended for use only by the $location service. Please use the - * {@link ng.$location $location service} to change url. - * - * @param {string} url New url (when used as setter) - * @param {boolean=} replace Should new url replace current history record? - * @param {object=} state object to use with pushState/replaceState - */ - self.url = function(url, replace, state) { - // In modern browsers `history.state` is `null` by default; treating it separately - // from `undefined` would cause `$browser.url('/foo')` to change `history.state` - // to undefined via `pushState`. Instead, let's change `undefined` to `null` here. - if (isUndefined(state)) { - state = null; - } + function cacheState() { + // This should be the only place in $browser where `history.state` is read. + cachedState = getCurrentState(); + cachedState = isUndefined(cachedState) ? null : cachedState; - // Android Browser BFCache causes location, history reference to become stale. - if (location !== window.location) location = window.location; - if (history !== window.history) history = window.history; + // Prevent callbacks fo fire twice if both hashchange & popstate were fired. + if (equals(cachedState, lastCachedState)) { + cachedState = lastCachedState; + } + lastCachedState = cachedState; + } - // setter - if (url) { - var sameState = lastHistoryState === state; + function fireUrlChange() { + if (lastBrowserUrl === self.url() && lastHistoryState === cachedState) { + return; + } - // Don't change anything if previous and current URLs and states match. This also prevents - // IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode. - // See https://github.com/angular/angular.js/commit/ffb2701 - if (lastBrowserUrl === url && (!$sniffer.history || sameState)) { - return self; - } - var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url); - lastBrowserUrl = url; - lastHistoryState = state; - // Don't use history API if only the hash changed - // due to a bug in IE10/IE11 which leads - // to not firing a `hashchange` nor `popstate` event - // in some cases (see #9143). - if ($sniffer.history && (!sameBase || !sameState)) { - history[replace ? 'replaceState' : 'pushState'](state, '', url); - cacheState(); - // Do the assignment again so that those two variables are referentially identical. - lastHistoryState = cachedState; - } else { - if (!sameBase || pendingLocation) { - pendingLocation = url; - } - if (replace) { - location.replace(url); - } else if (!sameBase) { - location.href = url; - } else { - location.hash = getHash(url); - } - if (location.href !== url) { - pendingLocation = url; + lastBrowserUrl = self.url(); + lastHistoryState = cachedState; + forEach(urlChangeListeners, function (listener) { + listener(self.url(), cachedState); + }); } - } - return self; - // getter - } else { - // - pendingLocation is needed as browsers don't allow to read out - // the new location.href if a reload happened or if there is a bug like in iOS 9 (see - // https://openradar.appspot.com/22186109). - // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172 - return pendingLocation || location.href.replace(/%27/g,"'"); - } - }; - /** - * @name $browser#state - * - * @description - * This method is a getter. - * - * Return history.state or null if history.state is undefined. - * - * @returns {object} state - */ - self.state = function() { - return cachedState; - }; - - var urlChangeListeners = [], - urlChangeInit = false; - - function cacheStateAndFireUrlChange() { - pendingLocation = null; - cacheState(); - fireUrlChange(); - } - - // This variable should be used *only* inside the cacheState function. - var lastCachedState = null; - function cacheState() { - // This should be the only place in $browser where `history.state` is read. - cachedState = getCurrentState(); - cachedState = isUndefined(cachedState) ? null : cachedState; - - // Prevent callbacks fo fire twice if both hashchange & popstate were fired. - if (equals(cachedState, lastCachedState)) { - cachedState = lastCachedState; - } - lastCachedState = cachedState; - } + /** + * @name $browser#onUrlChange + * + * @description + * Register callback function that will be called, when url changes. + * + * It's only called when the url is changed from outside of angular: + * - user types different url into address bar + * - user clicks on history (forward/back) button + * - user clicks on a link + * + * It's not called when url is changed by $browser.url() method + * + * The listener gets called with new url as parameter. + * + * NOTE: this api is intended for use only by the $location service. Please use the + * {@link ng.$location $location service} to monitor url changes in angular apps. + * + * @param {function(string)} listener Listener function to be called when url changes. + * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous. + */ + self.onUrlChange = function (callback) { + // TODO(vojta): refactor to use node's syntax for events + if (!urlChangeInit) { + // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera) + // don't fire popstate when user change the address bar and don't fire hashchange when url + // changed by push/replaceState + + // html5 history api - popstate event + if ($sniffer.history) jqLite(window).on('popstate', cacheStateAndFireUrlChange); + // hashchange event + jqLite(window).on('hashchange', cacheStateAndFireUrlChange); + + urlChangeInit = true; + } - function fireUrlChange() { - if (lastBrowserUrl === self.url() && lastHistoryState === cachedState) { - return; - } + urlChangeListeners.push(callback); + return callback; + }; - lastBrowserUrl = self.url(); - lastHistoryState = cachedState; - forEach(urlChangeListeners, function(listener) { - listener(self.url(), cachedState); - }); - } + /** + * @private + * Remove popstate and hashchange handler from window. + * + * NOTE: this api is intended for use only by $rootScope. + */ + self.$$applicationDestroyed = function () { + jqLite(window).off('hashchange popstate', cacheStateAndFireUrlChange); + }; - /** - * @name $browser#onUrlChange - * - * @description - * Register callback function that will be called, when url changes. - * - * It's only called when the url is changed from outside of angular: - * - user types different url into address bar - * - user clicks on history (forward/back) button - * - user clicks on a link - * - * It's not called when url is changed by $browser.url() method - * - * The listener gets called with new url as parameter. - * - * NOTE: this api is intended for use only by the $location service. Please use the - * {@link ng.$location $location service} to monitor url changes in angular apps. - * - * @param {function(string)} listener Listener function to be called when url changes. - * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous. - */ - self.onUrlChange = function(callback) { - // TODO(vojta): refactor to use node's syntax for events - if (!urlChangeInit) { - // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera) - // don't fire popstate when user change the address bar and don't fire hashchange when url - // changed by push/replaceState - - // html5 history api - popstate event - if ($sniffer.history) jqLite(window).on('popstate', cacheStateAndFireUrlChange); - // hashchange event - jqLite(window).on('hashchange', cacheStateAndFireUrlChange); - - urlChangeInit = true; - } + /** + * Checks whether the url has changed outside of Angular. + * Needs to be exported to be able to check for changes that have been done in sync, + * as hashchange/popstate events fire in async. + */ + self.$$checkUrlChange = fireUrlChange; - urlChangeListeners.push(callback); - return callback; - }; + ////////////////////////////////////////////////////////////// + // Misc API + ////////////////////////////////////////////////////////////// - /** - * @private - * Remove popstate and hashchange handler from window. - * - * NOTE: this api is intended for use only by $rootScope. - */ - self.$$applicationDestroyed = function() { - jqLite(window).off('hashchange popstate', cacheStateAndFireUrlChange); - }; - - /** - * Checks whether the url has changed outside of Angular. - * Needs to be exported to be able to check for changes that have been done in sync, - * as hashchange/popstate events fire in async. - */ - self.$$checkUrlChange = fireUrlChange; + /** + * @name $browser#baseHref + * + * @description + * Returns current + * (always relative - without domain) + * + * @returns {string} The current base href + */ + self.baseHref = function () { + var href = baseElement.attr('href'); + return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : ''; + }; + + /** + * @name $browser#defer + * @param {function()} fn A function, who's execution should be deferred. + * @param {number=} [delay=0] of milliseconds to defer the function execution. + * @returns {*} DeferId that can be used to cancel the task via `$browser.defer.cancel()`. + * + * @description + * Executes a fn asynchronously via `setTimeout(fn, delay)`. + * + * Unlike when calling `setTimeout` directly, in test this function is mocked and instead of using + * `setTimeout` in tests, the fns are queued in an array, which can be programmatically flushed + * via `$browser.defer.flush()`. + * + */ + self.defer = function (fn, delay) { + var timeoutId; + outstandingRequestCount++; + timeoutId = setTimeout(function () { + delete pendingDeferIds[timeoutId]; + completeOutstandingRequest(fn); + }, delay || 0); + pendingDeferIds[timeoutId] = true; + return timeoutId; + }; - ////////////////////////////////////////////////////////////// - // Misc API - ////////////////////////////////////////////////////////////// - /** - * @name $browser#baseHref - * - * @description - * Returns current - * (always relative - without domain) - * - * @returns {string} The current base href - */ - self.baseHref = function() { - var href = baseElement.attr('href'); - return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : ''; - }; - - /** - * @name $browser#defer - * @param {function()} fn A function, who's execution should be deferred. - * @param {number=} [delay=0] of milliseconds to defer the function execution. - * @returns {*} DeferId that can be used to cancel the task via `$browser.defer.cancel()`. - * - * @description - * Executes a fn asynchronously via `setTimeout(fn, delay)`. - * - * Unlike when calling `setTimeout` directly, in test this function is mocked and instead of using - * `setTimeout` in tests, the fns are queued in an array, which can be programmatically flushed - * via `$browser.defer.flush()`. - * - */ - self.defer = function(fn, delay) { - var timeoutId; - outstandingRequestCount++; - timeoutId = setTimeout(function() { - delete pendingDeferIds[timeoutId]; - completeOutstandingRequest(fn); - }, delay || 0); - pendingDeferIds[timeoutId] = true; - return timeoutId; - }; - - - /** - * @name $browser#defer.cancel - * - * @description - * Cancels a deferred task identified with `deferId`. - * - * @param {*} deferId Token returned by the `$browser.defer` function. - * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully - * canceled. - */ - self.defer.cancel = function(deferId) { - if (pendingDeferIds[deferId]) { - delete pendingDeferIds[deferId]; - clearTimeout(deferId); - completeOutstandingRequest(noop); - return true; - } - return false; - }; + /** + * @name $browser#defer.cancel + * + * @description + * Cancels a deferred task identified with `deferId`. + * + * @param {*} deferId Token returned by the `$browser.defer` function. + * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully + * canceled. + */ + self.defer.cancel = function (deferId) { + if (pendingDeferIds[deferId]) { + delete pendingDeferIds[deferId]; + clearTimeout(deferId); + completeOutstandingRequest(noop); + return true; + } + return false; + }; -} + } -function $BrowserProvider() { - this.$get = ['$window', '$log', '$sniffer', '$document', - function($window, $log, $sniffer, $document) { - return new Browser($window, $document, $log, $sniffer); - }]; -} + function $BrowserProvider() { + this.$get = ['$window', '$log', '$sniffer', '$document', + function ($window, $log, $sniffer, $document) { + return new Browser($window, $document, $log, $sniffer); + }]; + } -/** - * @ngdoc service - * @name $cacheFactory - * - * @description - * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to - * them. - * - * ```js - * - * var cache = $cacheFactory('cacheId'); - * expect($cacheFactory.get('cacheId')).toBe(cache); - * expect($cacheFactory.get('noSuchCacheId')).not.toBeDefined(); - * - * cache.put("key", "value"); - * cache.put("another key", "another value"); - * - * // We've specified no options on creation - * expect(cache.info()).toEqual({id: 'cacheId', size: 2}); - * - * ``` - * - * - * @param {string} cacheId Name or id of the newly created cache. - * @param {object=} options Options object that specifies the cache behavior. Properties: - * - * - `{number=}` `capacity` — turns the cache into LRU cache. - * - * @returns {object} Newly created cache object with the following set of methods: - * - * - `{object}` `info()` — Returns id, size, and options of cache. - * - `{{*}}` `put({string} key, {*} value)` — Puts a new key-value pair into the cache and returns - * it. - * - `{{*}}` `get({string} key)` — Returns cached value for `key` or undefined for cache miss. - * - `{void}` `remove({string} key)` — Removes a key-value pair from the cache. - * - `{void}` `removeAll()` — Removes all cached values. - * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory. - * - * @example - + /** + * @ngdoc service + * @name $cacheFactory + * + * @description + * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to + * them. + * + * ```js + * + * var cache = $cacheFactory('cacheId'); + * expect($cacheFactory.get('cacheId')).toBe(cache); + * expect($cacheFactory.get('noSuchCacheId')).not.toBeDefined(); + * + * cache.put("key", "value"); + * cache.put("another key", "another value"); + * + * // We've specified no options on creation + * expect(cache.info()).toEqual({id: 'cacheId', size: 2}); + * + * ``` + * + * + * @param {string} cacheId Name or id of the newly created cache. + * @param {object=} options Options object that specifies the cache behavior. Properties: + * + * - `{number=}` `capacity` — turns the cache into LRU cache. + * + * @returns {object} Newly created cache object with the following set of methods: + * + * - `{object}` `info()` — Returns id, size, and options of cache. + * - `{{*}}` `put({string} key, {*} value)` — Puts a new key-value pair into the cache and returns + * it. + * - `{{*}}` `get({string} key)` — Returns cached value for `key` or undefined for cache miss. + * - `{void}` `remove({string} key)` — Removes a key-value pair from the cache. + * - `{void}` `removeAll()` — Removes all cached values. + * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory. + * + * @example + -
- - - - -

Cached Values

-
- - : - -
+
+ + + + +

Cached Values

+
+ + : + +
-

Cache Info

-
- - : - -
-
+

Cache Info

+
+ + : + +
+
- angular.module('cacheExampleApp', []). - controller('CacheController', ['$scope', '$cacheFactory', function($scope, $cacheFactory) { + angular.module('cacheExampleApp', []). + controller('CacheController', ['$scope', '$cacheFactory', function($scope, $cacheFactory) { $scope.keys = []; $scope.cache = $cacheFactory('cacheId'); $scope.put = function(key, value) { @@ -6253,50 +6292,50 @@ function $BrowserProvider() { }]); - p { + p { margin: 10px 0 3px; } - - */ -function $CacheFactoryProvider() { + + */ + function $CacheFactoryProvider() { - this.$get = function() { - var caches = {}; + this.$get = function () { + var caches = {}; - function cacheFactory(cacheId, options) { - if (cacheId in caches) { - throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId); - } + function cacheFactory(cacheId, options) { + if (cacheId in caches) { + throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId); + } - var size = 0, - stats = extend({}, options, {id: cacheId}), - data = createMap(), - capacity = (options && options.capacity) || Number.MAX_VALUE, - lruHash = createMap(), - freshEnd = null, - staleEnd = null; - - /** - * @ngdoc type - * @name $cacheFactory.Cache - * - * @description - * A cache object used to store and retrieve data, primarily used by - * {@link $http $http} and the {@link ng.directive:script script} directive to cache - * templates and other data. - * - * ```js - * angular.module('superCache') - * .factory('superCache', ['$cacheFactory', function($cacheFactory) { + var size = 0, + stats = extend({}, options, {id: cacheId}), + data = createMap(), + capacity = (options && options.capacity) || Number.MAX_VALUE, + lruHash = createMap(), + freshEnd = null, + staleEnd = null; + + /** + * @ngdoc type + * @name $cacheFactory.Cache + * + * @description + * A cache object used to store and retrieve data, primarily used by + * {@link $http $http} and the {@link ng.directive:script script} directive to cache + * templates and other data. + * + * ```js + * angular.module('superCache') + * .factory('superCache', ['$cacheFactory', function($cacheFactory) { * return $cacheFactory('super-cache'); * }]); - * ``` - * - * Example test: - * - * ```js - * it('should behave like a cache', inject(function(superCache) { + * ``` + * + * Example test: + * + * ```js + * it('should behave like a cache', inject(function(superCache) { * superCache.put('key', 'value'); * superCache.put('another key', 'another value'); * @@ -6314,273 +6353,273 @@ function $CacheFactoryProvider() { * size: 0 * }); * })); - * ``` - */ - return caches[cacheId] = { - - /** - * @ngdoc method - * @name $cacheFactory.Cache#put - * @kind function - * - * @description - * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be - * retrieved later, and incrementing the size of the cache if the key was not already - * present in the cache. If behaving like an LRU cache, it will also remove stale - * entries from the set. - * - * It will not insert undefined values into the cache. - * - * @param {string} key the key under which the cached data is stored. - * @param {*} value the value to store alongside the key. If it is undefined, the key - * will not be stored. - * @returns {*} the value stored. - */ - put: function(key, value) { - if (isUndefined(value)) return; - if (capacity < Number.MAX_VALUE) { - var lruEntry = lruHash[key] || (lruHash[key] = {key: key}); - - refresh(lruEntry); - } - - if (!(key in data)) size++; - data[key] = value; - - if (size > capacity) { - this.remove(staleEnd.key); - } - - return value; - }, - - /** - * @ngdoc method - * @name $cacheFactory.Cache#get - * @kind function - * - * @description - * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object. - * - * @param {string} key the key of the data to be retrieved - * @returns {*} the value stored. - */ - get: function(key) { - if (capacity < Number.MAX_VALUE) { - var lruEntry = lruHash[key]; - - if (!lruEntry) return; - - refresh(lruEntry); - } - - return data[key]; - }, + * ``` + */ + return caches[cacheId] = { + + /** + * @ngdoc method + * @name $cacheFactory.Cache#put + * @kind function + * + * @description + * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be + * retrieved later, and incrementing the size of the cache if the key was not already + * present in the cache. If behaving like an LRU cache, it will also remove stale + * entries from the set. + * + * It will not insert undefined values into the cache. + * + * @param {string} key the key under which the cached data is stored. + * @param {*} value the value to store alongside the key. If it is undefined, the key + * will not be stored. + * @returns {*} the value stored. + */ + put: function (key, value) { + if (isUndefined(value)) return; + if (capacity < Number.MAX_VALUE) { + var lruEntry = lruHash[key] || (lruHash[key] = {key: key}); + + refresh(lruEntry); + } + + if (!(key in data)) size++; + data[key] = value; + + if (size > capacity) { + this.remove(staleEnd.key); + } + + return value; + }, + + /** + * @ngdoc method + * @name $cacheFactory.Cache#get + * @kind function + * + * @description + * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object. + * + * @param {string} key the key of the data to be retrieved + * @returns {*} the value stored. + */ + get: function (key) { + if (capacity < Number.MAX_VALUE) { + var lruEntry = lruHash[key]; + + if (!lruEntry) return; + + refresh(lruEntry); + } + + return data[key]; + }, + + + /** + * @ngdoc method + * @name $cacheFactory.Cache#remove + * @kind function + * + * @description + * Removes an entry from the {@link $cacheFactory.Cache Cache} object. + * + * @param {string} key the key of the entry to be removed + */ + remove: function (key) { + if (capacity < Number.MAX_VALUE) { + var lruEntry = lruHash[key]; + + if (!lruEntry) return; + + if (lruEntry == freshEnd) freshEnd = lruEntry.p; + if (lruEntry == staleEnd) staleEnd = lruEntry.n; + link(lruEntry.n, lruEntry.p); + + delete lruHash[key]; + } + + if (!(key in data)) return; + + delete data[key]; + size--; + }, + + + /** + * @ngdoc method + * @name $cacheFactory.Cache#removeAll + * @kind function + * + * @description + * Clears the cache object of any entries. + */ + removeAll: function () { + data = createMap(); + size = 0; + lruHash = createMap(); + freshEnd = staleEnd = null; + }, + + + /** + * @ngdoc method + * @name $cacheFactory.Cache#destroy + * @kind function + * + * @description + * Destroys the {@link $cacheFactory.Cache Cache} object entirely, + * removing it from the {@link $cacheFactory $cacheFactory} set. + */ + destroy: function () { + data = null; + stats = null; + lruHash = null; + delete caches[cacheId]; + }, + + + /** + * @ngdoc method + * @name $cacheFactory.Cache#info + * @kind function + * + * @description + * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}. + * + * @returns {object} an object with the following properties: + *
    + *
  • **id**: the id of the cache instance
    • + *
  • **size**: the number of entries kept in the cache instance
    • + *
  • **...**: any additional properties from the options object when creating the + * cache.
    • + *
+ */ + info: function () { + return extend({}, stats, {size: size}); + } + }; - /** - * @ngdoc method - * @name $cacheFactory.Cache#remove - * @kind function - * - * @description - * Removes an entry from the {@link $cacheFactory.Cache Cache} object. - * - * @param {string} key the key of the entry to be removed - */ - remove: function(key) { - if (capacity < Number.MAX_VALUE) { - var lruEntry = lruHash[key]; + /** + * makes the `entry` the freshEnd of the LRU linked list + */ + function refresh(entry) { + if (entry != freshEnd) { + if (!staleEnd) { + staleEnd = entry; + } else if (staleEnd == entry) { + staleEnd = entry.n; + } + + link(entry.n, entry.p); + link(entry, freshEnd); + freshEnd = entry; + freshEnd.n = null; + } + } - if (!lruEntry) return; - if (lruEntry == freshEnd) freshEnd = lruEntry.p; - if (lruEntry == staleEnd) staleEnd = lruEntry.n; - link(lruEntry.n,lruEntry.p); + /** + * bidirectionally links two entries of the LRU linked list + */ + function link(nextEntry, prevEntry) { + if (nextEntry != prevEntry) { + if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify + if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify + } + } + } - delete lruHash[key]; - } - if (!(key in data)) return; + /** + * @ngdoc method + * @name $cacheFactory#info + * + * @description + * Get information about all the caches that have been created + * + * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info` + */ + cacheFactory.info = function () { + var info = {}; + forEach(caches, function (cache, cacheId) { + info[cacheId] = cache.info(); + }); + return info; + }; - delete data[key]; - size--; - }, + /** + * @ngdoc method + * @name $cacheFactory#get + * + * @description + * Get access to a cache object by the `cacheId` used when it was created. + * + * @param {string} cacheId Name or id of a cache to access. + * @returns {object} Cache object identified by the cacheId or undefined if no such cache. + */ + cacheFactory.get = function (cacheId) { + return caches[cacheId]; + }; - /** - * @ngdoc method - * @name $cacheFactory.Cache#removeAll - * @kind function - * - * @description - * Clears the cache object of any entries. - */ - removeAll: function() { - data = createMap(); - size = 0; - lruHash = createMap(); - freshEnd = staleEnd = null; - }, + return cacheFactory; + }; + } - /** - * @ngdoc method - * @name $cacheFactory.Cache#destroy - * @kind function - * - * @description - * Destroys the {@link $cacheFactory.Cache Cache} object entirely, - * removing it from the {@link $cacheFactory $cacheFactory} set. - */ - destroy: function() { - data = null; - stats = null; - lruHash = null; - delete caches[cacheId]; - }, - - - /** - * @ngdoc method - * @name $cacheFactory.Cache#info - * @kind function - * - * @description - * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}. - * - * @returns {object} an object with the following properties: - *
    - *
  • **id**: the id of the cache instance
    • - *
  • **size**: the number of entries kept in the cache instance
    • - *
  • **...**: any additional properties from the options object when creating the - * cache.
    • - *
- */ - info: function() { - return extend({}, stats, {size: size}); - } - }; - - - /** - * makes the `entry` the freshEnd of the LRU linked list - */ - function refresh(entry) { - if (entry != freshEnd) { - if (!staleEnd) { - staleEnd = entry; - } else if (staleEnd == entry) { - staleEnd = entry.n; - } - - link(entry.n, entry.p); - link(entry, freshEnd); - freshEnd = entry; - freshEnd.n = null; - } - } - - - /** - * bidirectionally links two entries of the LRU linked list - */ - function link(nextEntry, prevEntry) { - if (nextEntry != prevEntry) { - if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify - if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify - } - } - } - - - /** - * @ngdoc method - * @name $cacheFactory#info - * - * @description - * Get information about all the caches that have been created - * - * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info` - */ - cacheFactory.info = function() { - var info = {}; - forEach(caches, function(cache, cacheId) { - info[cacheId] = cache.info(); - }); - return info; - }; - - - /** - * @ngdoc method - * @name $cacheFactory#get - * - * @description - * Get access to a cache object by the `cacheId` used when it was created. - * - * @param {string} cacheId Name or id of a cache to access. - * @returns {object} Cache object identified by the cacheId or undefined if no such cache. - */ - cacheFactory.get = function(cacheId) { - return caches[cacheId]; - }; - - - return cacheFactory; - }; -} - -/** - * @ngdoc service - * @name $templateCache - * - * @description - * The first time a template is used, it is loaded in the template cache for quick retrieval. You - * can load templates directly into the cache in a `script` tag, or by consuming the - * `$templateCache` service directly. - * - * Adding via the `script` tag: - * - * ```html - * - * ``` - * - * **Note:** the `script` tag containing the template does not need to be included in the `head` of - * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (IE, - * element with ng-app attribute), otherwise the template will be ignored. - * - * Adding via the `$templateCache` service: - * - * ```js - * var myApp = angular.module('myApp', []); - * myApp.run(function($templateCache) { + /** + * @ngdoc service + * @name $templateCache + * + * @description + * The first time a template is used, it is loaded in the template cache for quick retrieval. You + * can load templates directly into the cache in a `script` tag, or by consuming the + * `$templateCache` service directly. + * + * Adding via the `script` tag: + * + * ```html + * + * ``` + * + * **Note:** the `script` tag containing the template does not need to be included in the `head` of + * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (IE, + * element with ng-app attribute), otherwise the template will be ignored. + * + * Adding via the `$templateCache` service: + * + * ```js + * var myApp = angular.module('myApp', []); + * myApp.run(function($templateCache) { * $templateCache.put('templateId.html', 'This is the content of the template'); * }); - * ``` - * - * To retrieve the template later, simply use it in your HTML: - * ```html - *
- * ``` - * - * or get it via Javascript: - * ```js - * $templateCache.get('templateId.html') - * ``` - * - * See {@link ng.$cacheFactory $cacheFactory}. - * - */ -function $TemplateCacheProvider() { - this.$get = ['$cacheFactory', function($cacheFactory) { - return $cacheFactory('templates'); - }]; -} + * ``` + * + * To retrieve the template later, simply use it in your HTML: + * ```html + *
+ * ``` + * + * or get it via Javascript: + * ```js + * $templateCache.get('templateId.html') + * ``` + * + * See {@link ng.$cacheFactory $cacheFactory}. + * + */ + function $TemplateCacheProvider() { + this.$get = ['$cacheFactory', function ($cacheFactory) { + return $cacheFactory('templates'); + }]; + } -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Any commits to this file should be reviewed with security in mind. * * Changes to this file can potentially create security vulnerabilities. * * An approval from 2 Core members with history of modifying * @@ -6591,7 +6630,7 @@ function $TemplateCacheProvider() { * Or gives undesired access to variables likes document or window? * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE! + /* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE! * * DOM-related variables: * @@ -6609,42 +6648,42 @@ function $TemplateCacheProvider() { */ -/** - * @ngdoc service - * @name $compile - * @kind function - * - * @description - * Compiles an HTML string or DOM into a template and produces a template function, which - * can then be used to link {@link ng.$rootScope.Scope `scope`} and the template together. - * - * The compilation is a process of walking the DOM tree and matching DOM elements to - * {@link ng.$compileProvider#directive directives}. - * - *
- * **Note:** This document is an in-depth reference of all directive options. - * For a gentle introduction to directives with examples of common use cases, - * see the {@link guide/directive directive guide}. - *
- * - * ## Comprehensive Directive API - * - * There are many different options for a directive. - * - * The difference resides in the return value of the factory function. - * You can either return a "Directive Definition Object" (see below) that defines the directive properties, - * or just the `postLink` function (all other properties will have the default values). - * - *
- * **Best Practice:** It's recommended to use the "directive definition object" form. - *
- * - * Here's an example directive declared with a Directive Definition Object: - * - * ```js - * var myModule = angular.module(...); - * - * myModule.directive('directiveName', function factory(injectables) { + /** + * @ngdoc service + * @name $compile + * @kind function + * + * @description + * Compiles an HTML string or DOM into a template and produces a template function, which + * can then be used to link {@link ng.$rootScope.Scope `scope`} and the template together. + * + * The compilation is a process of walking the DOM tree and matching DOM elements to + * {@link ng.$compileProvider#directive directives}. + * + *
+ * **Note:** This document is an in-depth reference of all directive options. + * For a gentle introduction to directives with examples of common use cases, + * see the {@link guide/directive directive guide}. + *
+ * + * ## Comprehensive Directive API + * + * There are many different options for a directive. + * + * The difference resides in the return value of the factory function. + * You can either return a "Directive Definition Object" (see below) that defines the directive properties, + * or just the `postLink` function (all other properties will have the default values). + * + *
+ * **Best Practice:** It's recommended to use the "directive definition object" form. + *
+ * + * Here's an example directive declared with a Directive Definition Object: + * + * ```js + * var myModule = angular.module(...); + * + * myModule.directive('directiveName', function factory(injectables) { * var directiveDefinitionObject = { * priority: 0, * template: '
', // or // function(tElement, tAttrs) { ... }, @@ -6676,18 +6715,18 @@ function $TemplateCacheProvider() { * }; * return directiveDefinitionObject; * }); - * ``` - * - *
- * **Note:** Any unspecified options will use the default value. You can see the default values below. - *
- * - * Therefore the above can be simplified as: - * - * ```js - * var myModule = angular.module(...); - * - * myModule.directive('directiveName', function factory(injectables) { + * ``` + * + *
+ * **Note:** Any unspecified options will use the default value. You can see the default values below. + *
+ * + * Therefore the above can be simplified as: + * + * ```js + * var myModule = angular.module(...); + * + * myModule.directive('directiveName', function factory(injectables) { * var directiveDefinitionObject = { * link: function postLink(scope, iElement, iAttrs) { ... } * }; @@ -6695,584 +6734,584 @@ function $TemplateCacheProvider() { * // or * // return function postLink(scope, iElement, iAttrs) { ... } * }); - * ``` - * - * - * - * ### Directive Definition Object - * - * The directive definition object provides instructions to the {@link ng.$compile + * ``` + * + * + * + * ### Directive Definition Object + * + * The directive definition object provides instructions to the {@link ng.$compile * compiler}. The attributes are: - * - * #### `multiElement` - * When this property is set to true, the HTML compiler will collect DOM nodes between - * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them - * together as the directive elements. It is recommended that this feature be used on directives - * which are not strictly behavioral (such as {@link ngClick}), and which - * do not manipulate or replace child nodes (such as {@link ngInclude}). - * - * #### `priority` - * When there are multiple directives defined on a single DOM element, sometimes it - * is necessary to specify the order in which the directives are applied. The `priority` is used - * to sort the directives before their `compile` functions get called. Priority is defined as a - * number. Directives with greater numerical `priority` are compiled first. Pre-link functions - * are also run in priority order, but post-link functions are run in reverse order. The order - * of directives with the same priority is undefined. The default priority is `0`. - * - * #### `terminal` - * If set to true then the current `priority` will be the last set of directives - * which will execute (any directives at the current priority will still execute - * as the order of execution on same `priority` is undefined). Note that expressions - * and other directives used in the directive's template will also be excluded from execution. - * - * #### `scope` - * The scope property can be `true`, an object or a falsy value: - * - * * **falsy:** No scope will be created for the directive. The directive will use its parent's scope. - * - * * **`true`:** A new child scope that prototypically inherits from its parent will be created for - * the directive's element. If multiple directives on the same element request a new scope, - * only one new scope is created. The new scope rule does not apply for the root of the template - * since the root of the template always gets a new scope. - * - * * **`{...}` (an object hash):** A new "isolate" scope is created for the directive's element. The - * 'isolate' scope differs from normal scope in that it does not prototypically inherit from its parent - * scope. This is useful when creating reusable components, which should not accidentally read or modify - * data in the parent scope. - * - * The 'isolate' scope object hash defines a set of local scope properties derived from attributes on the - * directive's element. These local properties are useful for aliasing values for templates. The keys in - * the object hash map to the name of the property on the isolate scope; the values define how the property - * is bound to the parent scope, via matching attributes on the directive's element: - * - * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is - * always a string since DOM attributes are strings. If no `attr` name is specified then the - * attribute name is assumed to be the same as the local name. Given `` and the isolate scope definition `scope: { localName:'@myAttr' }`, - * the directive's scope property `localName` will reflect the interpolated value of `hello - * {{name}}`. As the `name` attribute changes so will the `localName` property on the directive's - * scope. The `name` is read from the parent scope (not the directive's scope). - * - * * `=` or `=attr` - set up a bidirectional binding between a local scope property and an expression - * passed via the attribute `attr`. The expression is evaluated in the context of the parent scope. - * If no `attr` name is specified then the attribute name is assumed to be the same as the local - * name. Given `` and the isolate scope definition `scope: { + * + * #### `multiElement` + * When this property is set to true, the HTML compiler will collect DOM nodes between + * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them + * together as the directive elements. It is recommended that this feature be used on directives + * which are not strictly behavioral (such as {@link ngClick}), and which + * do not manipulate or replace child nodes (such as {@link ngInclude}). + * + * #### `priority` + * When there are multiple directives defined on a single DOM element, sometimes it + * is necessary to specify the order in which the directives are applied. The `priority` is used + * to sort the directives before their `compile` functions get called. Priority is defined as a + * number. Directives with greater numerical `priority` are compiled first. Pre-link functions + * are also run in priority order, but post-link functions are run in reverse order. The order + * of directives with the same priority is undefined. The default priority is `0`. + * + * #### `terminal` + * If set to true then the current `priority` will be the last set of directives + * which will execute (any directives at the current priority will still execute + * as the order of execution on same `priority` is undefined). Note that expressions + * and other directives used in the directive's template will also be excluded from execution. + * + * #### `scope` + * The scope property can be `true`, an object or a falsy value: + * + * * **falsy:** No scope will be created for the directive. The directive will use its parent's scope. + * + * * **`true`:** A new child scope that prototypically inherits from its parent will be created for + * the directive's element. If multiple directives on the same element request a new scope, + * only one new scope is created. The new scope rule does not apply for the root of the template + * since the root of the template always gets a new scope. + * + * * **`{...}` (an object hash):** A new "isolate" scope is created for the directive's element. The + * 'isolate' scope differs from normal scope in that it does not prototypically inherit from its parent + * scope. This is useful when creating reusable components, which should not accidentally read or modify + * data in the parent scope. + * + * The 'isolate' scope object hash defines a set of local scope properties derived from attributes on the + * directive's element. These local properties are useful for aliasing values for templates. The keys in + * the object hash map to the name of the property on the isolate scope; the values define how the property + * is bound to the parent scope, via matching attributes on the directive's element: + * + * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is + * always a string since DOM attributes are strings. If no `attr` name is specified then the + * attribute name is assumed to be the same as the local name. Given `` and the isolate scope definition `scope: { localName:'@myAttr' }`, + * the directive's scope property `localName` will reflect the interpolated value of `hello + * {{name}}`. As the `name` attribute changes so will the `localName` property on the directive's + * scope. The `name` is read from the parent scope (not the directive's scope). + * + * * `=` or `=attr` - set up a bidirectional binding between a local scope property and an expression + * passed via the attribute `attr`. The expression is evaluated in the context of the parent scope. + * If no `attr` name is specified then the attribute name is assumed to be the same as the local + * name. Given `` and the isolate scope definition `scope: { * localModel: '=myAttr' }`, the property `localModel` on the directive's scope will reflect the - * value of `parentModel` on the parent scope. Changes to `parentModel` will be reflected in - * `localModel` and vice versa. Optional attributes should be marked as such with a question mark: - * `=?` or `=?attr`. If the binding expression is non-assignable, or if the attribute isn't - * optional and doesn't exist, an exception ({@link error/$compile/nonassign `$compile:nonassign`}) - * will be thrown upon discovering changes to the local value, since it will be impossible to sync - * them back to the parent scope. By default, the {@link ng.$rootScope.Scope#$watch `$watch`} - * method is used for tracking changes, and the equality check is based on object identity. - * However, if an object literal or an array literal is passed as the binding expression, the - * equality check is done by value (using the {@link angular.equals} function). It's also possible - * to watch the evaluated value shallowly with {@link ng.$rootScope.Scope#$watchCollection + * value of `parentModel` on the parent scope. Changes to `parentModel` will be reflected in + * `localModel` and vice versa. Optional attributes should be marked as such with a question mark: + * `=?` or `=?attr`. If the binding expression is non-assignable, or if the attribute isn't + * optional and doesn't exist, an exception ({@link error/$compile/nonassign `$compile:nonassign`}) + * will be thrown upon discovering changes to the local value, since it will be impossible to sync + * them back to the parent scope. By default, the {@link ng.$rootScope.Scope#$watch `$watch`} + * method is used for tracking changes, and the equality check is based on object identity. + * However, if an object literal or an array literal is passed as the binding expression, the + * equality check is done by value (using the {@link angular.equals} function). It's also possible + * to watch the evaluated value shallowly with {@link ng.$rootScope.Scope#$watchCollection * `$watchCollection`}: use `=*` or `=*attr` (`=*?` or `=*?attr` if the attribute is optional). - * - * * `<` or `` and directive definition of - * `scope: { localModel:'` and the isolate scope definition `scope: { + * + * * `<` or `` and directive definition of + * `scope: { localModel:'` and the isolate scope definition `scope: { * localFn:'&myAttr' }`, the isolate scope property `localFn` will point to a function wrapper for - * the `count = count + value` expression. Often it's desirable to pass data from the isolated scope - * via an expression to the parent scope. This can be done by passing a map of local variable names - * and values into the expression wrapper fn. For example, if the expression is `increment(amount)` - * then we can specify the amount value by calling the `localFn` as `localFn({amount: 22})`. - * - * In general it's possible to apply more than one directive to one element, but there might be limitations - * depending on the type of scope required by the directives. The following points will help explain these limitations. - * For simplicity only two directives are taken into account, but it is also applicable for several directives: - * - * * **no scope** + **no scope** => Two directives which don't require their own scope will use their parent's scope - * * **child scope** + **no scope** => Both directives will share one single child scope - * * **child scope** + **child scope** => Both directives will share one single child scope - * * **isolated scope** + **no scope** => The isolated directive will use it's own created isolated scope. The other directive will use - * its parent's scope - * * **isolated scope** + **child scope** => **Won't work!** Only one scope can be related to one element. Therefore these directives cannot - * be applied to the same element. - * * **isolated scope** + **isolated scope** => **Won't work!** Only one scope can be related to one element. Therefore these directives - * cannot be applied to the same element. - * - * - * #### `bindToController` - * This property is used to bind scope properties directly to the controller. It can be either - * `true` or an object hash with the same format as the `scope` property. Additionally, a controller - * alias must be set, either by using `controllerAs: 'myAlias'` or by specifying the alias in the controller - * definition: `controller: 'myCtrl as myAlias'`. - * - * When an isolate scope is used for a directive (see above), `bindToController: true` will - * allow a component to have its properties bound to the controller, rather than to scope. - * - * After the controller is instantiated, the initial values of the isolate scope bindings will be bound to the controller - * properties. You can access these bindings once they have been initialized by providing a controller method called - * `$onInit`, which is called after all the controllers on an element have been constructed and had their bindings - * initialized. - * - *
- * **Deprecation warning:** although bindings for non-ES6 class controllers are currently - * bound to `this` before the controller constructor is called, this use is now deprecated. Please place initialization - * code that relies upon bindings inside a `$onInit` method on the controller, instead. - *
- * - * It is also possible to set `bindToController` to an object hash with the same format as the `scope` property. - * This will set up the scope bindings to the controller directly. Note that `scope` can still be used - * to define which kind of scope is created. By default, no scope is created. Use `scope: {}` to create an isolate - * scope (useful for component directives). - * - * If both `bindToController` and `scope` are defined and have object hashes, `bindToController` overrides `scope`. - * - * - * #### `controller` - * Controller constructor function. The controller is instantiated before the - * pre-linking phase and can be accessed by other directives (see - * `require` attribute). This allows the directives to communicate with each other and augment - * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals: - * - * * `$scope` - Current scope associated with the element - * * `$element` - Current element - * * `$attrs` - Current attributes object for the element - * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope: - * `function([scope], cloneLinkingFn, futureParentElement, slotName)`: - * * `scope`: (optional) override the scope. - * * `cloneLinkingFn`: (optional) argument to create clones of the original transcluded content. - * * `futureParentElement` (optional): - * * defines the parent to which the `cloneLinkingFn` will add the cloned elements. - * * default: `$element.parent()` resp. `$element` for `transclude:'element'` resp. `transclude:true`. - * * only needed for transcludes that are allowed to contain non html elements (e.g. SVG elements) - * and when the `cloneLinkinFn` is passed, - * as those elements need to created and cloned in a special way when they are defined outside their - * usual containers (e.g. like ``). - * * See also the `directive.templateNamespace` property. - * * `slotName`: (optional) the name of the slot to transclude. If falsy (e.g. `null`, `undefined` or `''`) - * then the default translusion is provided. - * The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns - * `true` if the specified slot contains content (i.e. one or more DOM nodes). - * - * The controller can provide the following methods that act as life-cycle hooks: - * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and - * had their bindings initialized (and before the pre & post linking functions for the directives on - * this element). This is a good place to put initialization code for your controller. - * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The - * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an - * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a - * component such as cloning the bound value to prevent accidental mutation of the outer value. - * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing - * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in - * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent - * components will have their `$onDestroy()` hook called before child components. - * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link - * function this hook can be used to set up DOM event handlers and do direct DOM manipulation. - * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since - * they are waiting for their template to load asynchronously and their own compilation and linking has been - * suspended until that occurs. - * - * - * #### `require` - * Require another directive and inject its controller as the fourth argument to the linking function. The - * `require` property can be a string, an array or an object: - * * a **string** containing the name of the directive to pass to the linking function - * * an **array** containing the names of directives to pass to the linking function. The argument passed to the - * linking function will be an array of controllers in the same order as the names in the `require` property - * * an **object** whose property values are the names of the directives to pass to the linking function. The argument - * passed to the linking function will also be an object with matching keys, whose values will hold the corresponding - * controllers. - * - * If the `require` property is an object and `bindToController` is truthy, then the required controllers are - * bound to the controller using the keys of the `require` property. This binding occurs after all the controllers - * have been constructed but before `$onInit` is called. - * See the {@link $compileProvider#component} helper for an example of how this can be used. - * - * If no such required directive(s) can be found, or if the directive does not have a controller, then an error is - * raised (unless no link function is specified and the required controllers are not being bound to the directive - * controller, in which case error checking is skipped). The name can be prefixed with: - * - * * (no prefix) - Locate the required controller on the current element. Throw an error if not found. - * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found. - * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found. - * * `^^` - Locate the required controller by searching the element's parents. Throw an error if not found. - * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass - * `null` to the `link` fn if not found. - * * `?^^` - Attempt to locate the required controller by searching the element's parents, or pass - * `null` to the `link` fn if not found. - * - * - * #### `controllerAs` - * Identifier name for a reference to the controller in the directive's scope. - * This allows the controller to be referenced from the directive template. This is especially - * useful when a directive is used as component, i.e. with an `isolate` scope. It's also possible - * to use it in a directive without an `isolate` / `new` scope, but you need to be aware that the - * `controllerAs` reference might overwrite a property that already exists on the parent scope. - * - * - * #### `restrict` - * String of subset of `EACM` which restricts the directive to a specific directive - * declaration style. If omitted, the defaults (elements and attributes) are used. - * - * * `E` - Element name (default): `` - * * `A` - Attribute (default): `
` - * * `C` - Class: `
` - * * `M` - Comment: `` - * - * - * #### `templateNamespace` - * String representing the document type used by the markup in the template. - * AngularJS needs this information as those elements need to be created and cloned - * in a special way when they are defined outside their usual containers like `` and ``. - * - * * `html` - All root nodes in the template are HTML. Root nodes may also be - * top-level elements such as `` or ``. - * * `svg` - The root nodes in the template are SVG elements (excluding ``). - * * `math` - The root nodes in the template are MathML elements (excluding ``). - * - * If no `templateNamespace` is specified, then the namespace is considered to be `html`. - * - * #### `template` - * HTML markup that may: - * * Replace the contents of the directive's element (default). - * * Replace the directive's element itself (if `replace` is true - DEPRECATED). - * * Wrap the contents of the directive's element (if `transclude` is true). - * - * Value may be: - * - * * A string. For example `
{{delete_str}}
`. - * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile` - * function api below) and returns a string value. - * - * - * #### `templateUrl` - * This is similar to `template` but the template is loaded from the specified URL, asynchronously. - * - * Because template loading is asynchronous the compiler will suspend compilation of directives on that element - * for later when the template has been resolved. In the meantime it will continue to compile and link - * sibling and parent elements as though this element had not contained any directives. - * - * The compiler does not suspend the entire compilation to wait for templates to be loaded because this - * would result in the whole app "stalling" until all templates are loaded asynchronously - even in the - * case when only one deeply nested directive has `templateUrl`. - * - * Template loading is asynchronous even if the template has been preloaded into the {@link $templateCache} - * - * You can specify `templateUrl` as a string representing the URL or as a function which takes two - * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns - * a string value representing the url. In either case, the template URL is passed through {@link - * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}. - * - * - * #### `replace` ([*DEPRECATED*!], will be removed in next major release - i.e. v2.0) - * specify what the template should replace. Defaults to `false`. - * - * * `true` - the template will replace the directive's element. - * * `false` - the template will replace the contents of the directive's element. - * - * The replacement process migrates all of the attributes / classes from the old element to the new - * one. See the {@link guide/directive#template-expanding-directive + * the `count = count + value` expression. Often it's desirable to pass data from the isolated scope + * via an expression to the parent scope. This can be done by passing a map of local variable names + * and values into the expression wrapper fn. For example, if the expression is `increment(amount)` + * then we can specify the amount value by calling the `localFn` as `localFn({amount: 22})`. + * + * In general it's possible to apply more than one directive to one element, but there might be limitations + * depending on the type of scope required by the directives. The following points will help explain these limitations. + * For simplicity only two directives are taken into account, but it is also applicable for several directives: + * + * * **no scope** + **no scope** => Two directives which don't require their own scope will use their parent's scope + * * **child scope** + **no scope** => Both directives will share one single child scope + * * **child scope** + **child scope** => Both directives will share one single child scope + * * **isolated scope** + **no scope** => The isolated directive will use it's own created isolated scope. The other directive will use + * its parent's scope + * * **isolated scope** + **child scope** => **Won't work!** Only one scope can be related to one element. Therefore these directives cannot + * be applied to the same element. + * * **isolated scope** + **isolated scope** => **Won't work!** Only one scope can be related to one element. Therefore these directives + * cannot be applied to the same element. + * + * + * #### `bindToController` + * This property is used to bind scope properties directly to the controller. It can be either + * `true` or an object hash with the same format as the `scope` property. Additionally, a controller + * alias must be set, either by using `controllerAs: 'myAlias'` or by specifying the alias in the controller + * definition: `controller: 'myCtrl as myAlias'`. + * + * When an isolate scope is used for a directive (see above), `bindToController: true` will + * allow a component to have its properties bound to the controller, rather than to scope. + * + * After the controller is instantiated, the initial values of the isolate scope bindings will be bound to the controller + * properties. You can access these bindings once they have been initialized by providing a controller method called + * `$onInit`, which is called after all the controllers on an element have been constructed and had their bindings + * initialized. + * + *
+ * **Deprecation warning:** although bindings for non-ES6 class controllers are currently + * bound to `this` before the controller constructor is called, this use is now deprecated. Please place initialization + * code that relies upon bindings inside a `$onInit` method on the controller, instead. + *
+ * + * It is also possible to set `bindToController` to an object hash with the same format as the `scope` property. + * This will set up the scope bindings to the controller directly. Note that `scope` can still be used + * to define which kind of scope is created. By default, no scope is created. Use `scope: {}` to create an isolate + * scope (useful for component directives). + * + * If both `bindToController` and `scope` are defined and have object hashes, `bindToController` overrides `scope`. + * + * + * #### `controller` + * Controller constructor function. The controller is instantiated before the + * pre-linking phase and can be accessed by other directives (see + * `require` attribute). This allows the directives to communicate with each other and augment + * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals: + * + * * `$scope` - Current scope associated with the element + * * `$element` - Current element + * * `$attrs` - Current attributes object for the element + * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope: + * `function([scope], cloneLinkingFn, futureParentElement, slotName)`: + * * `scope`: (optional) override the scope. + * * `cloneLinkingFn`: (optional) argument to create clones of the original transcluded content. + * * `futureParentElement` (optional): + * * defines the parent to which the `cloneLinkingFn` will add the cloned elements. + * * default: `$element.parent()` resp. `$element` for `transclude:'element'` resp. `transclude:true`. + * * only needed for transcludes that are allowed to contain non html elements (e.g. SVG elements) + * and when the `cloneLinkinFn` is passed, + * as those elements need to created and cloned in a special way when they are defined outside their + * usual containers (e.g. like ``). + * * See also the `directive.templateNamespace` property. + * * `slotName`: (optional) the name of the slot to transclude. If falsy (e.g. `null`, `undefined` or `''`) + * then the default translusion is provided. + * The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns + * `true` if the specified slot contains content (i.e. one or more DOM nodes). + * + * The controller can provide the following methods that act as life-cycle hooks: + * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and + * had their bindings initialized (and before the pre & post linking functions for the directives on + * this element). This is a good place to put initialization code for your controller. + * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The + * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an + * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a + * component such as cloning the bound value to prevent accidental mutation of the outer value. + * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing + * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in + * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent + * components will have their `$onDestroy()` hook called before child components. + * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link + * function this hook can be used to set up DOM event handlers and do direct DOM manipulation. + * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since + * they are waiting for their template to load asynchronously and their own compilation and linking has been + * suspended until that occurs. + * + * + * #### `require` + * Require another directive and inject its controller as the fourth argument to the linking function. The + * `require` property can be a string, an array or an object: + * * a **string** containing the name of the directive to pass to the linking function + * * an **array** containing the names of directives to pass to the linking function. The argument passed to the + * linking function will be an array of controllers in the same order as the names in the `require` property + * * an **object** whose property values are the names of the directives to pass to the linking function. The argument + * passed to the linking function will also be an object with matching keys, whose values will hold the corresponding + * controllers. + * + * If the `require` property is an object and `bindToController` is truthy, then the required controllers are + * bound to the controller using the keys of the `require` property. This binding occurs after all the controllers + * have been constructed but before `$onInit` is called. + * See the {@link $compileProvider#component} helper for an example of how this can be used. + * + * If no such required directive(s) can be found, or if the directive does not have a controller, then an error is + * raised (unless no link function is specified and the required controllers are not being bound to the directive + * controller, in which case error checking is skipped). The name can be prefixed with: + * + * * (no prefix) - Locate the required controller on the current element. Throw an error if not found. + * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found. + * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found. + * * `^^` - Locate the required controller by searching the element's parents. Throw an error if not found. + * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass + * `null` to the `link` fn if not found. + * * `?^^` - Attempt to locate the required controller by searching the element's parents, or pass + * `null` to the `link` fn if not found. + * + * + * #### `controllerAs` + * Identifier name for a reference to the controller in the directive's scope. + * This allows the controller to be referenced from the directive template. This is especially + * useful when a directive is used as component, i.e. with an `isolate` scope. It's also possible + * to use it in a directive without an `isolate` / `new` scope, but you need to be aware that the + * `controllerAs` reference might overwrite a property that already exists on the parent scope. + * + * + * #### `restrict` + * String of subset of `EACM` which restricts the directive to a specific directive + * declaration style. If omitted, the defaults (elements and attributes) are used. + * + * * `E` - Element name (default): `` + * * `A` - Attribute (default): `
` + * * `C` - Class: `
` + * * `M` - Comment: `` + * + * + * #### `templateNamespace` + * String representing the document type used by the markup in the template. + * AngularJS needs this information as those elements need to be created and cloned + * in a special way when they are defined outside their usual containers like `` and ``. + * + * * `html` - All root nodes in the template are HTML. Root nodes may also be + * top-level elements such as `` or ``. + * * `svg` - The root nodes in the template are SVG elements (excluding ``). + * * `math` - The root nodes in the template are MathML elements (excluding ``). + * + * If no `templateNamespace` is specified, then the namespace is considered to be `html`. + * + * #### `template` + * HTML markup that may: + * * Replace the contents of the directive's element (default). + * * Replace the directive's element itself (if `replace` is true - DEPRECATED). + * * Wrap the contents of the directive's element (if `transclude` is true). + * + * Value may be: + * + * * A string. For example `
{{delete_str}}
`. + * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile` + * function api below) and returns a string value. + * + * + * #### `templateUrl` + * This is similar to `template` but the template is loaded from the specified URL, asynchronously. + * + * Because template loading is asynchronous the compiler will suspend compilation of directives on that element + * for later when the template has been resolved. In the meantime it will continue to compile and link + * sibling and parent elements as though this element had not contained any directives. + * + * The compiler does not suspend the entire compilation to wait for templates to be loaded because this + * would result in the whole app "stalling" until all templates are loaded asynchronously - even in the + * case when only one deeply nested directive has `templateUrl`. + * + * Template loading is asynchronous even if the template has been preloaded into the {@link $templateCache} + * + * You can specify `templateUrl` as a string representing the URL or as a function which takes two + * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns + * a string value representing the url. In either case, the template URL is passed through {@link + * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}. + * + * + * #### `replace` ([*DEPRECATED*!], will be removed in next major release - i.e. v2.0) + * specify what the template should replace. Defaults to `false`. + * + * * `true` - the template will replace the directive's element. + * * `false` - the template will replace the contents of the directive's element. + * + * The replacement process migrates all of the attributes / classes from the old element to the new + * one. See the {@link guide/directive#template-expanding-directive * Directives Guide} for an example. - * - * There are very few scenarios where element replacement is required for the application function, - * the main one being reusable custom components that are used within SVG contexts - * (because SVG doesn't work with custom elements in the DOM tree). - * - * #### `transclude` - * Extract the contents of the element where the directive appears and make it available to the directive. - * The contents are compiled and provided to the directive as a **transclusion function**. See the - * {@link $compile#transclusion Transclusion} section below. - * - * - * #### `compile` - * - * ```js - * function compile(tElement, tAttrs, transclude) { ... } - * ``` - * - * The compile function deals with transforming the template DOM. Since most directives do not do - * template transformation, it is not used often. The compile function takes the following arguments: - * - * * `tElement` - template element - The element where the directive has been declared. It is - * safe to do template transformation on the element and child elements only. - * - * * `tAttrs` - template attributes - Normalized list of attributes declared on this element shared - * between all directive compile functions. - * - * * `transclude` - [*DEPRECATED*!] A transclude linking function: `function(scope, cloneLinkingFn)` - * - *
- * **Note:** The template instance and the link instance may be different objects if the template has - * been cloned. For this reason it is **not** safe to do anything other than DOM transformations that - * apply to all cloned DOM nodes within the compile function. Specifically, DOM listener registration - * should be done in a linking function rather than in a compile function. - *
- - *
- * **Note:** The compile function cannot handle directives that recursively use themselves in their - * own templates or compile functions. Compiling these directives results in an infinite loop and - * stack overflow errors. - * - * This can be avoided by manually using $compile in the postLink function to imperatively compile - * a directive's template instead of relying on automatic template compilation via `template` or - * `templateUrl` declaration or manual compilation inside the compile function. - *
- * - *
- * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it - * e.g. does not know about the right outer scope. Please use the transclude function that is passed - * to the link function instead. - *
- - * A compile function can have a return value which can be either a function or an object. - * - * * returning a (post-link) function - is equivalent to registering the linking function via the - * `link` property of the config object when the compile function is empty. - * - * * returning an object with function(s) registered via `pre` and `post` properties - allows you to - * control when a linking function should be called during the linking phase. See info about - * pre-linking and post-linking functions below. - * - * - * #### `link` - * This property is used only if the `compile` property is not defined. - * - * ```js - * function link(scope, iElement, iAttrs, controller, transcludeFn) { ... } - * ``` - * - * The link function is responsible for registering DOM listeners as well as updating the DOM. It is - * executed after the template has been cloned. This is where most of the directive logic will be - * put. - * - * * `scope` - {@link ng.$rootScope.Scope Scope} - The scope to be used by the - * directive for registering {@link ng.$rootScope.Scope#$watch watches}. - * - * * `iElement` - instance element - The element where the directive is to be used. It is safe to - * manipulate the children of the element only in `postLink` function since the children have - * already been linked. - * - * * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared - * between all directive linking functions. - * - * * `controller` - the directive's required controller instance(s) - Instances are shared - * among all directives, which allows the directives to use the controllers as a communication - * channel. The exact value depends on the directive's `require` property: - * * no controller(s) required: the directive's own controller, or `undefined` if it doesn't have one - * * `string`: the controller instance - * * `array`: array of controller instances - * - * If a required controller cannot be found, and it is optional, the instance is `null`, - * otherwise the {@link error:$compile:ctreq Missing Required Controller} error is thrown. - * - * Note that you can also require the directive's own controller - it will be made available like - * any other controller. - * - * * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope. - * This is the same as the `$transclude` - * parameter of directive controllers, see there for details. - * `function([scope], cloneLinkingFn, futureParentElement)`. - * - * #### Pre-linking function - * - * Executed before the child elements are linked. Not safe to do DOM transformation since the - * compiler linking function will fail to locate the correct elements for linking. - * - * #### Post-linking function - * - * Executed after the child elements are linked. - * - * Note that child elements that contain `templateUrl` directives will not have been compiled - * and linked since they are waiting for their template to load asynchronously and their own - * compilation and linking has been suspended until that occurs. - * - * It is safe to do DOM transformation in the post-linking function on elements that are not waiting - * for their async templates to be resolved. - * - * - * ### Transclusion - * - * Transclusion is the process of extracting a collection of DOM elements from one part of the DOM and - * copying them to another part of the DOM, while maintaining their connection to the original AngularJS - * scope from where they were taken. - * - * Transclusion is used (often with {@link ngTransclude}) to insert the - * original contents of a directive's element into a specified place in the template of the directive. - * The benefit of transclusion, over simply moving the DOM elements manually, is that the transcluded - * content has access to the properties on the scope from which it was taken, even if the directive - * has isolated scope. - * See the {@link guide/directive#creating-a-directive-that-wraps-other-elements Directives Guide}. - * - * This makes it possible for the widget to have private state for its template, while the transcluded - * content has access to its originating scope. - * - *
- * **Note:** When testing an element transclude directive you must not place the directive at the root of the - * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives + * + * There are very few scenarios where element replacement is required for the application function, + * the main one being reusable custom components that are used within SVG contexts + * (because SVG doesn't work with custom elements in the DOM tree). + * + * #### `transclude` + * Extract the contents of the element where the directive appears and make it available to the directive. + * The contents are compiled and provided to the directive as a **transclusion function**. See the + * {@link $compile#transclusion Transclusion} section below. + * + * + * #### `compile` + * + * ```js + * function compile(tElement, tAttrs, transclude) { ... } + * ``` + * + * The compile function deals with transforming the template DOM. Since most directives do not do + * template transformation, it is not used often. The compile function takes the following arguments: + * + * * `tElement` - template element - The element where the directive has been declared. It is + * safe to do template transformation on the element and child elements only. + * + * * `tAttrs` - template attributes - Normalized list of attributes declared on this element shared + * between all directive compile functions. + * + * * `transclude` - [*DEPRECATED*!] A transclude linking function: `function(scope, cloneLinkingFn)` + * + *
+ * **Note:** The template instance and the link instance may be different objects if the template has + * been cloned. For this reason it is **not** safe to do anything other than DOM transformations that + * apply to all cloned DOM nodes within the compile function. Specifically, DOM listener registration + * should be done in a linking function rather than in a compile function. + *
+ + *
+ * **Note:** The compile function cannot handle directives that recursively use themselves in their + * own templates or compile functions. Compiling these directives results in an infinite loop and + * stack overflow errors. + * + * This can be avoided by manually using $compile in the postLink function to imperatively compile + * a directive's template instead of relying on automatic template compilation via `template` or + * `templateUrl` declaration or manual compilation inside the compile function. + *
+ * + *
+ * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it + * e.g. does not know about the right outer scope. Please use the transclude function that is passed + * to the link function instead. + *
+ + * A compile function can have a return value which can be either a function or an object. + * + * * returning a (post-link) function - is equivalent to registering the linking function via the + * `link` property of the config object when the compile function is empty. + * + * * returning an object with function(s) registered via `pre` and `post` properties - allows you to + * control when a linking function should be called during the linking phase. See info about + * pre-linking and post-linking functions below. + * + * + * #### `link` + * This property is used only if the `compile` property is not defined. + * + * ```js + * function link(scope, iElement, iAttrs, controller, transcludeFn) { ... } + * ``` + * + * The link function is responsible for registering DOM listeners as well as updating the DOM. It is + * executed after the template has been cloned. This is where most of the directive logic will be + * put. + * + * * `scope` - {@link ng.$rootScope.Scope Scope} - The scope to be used by the + * directive for registering {@link ng.$rootScope.Scope#$watch watches}. + * + * * `iElement` - instance element - The element where the directive is to be used. It is safe to + * manipulate the children of the element only in `postLink` function since the children have + * already been linked. + * + * * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared + * between all directive linking functions. + * + * * `controller` - the directive's required controller instance(s) - Instances are shared + * among all directives, which allows the directives to use the controllers as a communication + * channel. The exact value depends on the directive's `require` property: + * * no controller(s) required: the directive's own controller, or `undefined` if it doesn't have one + * * `string`: the controller instance + * * `array`: array of controller instances + * + * If a required controller cannot be found, and it is optional, the instance is `null`, + * otherwise the {@link error:$compile:ctreq Missing Required Controller} error is thrown. + * + * Note that you can also require the directive's own controller - it will be made available like + * any other controller. + * + * * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope. + * This is the same as the `$transclude` + * parameter of directive controllers, see there for details. + * `function([scope], cloneLinkingFn, futureParentElement)`. + * + * #### Pre-linking function + * + * Executed before the child elements are linked. Not safe to do DOM transformation since the + * compiler linking function will fail to locate the correct elements for linking. + * + * #### Post-linking function + * + * Executed after the child elements are linked. + * + * Note that child elements that contain `templateUrl` directives will not have been compiled + * and linked since they are waiting for their template to load asynchronously and their own + * compilation and linking has been suspended until that occurs. + * + * It is safe to do DOM transformation in the post-linking function on elements that are not waiting + * for their async templates to be resolved. + * + * + * ### Transclusion + * + * Transclusion is the process of extracting a collection of DOM elements from one part of the DOM and + * copying them to another part of the DOM, while maintaining their connection to the original AngularJS + * scope from where they were taken. + * + * Transclusion is used (often with {@link ngTransclude}) to insert the + * original contents of a directive's element into a specified place in the template of the directive. + * The benefit of transclusion, over simply moving the DOM elements manually, is that the transcluded + * content has access to the properties on the scope from which it was taken, even if the directive + * has isolated scope. + * See the {@link guide/directive#creating-a-directive-that-wraps-other-elements Directives Guide}. + * + * This makes it possible for the widget to have private state for its template, while the transcluded + * content has access to its originating scope. + * + *
+ * **Note:** When testing an element transclude directive you must not place the directive at the root of the + * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives * Testing Transclusion Directives}. - *
- * - * There are three kinds of transclusion depending upon whether you want to transclude just the contents of the - * directive's element, the entire element or multiple parts of the element contents: - * - * * `true` - transclude the content (i.e. the child nodes) of the directive's element. - * * `'element'` - transclude the whole of the directive's element including any directives on this - * element that defined at a lower priority than this directive. When used, the `template` - * property is ignored. - * * **`{...}` (an object hash):** - map elements of the content onto transclusion "slots" in the template. - * - * **Mult-slot transclusion** is declared by providing an object for the `transclude` property. - * - * This object is a map where the keys are the name of the slot to fill and the value is an element selector - * used to match the HTML to the slot. The element selector should be in normalized form (e.g. `myElement`) - * and will match the standard element variants (e.g. `my-element`, `my:element`, `data-my-element`, etc). - * - * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives} - * - * If the element selector is prefixed with a `?` then that slot is optional. - * - * For example, the transclude object `{ slotA: '?myCustomElement' }` maps `` elements to - * the `slotA` slot, which can be accessed via the `$transclude` function or via the {@link ngTransclude} directive. - * - * Slots that are not marked as optional (`?`) will trigger a compile time error if there are no matching elements - * in the transclude content. If you wish to know if an optional slot was filled with content, then you can call - * `$transclude.isSlotFilled(slotName)` on the transclude function passed to the directive's link function and - * injectable into the directive's controller. - * - * - * #### Transclusion Functions - * - * When a directive requests transclusion, the compiler extracts its contents and provides a **transclusion - * function** to the directive's `link` function and `controller`. This transclusion function is a special - * **linking function** that will return the compiled contents linked to a new transclusion scope. - * - *
- * If you are just using {@link ngTransclude} then you don't need to worry about this function, since - * ngTransclude will deal with it for us. - *
- * - * If you want to manually control the insertion and removal of the transcluded content in your directive - * then you must use this transclude function. When you call a transclude function it returns a a jqLite/JQuery - * object that contains the compiled DOM, which is linked to the correct transclusion scope. - * - * When you call a transclusion function you can pass in a **clone attach function**. This function accepts - * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded - * content and the `scope` is the newly created transclusion scope, to which the clone is bound. - * - *
- * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a transclude function - * since you then get a fresh clone of the original DOM and also have access to the new transclusion scope. - *
- * - * It is normal practice to attach your transcluded content (`clone`) to the DOM inside your **clone - * attach function**: - * - * ```js - * var transcludedContent, transclusionScope; - * - * $transclude(function(clone, scope) { + *
+ * + * There are three kinds of transclusion depending upon whether you want to transclude just the contents of the + * directive's element, the entire element or multiple parts of the element contents: + * + * * `true` - transclude the content (i.e. the child nodes) of the directive's element. + * * `'element'` - transclude the whole of the directive's element including any directives on this + * element that defined at a lower priority than this directive. When used, the `template` + * property is ignored. + * * **`{...}` (an object hash):** - map elements of the content onto transclusion "slots" in the template. + * + * **Mult-slot transclusion** is declared by providing an object for the `transclude` property. + * + * This object is a map where the keys are the name of the slot to fill and the value is an element selector + * used to match the HTML to the slot. The element selector should be in normalized form (e.g. `myElement`) + * and will match the standard element variants (e.g. `my-element`, `my:element`, `data-my-element`, etc). + * + * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives} + * + * If the element selector is prefixed with a `?` then that slot is optional. + * + * For example, the transclude object `{ slotA: '?myCustomElement' }` maps `` elements to + * the `slotA` slot, which can be accessed via the `$transclude` function or via the {@link ngTransclude} directive. + * + * Slots that are not marked as optional (`?`) will trigger a compile time error if there are no matching elements + * in the transclude content. If you wish to know if an optional slot was filled with content, then you can call + * `$transclude.isSlotFilled(slotName)` on the transclude function passed to the directive's link function and + * injectable into the directive's controller. + * + * + * #### Transclusion Functions + * + * When a directive requests transclusion, the compiler extracts its contents and provides a **transclusion + * function** to the directive's `link` function and `controller`. This transclusion function is a special + * **linking function** that will return the compiled contents linked to a new transclusion scope. + * + *
+ * If you are just using {@link ngTransclude} then you don't need to worry about this function, since + * ngTransclude will deal with it for us. + *
+ * + * If you want to manually control the insertion and removal of the transcluded content in your directive + * then you must use this transclude function. When you call a transclude function it returns a a jqLite/JQuery + * object that contains the compiled DOM, which is linked to the correct transclusion scope. + * + * When you call a transclusion function you can pass in a **clone attach function**. This function accepts + * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded + * content and the `scope` is the newly created transclusion scope, to which the clone is bound. + * + *
+ * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a transclude function + * since you then get a fresh clone of the original DOM and also have access to the new transclusion scope. + *
+ * + * It is normal practice to attach your transcluded content (`clone`) to the DOM inside your **clone + * attach function**: + * + * ```js + * var transcludedContent, transclusionScope; + * + * $transclude(function(clone, scope) { * element.append(clone); * transcludedContent = clone; * transclusionScope = scope; * }); - * ``` - * - * Later, if you want to remove the transcluded content from your DOM then you should also destroy the - * associated transclusion scope: - * - * ```js - * transcludedContent.remove(); - * transclusionScope.$destroy(); - * ``` - * - *
- * **Best Practice**: if you intend to add and remove transcluded content manually in your directive - * (by calling the transclude function to get the DOM and calling `element.remove()` to remove it), - * then you are also responsible for calling `$destroy` on the transclusion scope. - *
- * - * The built-in DOM manipulation directives, such as {@link ngIf}, {@link ngSwitch} and {@link ngRepeat} - * automatically destroy their transcluded clones as necessary so you do not need to worry about this if - * you are simply using {@link ngTransclude} to inject the transclusion into your directive. - * - * - * #### Transclusion Scopes - * - * When you call a transclude function it returns a DOM fragment that is pre-bound to a **transclusion - * scope**. This scope is special, in that it is a child of the directive's scope (and so gets destroyed - * when the directive's scope gets destroyed) but it inherits the properties of the scope from which it - * was taken. - * - * For example consider a directive that uses transclusion and isolated scope. The DOM hierarchy might look - * like this: - * - * ```html - *
- *
- *
- *
- *
- *
- * ``` - * - * The `$parent` scope hierarchy will look like this: - * - ``` - - $rootScope + * ``` + * + * Later, if you want to remove the transcluded content from your DOM then you should also destroy the + * associated transclusion scope: + * + * ```js + * transcludedContent.remove(); + * transclusionScope.$destroy(); + * ``` + * + *
+ * **Best Practice**: if you intend to add and remove transcluded content manually in your directive + * (by calling the transclude function to get the DOM and calling `element.remove()` to remove it), + * then you are also responsible for calling `$destroy` on the transclusion scope. + *
+ * + * The built-in DOM manipulation directives, such as {@link ngIf}, {@link ngSwitch} and {@link ngRepeat} + * automatically destroy their transcluded clones as necessary so you do not need to worry about this if + * you are simply using {@link ngTransclude} to inject the transclusion into your directive. + * + * + * #### Transclusion Scopes + * + * When you call a transclude function it returns a DOM fragment that is pre-bound to a **transclusion + * scope**. This scope is special, in that it is a child of the directive's scope (and so gets destroyed + * when the directive's scope gets destroyed) but it inherits the properties of the scope from which it + * was taken. + * + * For example consider a directive that uses transclusion and isolated scope. The DOM hierarchy might look + * like this: + * + * ```html + *
+ *
+ *
+ *
+ *
+ *
+ * ``` + * + * The `$parent` scope hierarchy will look like this: + * + ``` + - $rootScope - isolate - - transclusion - ``` - * - * but the scopes will inherit prototypically from different scopes to their `$parent`. - * - ``` - - $rootScope - transclusion - - isolate - ``` - * - * - * ### Attributes - * - * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the - * `link()` or `compile()` functions. It has a variety of uses. - * - * * *Accessing normalized attribute names:* Directives like 'ngBind' can be expressed in many ways: - * 'ng:bind', `data-ng-bind`, or 'x-ng-bind'. The attributes object allows for normalized access - * to the attributes. - * - * * *Directive inter-communication:* All directives share the same instance of the attributes - * object which allows the directives to use the attributes object as inter directive - * communication. - * - * * *Supports interpolation:* Interpolation attributes are assigned to the attribute object - * allowing other directives to read the interpolated value. - * - * * *Observing interpolated attributes:* Use `$observe` to observe the value changes of attributes - * that contain interpolation (e.g. `src="{{bar}}"`). Not only is this very efficient but it's also - * the only way to easily get the actual value because during the linking phase the interpolation - * hasn't been evaluated yet and so the value is at this time set to `undefined`. - * - * ```js - * function linkingFn(scope, elm, attrs, ctrl) { + ``` + * + * but the scopes will inherit prototypically from different scopes to their `$parent`. + * + ``` + - $rootScope + - transclusion + - isolate + ``` + * + * + * ### Attributes + * + * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the + * `link()` or `compile()` functions. It has a variety of uses. + * + * * *Accessing normalized attribute names:* Directives like 'ngBind' can be expressed in many ways: + * 'ng:bind', `data-ng-bind`, or 'x-ng-bind'. The attributes object allows for normalized access + * to the attributes. + * + * * *Directive inter-communication:* All directives share the same instance of the attributes + * object which allows the directives to use the attributes object as inter directive + * communication. + * + * * *Supports interpolation:* Interpolation attributes are assigned to the attribute object + * allowing other directives to read the interpolated value. + * + * * *Observing interpolated attributes:* Use `$observe` to observe the value changes of attributes + * that contain interpolation (e.g. `src="{{bar}}"`). Not only is this very efficient but it's also + * the only way to easily get the actual value because during the linking phase the interpolation + * hasn't been evaluated yet and so the value is at this time set to `undefined`. + * + * ```js + * function linkingFn(scope, elm, attrs, ctrl) { * // get the attribute value * console.log(attrs.ngModel); * @@ -7284,19 +7323,19 @@ function $TemplateCacheProvider() { * console.log('ngModel has changed value to ' + value); * }); * } - * ``` - * - * ## Example - * - *
- * **Note**: Typically directives are registered with `module.directive`. The example below is - * to illustrate how `$compile` works. - *
- * - - - -
-
-
-
-
- - + +
+
+
+
+
+ + it('should auto compile', function() { var textarea = $('textarea'); var output = $('div[compile]'); @@ -7343,4908 +7382,4917 @@ function $TemplateCacheProvider() { textarea.sendKeys('{{name}}!'); expect(output.getText()).toBe('Angular!'); }); - - + + - * - * - * @param {string|DOMElement} element Element or HTML string to compile into a template function. - * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED. - * - *
- * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it - * e.g. will not use the right outer scope. Please pass the transclude function as a - * `parentBoundTranscludeFn` to the link function instead. - *
- * - * @param {number} maxPriority only apply directives lower than given priority (Only effects the - * root element(s), not their children) - * @returns {function(scope, cloneAttachFn=, options=)} a link function which is used to bind template - * (a DOM element/tree) to a scope. Where: - * - * * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to. - * * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the - * `template` and call the `cloneAttachFn` function allowing the caller to attach the - * cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is - * called as:
`cloneAttachFn(clonedElement, scope)` where: - * - * * `clonedElement` - is a clone of the original `element` passed into the compiler. - * * `scope` - is the current scope with which the linking function is working with. - * - * * `options` - An optional object hash with linking options. If `options` is provided, then the following - * keys may be used to control linking behavior: - * - * * `parentBoundTranscludeFn` - the transclude function made available to - * directives; if given, it will be passed through to the link functions of - * directives found in `element` during compilation. - * * `transcludeControllers` - an object hash with keys that map controller names - * to a hash with the key `instance`, which maps to the controller instance; - * if given, it will make the controllers available to directives on the compileNode: - * ``` - * { + * + * + * @param {string|DOMElement} element Element or HTML string to compile into a template function. + * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED. + * + *
+ * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it + * e.g. will not use the right outer scope. Please pass the transclude function as a + * `parentBoundTranscludeFn` to the link function instead. + *
+ * + * @param {number} maxPriority only apply directives lower than given priority (Only effects the + * root element(s), not their children) + * @returns {function(scope, cloneAttachFn=, options=)} a link function which is used to bind template + * (a DOM element/tree) to a scope. Where: + * + * * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to. + * * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the + * `template` and call the `cloneAttachFn` function allowing the caller to attach the + * cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is + * called as:
`cloneAttachFn(clonedElement, scope)` where: + * + * * `clonedElement` - is a clone of the original `element` passed into the compiler. + * * `scope` - is the current scope with which the linking function is working with. + * + * * `options` - An optional object hash with linking options. If `options` is provided, then the following + * keys may be used to control linking behavior: + * + * * `parentBoundTranscludeFn` - the transclude function made available to + * directives; if given, it will be passed through to the link functions of + * directives found in `element` during compilation. + * * `transcludeControllers` - an object hash with keys that map controller names + * to a hash with the key `instance`, which maps to the controller instance; + * if given, it will make the controllers available to directives on the compileNode: + * ``` + * { * parent: { * instance: parentControllerInstance * } * } - * ``` - * * `futureParentElement` - defines the parent to which the `cloneAttachFn` will add - * the cloned elements; only needed for transcludes that are allowed to contain non html - * elements (e.g. SVG elements). See also the directive.controller property. - * - * Calling the linking function returns the element of the template. It is either the original - * element passed in, or the clone of the element if the `cloneAttachFn` is provided. - * - * After linking the view is not updated until after a call to $digest which typically is done by - * Angular automatically. - * - * If you need access to the bound view, there are two ways to do it: - * - * - If you are not asking the linking function to clone the template, create the DOM element(s) - * before you send them to the compiler and keep this reference around. - * ```js - * var element = $compile('

{{total}}

')(scope); - * ``` - * - * - if on the other hand, you need the element to be cloned, the view reference from the original - * example would not point to the clone, but rather to the original template that was cloned. In - * this case, you can access the clone via the cloneAttachFn: - * ```js - * var templateElement = angular.element('

{{total}}

'), - * scope = ....; - * - * var clonedElement = $compile(templateElement)(scope, function(clonedElement, scope) { + * ``` + * * `futureParentElement` - defines the parent to which the `cloneAttachFn` will add + * the cloned elements; only needed for transcludes that are allowed to contain non html + * elements (e.g. SVG elements). See also the directive.controller property. + * + * Calling the linking function returns the element of the template. It is either the original + * element passed in, or the clone of the element if the `cloneAttachFn` is provided. + * + * After linking the view is not updated until after a call to $digest which typically is done by + * Angular automatically. + * + * If you need access to the bound view, there are two ways to do it: + * + * - If you are not asking the linking function to clone the template, create the DOM element(s) + * before you send them to the compiler and keep this reference around. + * ```js + * var element = $compile('

{{total}}

')(scope); + * ``` + * + * - if on the other hand, you need the element to be cloned, the view reference from the original + * example would not point to the clone, but rather to the original template that was cloned. In + * this case, you can access the clone via the cloneAttachFn: + * ```js + * var templateElement = angular.element('

{{total}}

'), + * scope = ....; + * + * var clonedElement = $compile(templateElement)(scope, function(clonedElement, scope) { * //attach the clone to DOM document at the right place * }); - * - * //now we have reference to the cloned DOM via `clonedElement` - * ``` - * - * - * For information on how the compiler works, see the - * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide. - */ + * + * //now we have reference to the cloned DOM via `clonedElement` + * ``` + * + * + * For information on how the compiler works, see the + * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide. + */ -var $compileMinErr = minErr('$compile'); + var $compileMinErr = minErr('$compile'); -function UNINITIALIZED_VALUE() {} -var _UNINITIALIZED_VALUE = new UNINITIALIZED_VALUE(); + function UNINITIALIZED_VALUE() { + } -/** - * @ngdoc provider - * @name $compileProvider - * - * @description - */ -$CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider']; -function $CompileProvider($provide, $$sanitizeUriProvider) { - var hasDirectives = {}, - Suffix = 'Directive', - COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\w\-]+)\s+(.*)$/, - CLASS_DIRECTIVE_REGEXP = /(([\w\-]+)(?:\:([^;]+))?;?)/, - ALL_OR_NOTHING_ATTRS = makeMap('ngSrc,ngSrcset,src,srcset'), - REQUIRE_PREFIX_REGEXP = /^(?:(\^\^?)?(\?)?(\^\^?)?)?/; - - // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes - // The assumption is that future DOM event attribute names will begin with - // 'on' and be composed of only English letters. - var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/; - var bindingCache = createMap(); - - function parseIsolateBindings(scope, directiveName, isController) { - var LOCAL_REGEXP = /^\s*([@&<]|=(\*?))(\??)\s*(\w*)\s*$/; - - var bindings = createMap(); - - forEach(scope, function(definition, scopeName) { - if (definition in bindingCache) { - bindings[scopeName] = bindingCache[definition]; - return; - } - var match = definition.match(LOCAL_REGEXP); - - if (!match) { - throw $compileMinErr('iscp', - "Invalid {3} for directive '{0}'." + - " Definition: {... {1}: '{2}' ...}", - directiveName, scopeName, definition, - (isController ? "controller bindings definition" : - "isolate scope definition")); - } + var _UNINITIALIZED_VALUE = new UNINITIALIZED_VALUE(); - bindings[scopeName] = { - mode: match[1][0], - collection: match[2] === '*', - optional: match[3] === '?', - attrName: match[4] || scopeName - }; - if (match[4]) { - bindingCache[definition] = bindings[scopeName]; - } - }); + /** + * @ngdoc provider + * @name $compileProvider + * + * @description + */ + $CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider']; + + function $CompileProvider($provide, $$sanitizeUriProvider) { + var hasDirectives = {}, + Suffix = 'Directive', + COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\w\-]+)\s+(.*)$/, + CLASS_DIRECTIVE_REGEXP = /(([\w\-]+)(?:\:([^;]+))?;?)/, + ALL_OR_NOTHING_ATTRS = makeMap('ngSrc,ngSrcset,src,srcset'), + REQUIRE_PREFIX_REGEXP = /^(?:(\^\^?)?(\?)?(\^\^?)?)?/; + + // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes + // The assumption is that future DOM event attribute names will begin with + // 'on' and be composed of only English letters. + var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/; + var bindingCache = createMap(); + + function parseIsolateBindings(scope, directiveName, isController) { + var LOCAL_REGEXP = /^\s*([@&<]|=(\*?))(\??)\s*(\w*)\s*$/; + + var bindings = createMap(); + + forEach(scope, function (definition, scopeName) { + if (definition in bindingCache) { + bindings[scopeName] = bindingCache[definition]; + return; + } + var match = definition.match(LOCAL_REGEXP); + + if (!match) { + throw $compileMinErr('iscp', + "Invalid {3} for directive '{0}'." + + " Definition: {... {1}: '{2}' ...}", + directiveName, scopeName, definition, + (isController ? "controller bindings definition" : + "isolate scope definition")); + } - return bindings; - } + bindings[scopeName] = { + mode: match[1][0], + collection: match[2] === '*', + optional: match[3] === '?', + attrName: match[4] || scopeName + }; + if (match[4]) { + bindingCache[definition] = bindings[scopeName]; + } + }); - function parseDirectiveBindings(directive, directiveName) { - var bindings = { - isolateScope: null, - bindToController: null - }; - if (isObject(directive.scope)) { - if (directive.bindToController === true) { - bindings.bindToController = parseIsolateBindings(directive.scope, - directiveName, true); - bindings.isolateScope = {}; - } else { - bindings.isolateScope = parseIsolateBindings(directive.scope, - directiveName, false); - } - } - if (isObject(directive.bindToController)) { - bindings.bindToController = - parseIsolateBindings(directive.bindToController, directiveName, true); - } - if (isObject(bindings.bindToController)) { - var controller = directive.controller; - var controllerAs = directive.controllerAs; - if (!controller) { - // There is no controller, there may or may not be a controllerAs property - throw $compileMinErr('noctrl', - "Cannot bind to controller without directive '{0}'s controller.", - directiveName); - } else if (!identifierForController(controller, controllerAs)) { - // There is a controller, but no identifier or controllerAs property - throw $compileMinErr('noident', - "Cannot bind to controller without identifier for directive '{0}'.", - directiveName); - } - } - return bindings; - } + return bindings; + } - function assertValidDirectiveName(name) { - var letter = name.charAt(0); - if (!letter || letter !== lowercase(letter)) { - throw $compileMinErr('baddir', "Directive/Component name '{0}' is invalid. The first character must be a lowercase letter", name); - } - if (name !== name.trim()) { - throw $compileMinErr('baddir', - "Directive/Component name '{0}' is invalid. The name should not contain leading or trailing whitespaces", - name); - } - } + function parseDirectiveBindings(directive, directiveName) { + var bindings = { + isolateScope: null, + bindToController: null + }; + if (isObject(directive.scope)) { + if (directive.bindToController === true) { + bindings.bindToController = parseIsolateBindings(directive.scope, + directiveName, true); + bindings.isolateScope = {}; + } else { + bindings.isolateScope = parseIsolateBindings(directive.scope, + directiveName, false); + } + } + if (isObject(directive.bindToController)) { + bindings.bindToController = + parseIsolateBindings(directive.bindToController, directiveName, true); + } + if (isObject(bindings.bindToController)) { + var controller = directive.controller; + var controllerAs = directive.controllerAs; + if (!controller) { + // There is no controller, there may or may not be a controllerAs property + throw $compileMinErr('noctrl', + "Cannot bind to controller without directive '{0}'s controller.", + directiveName); + } else if (!identifierForController(controller, controllerAs)) { + // There is a controller, but no identifier or controllerAs property + throw $compileMinErr('noident', + "Cannot bind to controller without identifier for directive '{0}'.", + directiveName); + } + } + return bindings; + } - /** - * @ngdoc method - * @name $compileProvider#directive - * @kind function - * - * @description - * Register a new directive with the compiler. - * - * @param {string|Object} name Name of the directive in camel-case (i.e. ngBind which - * will match as ng-bind), or an object map of directives where the keys are the - * names and the values are the factories. - * @param {Function|Array} directiveFactory An injectable directive factory function. See the - * {@link guide/directive directive guide} and the {@link $compile compile API} for more info. - * @returns {ng.$compileProvider} Self for chaining. - */ - this.directive = function registerDirective(name, directiveFactory) { - assertNotHasOwnProperty(name, 'directive'); - if (isString(name)) { - assertValidDirectiveName(name); - assertArg(directiveFactory, 'directiveFactory'); - if (!hasDirectives.hasOwnProperty(name)) { - hasDirectives[name] = []; - $provide.factory(name + Suffix, ['$injector', '$exceptionHandler', - function($injector, $exceptionHandler) { - var directives = []; - forEach(hasDirectives[name], function(directiveFactory, index) { - try { - var directive = $injector.invoke(directiveFactory); - if (isFunction(directive)) { - directive = { compile: valueFn(directive) }; - } else if (!directive.compile && directive.link) { - directive.compile = valueFn(directive.link); - } - directive.priority = directive.priority || 0; - directive.index = index; - directive.name = directive.name || name; - directive.require = directive.require || (directive.controller && directive.name); - directive.restrict = directive.restrict || 'EA'; - directive.$$moduleName = directiveFactory.$$moduleName; - directives.push(directive); - } catch (e) { - $exceptionHandler(e); - } - }); - return directives; - }]); - } - hasDirectives[name].push(directiveFactory); - } else { - forEach(name, reverseParams(registerDirective)); - } - return this; - }; - - /** - * @ngdoc method - * @name $compileProvider#component - * @module ng - * @param {string} name Name of the component in camelCase (i.e. `myComp` which will match ``) - * @param {Object} options Component definition object (a simplified - * {@link ng.$compile#directive-definition-object directive definition object}), - * with the following properties (all optional): - * - * - `controller` – `{(string|function()=}` – controller constructor function that should be - * associated with newly created scope or the name of a {@link ng.$compile#-controller- + function assertValidDirectiveName(name) { + var letter = name.charAt(0); + if (!letter || letter !== lowercase(letter)) { + throw $compileMinErr('baddir', "Directive/Component name '{0}' is invalid. The first character must be a lowercase letter", name); + } + if (name !== name.trim()) { + throw $compileMinErr('baddir', + "Directive/Component name '{0}' is invalid. The name should not contain leading or trailing whitespaces", + name); + } + } + + /** + * @ngdoc method + * @name $compileProvider#directive + * @kind function + * + * @description + * Register a new directive with the compiler. + * + * @param {string|Object} name Name of the directive in camel-case (i.e. ngBind which + * will match as ng-bind), or an object map of directives where the keys are the + * names and the values are the factories. + * @param {Function|Array} directiveFactory An injectable directive factory function. See the + * {@link guide/directive directive guide} and the {@link $compile compile API} for more info. + * @returns {ng.$compileProvider} Self for chaining. + */ + this.directive = function registerDirective(name, directiveFactory) { + assertNotHasOwnProperty(name, 'directive'); + if (isString(name)) { + assertValidDirectiveName(name); + assertArg(directiveFactory, 'directiveFactory'); + if (!hasDirectives.hasOwnProperty(name)) { + hasDirectives[name] = []; + $provide.factory(name + Suffix, ['$injector', '$exceptionHandler', + function ($injector, $exceptionHandler) { + var directives = []; + forEach(hasDirectives[name], function (directiveFactory, index) { + try { + var directive = $injector.invoke(directiveFactory); + if (isFunction(directive)) { + directive = {compile: valueFn(directive)}; + } else if (!directive.compile && directive.link) { + directive.compile = valueFn(directive.link); + } + directive.priority = directive.priority || 0; + directive.index = index; + directive.name = directive.name || name; + directive.require = directive.require || (directive.controller && directive.name); + directive.restrict = directive.restrict || 'EA'; + directive.$$moduleName = directiveFactory.$$moduleName; + directives.push(directive); + } catch (e) { + $exceptionHandler(e); + } + }); + return directives; + }]); + } + hasDirectives[name].push(directiveFactory); + } else { + forEach(name, reverseParams(registerDirective)); + } + return this; + }; + + /** + * @ngdoc method + * @name $compileProvider#component + * @module ng + * @param {string} name Name of the component in camelCase (i.e. `myComp` which will match ``) + * @param {Object} options Component definition object (a simplified + * {@link ng.$compile#directive-definition-object directive definition object}), + * with the following properties (all optional): + * + * - `controller` – `{(string|function()=}` – controller constructor function that should be + * associated with newly created scope or the name of a {@link ng.$compile#-controller- * registered controller} if passed as a string. An empty `noop` function by default. - * - `controllerAs` – `{string=}` – identifier name for to reference the controller in the component's scope. - * If present, the controller will be published to scope under the `controllerAs` name. - * If not present, this will default to be `$ctrl`. - * - `template` – `{string=|function()=}` – html template as a string or a function that - * returns an html template as a string which should be used as the contents of this component. - * Empty string by default. - * - * If `template` is a function, then it is {@link auto.$injector#invoke injected} with - * the following locals: - * - * - `$element` - Current element - * - `$attrs` - Current attributes object for the element - * - * - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html - * template that should be used as the contents of this component. - * - * If `templateUrl` is a function, then it is {@link auto.$injector#invoke injected} with - * the following locals: - * - * - `$element` - Current element - * - `$attrs` - Current attributes object for the element - * - * - `bindings` – `{object=}` – defines bindings between DOM attributes and component properties. - * Component properties are always bound to the component controller and not to the scope. - * See {@link ng.$compile#-bindtocontroller- `bindToController`}. - * - `transclude` – `{boolean=}` – whether {@link $compile#transclusion content transclusion} is enabled. - * Disabled by default. - * - `require` - `{Object=}` - requires the controllers of other directives and binds them to - * this component's controller. The object keys specify the property names under which the required - * controllers (object values) will be bound. See {@link ng.$compile#-require- `require`}. - * - `$...` – additional properties to attach to the directive factory function and the controller - * constructor function. (This is used by the component router to annotate) - * - * @returns {ng.$compileProvider} the compile provider itself, for chaining of function calls. - * @description - * Register a **component definition** with the compiler. This is a shorthand for registering a special - * type of directive, which represents a self-contained UI component in your application. Such components - * are always isolated (i.e. `scope: {}`) and are always restricted to elements (i.e. `restrict: 'E'`). - * - * Component definitions are very simple and do not require as much configuration as defining general - * directives. Component definitions usually consist only of a template and a controller backing it. - * - * In order to make the definition easier, components enforce best practices like use of `controllerAs`, - * `bindToController`. They always have **isolate scope** and are restricted to elements. - * - * Here are a few examples of how you would usually define components: - * - * ```js - * var myMod = angular.module(...); - * myMod.component('myComp', { + * - `controllerAs` – `{string=}` – identifier name for to reference the controller in the component's scope. + * If present, the controller will be published to scope under the `controllerAs` name. + * If not present, this will default to be `$ctrl`. + * - `template` – `{string=|function()=}` – html template as a string or a function that + * returns an html template as a string which should be used as the contents of this component. + * Empty string by default. + * + * If `template` is a function, then it is {@link auto.$injector#invoke injected} with + * the following locals: + * + * - `$element` - Current element + * - `$attrs` - Current attributes object for the element + * + * - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html + * template that should be used as the contents of this component. + * + * If `templateUrl` is a function, then it is {@link auto.$injector#invoke injected} with + * the following locals: + * + * - `$element` - Current element + * - `$attrs` - Current attributes object for the element + * + * - `bindings` – `{object=}` – defines bindings between DOM attributes and component properties. + * Component properties are always bound to the component controller and not to the scope. + * See {@link ng.$compile#-bindtocontroller- `bindToController`}. + * - `transclude` – `{boolean=}` – whether {@link $compile#transclusion content transclusion} is enabled. + * Disabled by default. + * - `require` - `{Object=}` - requires the controllers of other directives and binds them to + * this component's controller. The object keys specify the property names under which the required + * controllers (object values) will be bound. See {@link ng.$compile#-require- `require`}. + * - `$...` – additional properties to attach to the directive factory function and the controller + * constructor function. (This is used by the component router to annotate) + * + * @returns {ng.$compileProvider} the compile provider itself, for chaining of function calls. + * @description + * Register a **component definition** with the compiler. This is a shorthand for registering a special + * type of directive, which represents a self-contained UI component in your application. Such components + * are always isolated (i.e. `scope: {}`) and are always restricted to elements (i.e. `restrict: 'E'`). + * + * Component definitions are very simple and do not require as much configuration as defining general + * directives. Component definitions usually consist only of a template and a controller backing it. + * + * In order to make the definition easier, components enforce best practices like use of `controllerAs`, + * `bindToController`. They always have **isolate scope** and are restricted to elements. + * + * Here are a few examples of how you would usually define components: + * + * ```js + * var myMod = angular.module(...); + * myMod.component('myComp', { * template: '
My name is {{$ctrl.name}}
', * controller: function() { * this.name = 'shahar'; * } * }); - * - * myMod.component('myComp', { + * + * myMod.component('myComp', { * template: '
My name is {{$ctrl.name}}
', * bindings: {name: '@'} * }); - * - * myMod.component('myComp', { + * + * myMod.component('myComp', { * templateUrl: 'views/my-comp.html', * controller: 'MyCtrl', * controllerAs: 'ctrl', * bindings: {name: '@'} * }); - * - * ``` - * For more examples, and an in-depth guide, see the {@link guide/component component guide}. - * - *
- * See also {@link ng.$compileProvider#directive $compileProvider.directive()}. - */ - this.component = function registerComponent(name, options) { - var controller = options.controller || function() {}; - - function factory($injector) { - function makeInjectable(fn) { - if (isFunction(fn) || isArray(fn)) { - return function(tElement, tAttrs) { - return $injector.invoke(fn, this, {$element: tElement, $attrs: tAttrs}); - }; - } else { - return fn; - } - } + * + * ``` + * For more examples, and an in-depth guide, see the {@link guide/component component guide}. + * + *
+ * See also {@link ng.$compileProvider#directive $compileProvider.directive()}. + */ + this.component = function registerComponent(name, options) { + var controller = options.controller || function () { + }; - var template = (!options.template && !options.templateUrl ? '' : options.template); - var ddo = { - controller: controller, - controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl', - template: makeInjectable(template), - templateUrl: makeInjectable(options.templateUrl), - transclude: options.transclude, - scope: {}, - bindToController: options.bindings || {}, - restrict: 'E', - require: options.require - }; + function factory($injector) { + function makeInjectable(fn) { + if (isFunction(fn) || isArray(fn)) { + return function (tElement, tAttrs) { + return $injector.invoke(fn, this, {$element: tElement, $attrs: tAttrs}); + }; + } else { + return fn; + } + } - // Copy annotations (starting with $) over to the DDO - forEach(options, function(val, key) { - if (key.charAt(0) === '$') ddo[key] = val; - }); + var template = (!options.template && !options.templateUrl ? '' : options.template); + var ddo = { + controller: controller, + controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl', + template: makeInjectable(template), + templateUrl: makeInjectable(options.templateUrl), + transclude: options.transclude, + scope: {}, + bindToController: options.bindings || {}, + restrict: 'E', + require: options.require + }; - return ddo; - } + // Copy annotations (starting with $) over to the DDO + forEach(options, function (val, key) { + if (key.charAt(0) === '$') ddo[key] = val; + }); - // TODO(pete) remove the following `forEach` before we release 1.6.0 - // The component-router@0.2.0 looks for the annotations on the controller constructor - // Nothing in Angular looks for annotations on the factory function but we can't remove - // it from 1.5.x yet. - - // Copy any annotation properties (starting with $) over to the factory and controller constructor functions - // These could be used by libraries such as the new component router - forEach(options, function(val, key) { - if (key.charAt(0) === '$') { - factory[key] = val; - // Don't try to copy over annotations to named controller - if (isFunction(controller)) controller[key] = val; - } - }); + return ddo; + } - factory.$inject = ['$injector']; + // TODO(pete) remove the following `forEach` before we release 1.6.0 + // The component-router@0.2.0 looks for the annotations on the controller constructor + // Nothing in Angular looks for annotations on the factory function but we can't remove + // it from 1.5.x yet. + + // Copy any annotation properties (starting with $) over to the factory and controller constructor functions + // These could be used by libraries such as the new component router + forEach(options, function (val, key) { + if (key.charAt(0) === '$') { + factory[key] = val; + // Don't try to copy over annotations to named controller + if (isFunction(controller)) controller[key] = val; + } + }); - return this.directive(name, factory); - }; + factory.$inject = ['$injector']; + return this.directive(name, factory); + }; - /** - * @ngdoc method - * @name $compileProvider#aHrefSanitizationWhitelist - * @kind function - * - * @description - * Retrieves or overrides the default regular expression that is used for whitelisting of safe - * urls during a[href] sanitization. - * - * The sanitization is a security measure aimed at preventing XSS attacks via html links. - * - * Any url about to be assigned to a[href] via data-binding is first normalized and turned into - * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist` - * regular expression. If a match is found, the original url is written into the dom. Otherwise, - * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. - * - * @param {RegExp=} regexp New regexp to whitelist urls with. - * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for - * chaining otherwise. - */ - this.aHrefSanitizationWhitelist = function(regexp) { - if (isDefined(regexp)) { - $$sanitizeUriProvider.aHrefSanitizationWhitelist(regexp); - return this; - } else { - return $$sanitizeUriProvider.aHrefSanitizationWhitelist(); - } - }; + /** + * @ngdoc method + * @name $compileProvider#aHrefSanitizationWhitelist + * @kind function + * + * @description + * Retrieves or overrides the default regular expression that is used for whitelisting of safe + * urls during a[href] sanitization. + * + * The sanitization is a security measure aimed at preventing XSS attacks via html links. + * + * Any url about to be assigned to a[href] via data-binding is first normalized and turned into + * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist` + * regular expression. If a match is found, the original url is written into the dom. Otherwise, + * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. + * + * @param {RegExp=} regexp New regexp to whitelist urls with. + * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for + * chaining otherwise. + */ + this.aHrefSanitizationWhitelist = function (regexp) { + if (isDefined(regexp)) { + $$sanitizeUriProvider.aHrefSanitizationWhitelist(regexp); + return this; + } else { + return $$sanitizeUriProvider.aHrefSanitizationWhitelist(); + } + }; - /** - * @ngdoc method - * @name $compileProvider#imgSrcSanitizationWhitelist - * @kind function - * - * @description - * Retrieves or overrides the default regular expression that is used for whitelisting of safe - * urls during img[src] sanitization. - * - * The sanitization is a security measure aimed at prevent XSS attacks via html links. - * - * Any url about to be assigned to img[src] via data-binding is first normalized and turned into - * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist` - * regular expression. If a match is found, the original url is written into the dom. Otherwise, - * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. - * - * @param {RegExp=} regexp New regexp to whitelist urls with. - * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for - * chaining otherwise. - */ - this.imgSrcSanitizationWhitelist = function(regexp) { - if (isDefined(regexp)) { - $$sanitizeUriProvider.imgSrcSanitizationWhitelist(regexp); - return this; - } else { - return $$sanitizeUriProvider.imgSrcSanitizationWhitelist(); - } - }; - /** - * @ngdoc method - * @name $compileProvider#debugInfoEnabled - * - * @param {boolean=} enabled update the debugInfoEnabled state if provided, otherwise just return the - * current debugInfoEnabled state - * @returns {*} current value if used as getter or itself (chaining) if used as setter - * - * @kind function - * - * @description - * Call this method to enable/disable various debug runtime information in the compiler such as adding - * binding information and a reference to the current scope on to DOM elements. - * If enabled, the compiler will add the following to DOM elements that have been bound to the scope - * * `ng-binding` CSS class - * * `$binding` data property containing an array of the binding expressions - * - * You may want to disable this in production for a significant performance boost. See - * {@link guide/production#disabling-debug-data Disabling Debug Data} for more. - * - * The default value is true. - */ - var debugInfoEnabled = true; - this.debugInfoEnabled = function(enabled) { - if (isDefined(enabled)) { - debugInfoEnabled = enabled; - return this; - } - return debugInfoEnabled; - }; + /** + * @ngdoc method + * @name $compileProvider#imgSrcSanitizationWhitelist + * @kind function + * + * @description + * Retrieves or overrides the default regular expression that is used for whitelisting of safe + * urls during img[src] sanitization. + * + * The sanitization is a security measure aimed at prevent XSS attacks via html links. + * + * Any url about to be assigned to img[src] via data-binding is first normalized and turned into + * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist` + * regular expression. If a match is found, the original url is written into the dom. Otherwise, + * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. + * + * @param {RegExp=} regexp New regexp to whitelist urls with. + * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for + * chaining otherwise. + */ + this.imgSrcSanitizationWhitelist = function (regexp) { + if (isDefined(regexp)) { + $$sanitizeUriProvider.imgSrcSanitizationWhitelist(regexp); + return this; + } else { + return $$sanitizeUriProvider.imgSrcSanitizationWhitelist(); + } + }; + + /** + * @ngdoc method + * @name $compileProvider#debugInfoEnabled + * + * @param {boolean=} enabled update the debugInfoEnabled state if provided, otherwise just return the + * current debugInfoEnabled state + * @returns {*} current value if used as getter or itself (chaining) if used as setter + * + * @kind function + * + * @description + * Call this method to enable/disable various debug runtime information in the compiler such as adding + * binding information and a reference to the current scope on to DOM elements. + * If enabled, the compiler will add the following to DOM elements that have been bound to the scope + * * `ng-binding` CSS class + * * `$binding` data property containing an array of the binding expressions + * + * You may want to disable this in production for a significant performance boost. See + * {@link guide/production#disabling-debug-data Disabling Debug Data} for more. + * + * The default value is true. + */ + var debugInfoEnabled = true; + this.debugInfoEnabled = function (enabled) { + if (isDefined(enabled)) { + debugInfoEnabled = enabled; + return this; + } + return debugInfoEnabled; + }; - var TTL = 10; - /** - * @ngdoc method - * @name $compileProvider#onChangesTtl - * @description - * - * Sets the number of times `$onChanges` hooks can trigger new changes before giving up and - * assuming that the model is unstable. - * - * The current default is 10 iterations. - * - * In complex applications it's possible that dependencies between `$onChanges` hooks and bindings will result - * in several iterations of calls to these hooks. However if an application needs more than the default 10 - * iterations to stabilize then you should investigate what is causing the model to continuously change during - * the `$onChanges` hook execution. - * - * Increasing the TTL could have performance implications, so you should not change it without proper justification. - * - * @param {number} limit The number of `$onChanges` hook iterations. - * @returns {number|object} the current limit (or `this` if called as a setter for chaining) - */ - this.onChangesTtl = function(value) { - if (arguments.length) { - TTL = value; - return this; - } - return TTL; - }; + var TTL = 10; + /** + * @ngdoc method + * @name $compileProvider#onChangesTtl + * @description + * + * Sets the number of times `$onChanges` hooks can trigger new changes before giving up and + * assuming that the model is unstable. + * + * The current default is 10 iterations. + * + * In complex applications it's possible that dependencies between `$onChanges` hooks and bindings will result + * in several iterations of calls to these hooks. However if an application needs more than the default 10 + * iterations to stabilize then you should investigate what is causing the model to continuously change during + * the `$onChanges` hook execution. + * + * Increasing the TTL could have performance implications, so you should not change it without proper justification. + * + * @param {number} limit The number of `$onChanges` hook iterations. + * @returns {number|object} the current limit (or `this` if called as a setter for chaining) + */ + this.onChangesTtl = function (value) { + if (arguments.length) { + TTL = value; + return this; + } + return TTL; + }; - this.$get = [ + this.$get = [ '$injector', '$interpolate', '$exceptionHandler', '$templateRequest', '$parse', '$controller', '$rootScope', '$sce', '$animate', '$$sanitizeUri', - function($injector, $interpolate, $exceptionHandler, $templateRequest, $parse, - $controller, $rootScope, $sce, $animate, $$sanitizeUri) { - - var SIMPLE_ATTR_NAME = /^\w/; - var specialAttrHolder = window.document.createElement('div'); + function ($injector, $interpolate, $exceptionHandler, $templateRequest, $parse, + $controller, $rootScope, $sce, $animate, $$sanitizeUri) { + + var SIMPLE_ATTR_NAME = /^\w/; + var specialAttrHolder = window.document.createElement('div'); + + + var onChangesTtl = TTL; + // The onChanges hooks should all be run together in a single digest + // When changes occur, the call to trigger their hooks will be added to this queue + var onChangesQueue; + + // This function is called in a $$postDigest to trigger all the onChanges hooks in a single digest + function flushOnChangesQueue() { + try { + if (!(--onChangesTtl)) { + // We have hit the TTL limit so reset everything + onChangesQueue = undefined; + throw $compileMinErr('infchng', '{0} $onChanges() iterations reached. Aborting!\n', TTL); + } + // We must run this hook in an apply since the $$postDigest runs outside apply + $rootScope.$apply(function () { + for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) { + onChangesQueue[i](); + } + // Reset the queue to trigger a new schedule next time there is a change + onChangesQueue = undefined; + }); + } finally { + onChangesTtl++; + } + } + function Attributes(element, attributesToCopy) { + if (attributesToCopy) { + var keys = Object.keys(attributesToCopy); + var i, l, key; - var onChangesTtl = TTL; - // The onChanges hooks should all be run together in a single digest - // When changes occur, the call to trigger their hooks will be added to this queue - var onChangesQueue; + for (i = 0, l = keys.length; i < l; i++) { + key = keys[i]; + this[key] = attributesToCopy[key]; + } + } else { + this.$attr = {}; + } - // This function is called in a $$postDigest to trigger all the onChanges hooks in a single digest - function flushOnChangesQueue() { - try { - if (!(--onChangesTtl)) { - // We have hit the TTL limit so reset everything - onChangesQueue = undefined; - throw $compileMinErr('infchng', '{0} $onChanges() iterations reached. Aborting!\n', TTL); - } - // We must run this hook in an apply since the $$postDigest runs outside apply - $rootScope.$apply(function() { - for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) { - onChangesQueue[i](); - } - // Reset the queue to trigger a new schedule next time there is a change - onChangesQueue = undefined; - }); - } finally { - onChangesTtl++; - } - } + this.$$element = element; + } + Attributes.prototype = { + /** + * @ngdoc method + * @name $compile.directive.Attributes#$normalize + * @kind function + * + * @description + * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with `x-` or + * `data-`) to its normalized, camelCase form. + * + * Also there is special case for Moz prefix starting with upper case letter. + * + * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives} + * + * @param {string} name Name to normalize + */ + $normalize: directiveNormalize, + + + /** + * @ngdoc method + * @name $compile.directive.Attributes#$addClass + * @kind function + * + * @description + * Adds the CSS class value specified by the classVal parameter to the element. If animations + * are enabled then an animation will be triggered for the class addition. + * + * @param {string} classVal The className value that will be added to the element + */ + $addClass: function (classVal) { + if (classVal && classVal.length > 0) { + $animate.addClass(this.$$element, classVal); + } + }, + + /** + * @ngdoc method + * @name $compile.directive.Attributes#$removeClass + * @kind function + * + * @description + * Removes the CSS class value specified by the classVal parameter from the element. If + * animations are enabled then an animation will be triggered for the class removal. + * + * @param {string} classVal The className value that will be removed from the element + */ + $removeClass: function (classVal) { + if (classVal && classVal.length > 0) { + $animate.removeClass(this.$$element, classVal); + } + }, + + /** + * @ngdoc method + * @name $compile.directive.Attributes#$updateClass + * @kind function + * + * @description + * Adds and removes the appropriate CSS class values to the element based on the difference + * between the new and old CSS class values (specified as newClasses and oldClasses). + * + * @param {string} newClasses The current CSS className value + * @param {string} oldClasses The former CSS className value + */ + $updateClass: function (newClasses, oldClasses) { + var toAdd = tokenDifference(newClasses, oldClasses); + if (toAdd && toAdd.length) { + $animate.addClass(this.$$element, toAdd); + } + + var toRemove = tokenDifference(oldClasses, newClasses); + if (toRemove && toRemove.length) { + $animate.removeClass(this.$$element, toRemove); + } + }, + + /** + * Set a normalized attribute on the element in a way such that all directives + * can share the attribute. This function properly handles boolean attributes. + * @param {string} key Normalized key. (ie ngAttribute) + * @param {string|boolean} value The value to set. If `null` attribute will be deleted. + * @param {boolean=} writeAttr If false, does not write the value to DOM element attribute. + * Defaults to true. + * @param {string=} attrName Optional none normalized name. Defaults to key. + */ + $set: function (key, value, writeAttr, attrName) { + // TODO: decide whether or not to throw an error if "class" + //is set through this function since it may cause $updateClass to + //become unstable. + + var node = this.$$element[0], + booleanKey = getBooleanAttrName(node, key), + aliasedKey = getAliasedAttrName(key), + observer = key, + nodeName; + + if (booleanKey) { + this.$$element.prop(key, value); + attrName = booleanKey; + } else if (aliasedKey) { + this[aliasedKey] = value; + observer = aliasedKey; + } + + this[key] = value; + + // translate normalized key to actual key + if (attrName) { + this.$attr[key] = attrName; + } else { + attrName = this.$attr[key]; + if (!attrName) { + this.$attr[key] = attrName = snake_case(key, '-'); + } + } + + nodeName = nodeName_(this.$$element); + + if ((nodeName === 'a' && (key === 'href' || key === 'xlinkHref')) || + (nodeName === 'img' && key === 'src')) { + // sanitize a[href] and img[src] values + this[key] = value = $$sanitizeUri(value, key === 'src'); + } else if (nodeName === 'img' && key === 'srcset') { + // sanitize img[srcset] values + var result = ""; + + // first check if there are spaces because it's not the same pattern + var trimmedSrcset = trim(value); + // ( 999x ,| 999w ,| ,|, ) + var srcPattern = /(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/; + var pattern = /\s/.test(trimmedSrcset) ? srcPattern : /(,)/; + + // split srcset into tuple of uri and descriptor except for the last item + var rawUris = trimmedSrcset.split(pattern); + + // for each tuples + var nbrUrisWith2parts = Math.floor(rawUris.length / 2); + for (var i = 0; i < nbrUrisWith2parts; i++) { + var innerIdx = i * 2; + // sanitize the uri + result += $$sanitizeUri(trim(rawUris[innerIdx]), true); + // add the descriptor + result += (" " + trim(rawUris[innerIdx + 1])); + } + + // split the last item into uri and descriptor + var lastTuple = trim(rawUris[i * 2]).split(/\s/); + + // sanitize the last uri + result += $$sanitizeUri(trim(lastTuple[0]), true); + + // and add the last descriptor if any + if (lastTuple.length === 2) { + result += (" " + trim(lastTuple[1])); + } + this[key] = value = result; + } + + if (writeAttr !== false) { + if (value === null || isUndefined(value)) { + this.$$element.removeAttr(attrName); + } else { + if (SIMPLE_ATTR_NAME.test(attrName)) { + this.$$element.attr(attrName, value); + } else { + setSpecialAttr(this.$$element[0], attrName, value); + } + } + } + + // fire observers + var $$observers = this.$$observers; + $$observers && forEach($$observers[observer], function (fn) { + try { + fn(value); + } catch (e) { + $exceptionHandler(e); + } + }); + }, + + + /** + * @ngdoc method + * @name $compile.directive.Attributes#$observe + * @kind function + * + * @description + * Observes an interpolated attribute. + * + * The observer function will be invoked once during the next `$digest` following + * compilation. The observer is then invoked whenever the interpolated value + * changes. + * + * @param {string} key Normalized key. (ie ngAttribute) . + * @param {function(interpolatedValue)} fn Function that will be called whenever + the interpolated value of the attribute changes. + * See the {@link guide/interpolation#how-text-and-attribute-bindings-work Interpolation + * guide} for more info. + * @returns {function()} Returns a deregistration function for this observer. + */ + $observe: function (key, fn) { + var attrs = this, + $$observers = (attrs.$$observers || (attrs.$$observers = createMap())), + listeners = ($$observers[key] || ($$observers[key] = [])); + + listeners.push(fn); + $rootScope.$evalAsync(function () { + if (!listeners.$$inter && attrs.hasOwnProperty(key) && !isUndefined(attrs[key])) { + // no one registered attribute interpolation function, so lets call it manually + fn(attrs[key]); + } + }); - function Attributes(element, attributesToCopy) { - if (attributesToCopy) { - var keys = Object.keys(attributesToCopy); - var i, l, key; + return function () { + arrayRemove(listeners, fn); + }; + } + }; - for (i = 0, l = keys.length; i < l; i++) { - key = keys[i]; - this[key] = attributesToCopy[key]; - } - } else { - this.$attr = {}; - } + function setSpecialAttr(element, attrName, value) { + // Attributes names that do not start with letters (such as `(click)`) cannot be set using `setAttribute` + // so we have to jump through some hoops to get such an attribute + // https://github.com/angular/angular.js/pull/13318 + specialAttrHolder.innerHTML = ""; + var attributes = specialAttrHolder.firstChild.attributes; + var attribute = attributes[0]; + // We have to remove the attribute from its container element before we can add it to the destination element + attributes.removeNamedItem(attribute.name); + attribute.value = value; + element.attributes.setNamedItem(attribute); + } - this.$$element = element; - } + function safeAddClass($element, className) { + try { + $element.addClass(className); + } catch (e) { + // ignore, since it means that we are trying to set class on + // SVG element, where class name is read-only. + } + } - Attributes.prototype = { - /** - * @ngdoc method - * @name $compile.directive.Attributes#$normalize - * @kind function - * - * @description - * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with `x-` or - * `data-`) to its normalized, camelCase form. - * - * Also there is special case for Moz prefix starting with upper case letter. - * - * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives} - * - * @param {string} name Name to normalize - */ - $normalize: directiveNormalize, + var startSymbol = $interpolate.startSymbol(), + endSymbol = $interpolate.endSymbol(), + denormalizeTemplate = (startSymbol == '{{' && endSymbol == '}}') + ? identity + : function denormalizeTemplate(template) { + return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol); + }, + NG_ATTR_BINDING = /^ngAttr[A-Z]/; + var MULTI_ELEMENT_DIR_RE = /^(.+)Start$/; - /** - * @ngdoc method - * @name $compile.directive.Attributes#$addClass - * @kind function - * - * @description - * Adds the CSS class value specified by the classVal parameter to the element. If animations - * are enabled then an animation will be triggered for the class addition. - * - * @param {string} classVal The className value that will be added to the element - */ - $addClass: function(classVal) { - if (classVal && classVal.length > 0) { - $animate.addClass(this.$$element, classVal); - } - }, + compile.$$addBindingInfo = debugInfoEnabled ? function $$addBindingInfo($element, binding) { + var bindings = $element.data('$binding') || []; - /** - * @ngdoc method - * @name $compile.directive.Attributes#$removeClass - * @kind function - * - * @description - * Removes the CSS class value specified by the classVal parameter from the element. If - * animations are enabled then an animation will be triggered for the class removal. - * - * @param {string} classVal The className value that will be removed from the element - */ - $removeClass: function(classVal) { - if (classVal && classVal.length > 0) { - $animate.removeClass(this.$$element, classVal); - } - }, + if (isArray(binding)) { + bindings = bindings.concat(binding); + } else { + bindings.push(binding); + } - /** - * @ngdoc method - * @name $compile.directive.Attributes#$updateClass - * @kind function - * - * @description - * Adds and removes the appropriate CSS class values to the element based on the difference - * between the new and old CSS class values (specified as newClasses and oldClasses). - * - * @param {string} newClasses The current CSS className value - * @param {string} oldClasses The former CSS className value - */ - $updateClass: function(newClasses, oldClasses) { - var toAdd = tokenDifference(newClasses, oldClasses); - if (toAdd && toAdd.length) { - $animate.addClass(this.$$element, toAdd); - } + $element.data('$binding', bindings); + } : noop; - var toRemove = tokenDifference(oldClasses, newClasses); - if (toRemove && toRemove.length) { - $animate.removeClass(this.$$element, toRemove); - } - }, - - /** - * Set a normalized attribute on the element in a way such that all directives - * can share the attribute. This function properly handles boolean attributes. - * @param {string} key Normalized key. (ie ngAttribute) - * @param {string|boolean} value The value to set. If `null` attribute will be deleted. - * @param {boolean=} writeAttr If false, does not write the value to DOM element attribute. - * Defaults to true. - * @param {string=} attrName Optional none normalized name. Defaults to key. - */ - $set: function(key, value, writeAttr, attrName) { - // TODO: decide whether or not to throw an error if "class" - //is set through this function since it may cause $updateClass to - //become unstable. - - var node = this.$$element[0], - booleanKey = getBooleanAttrName(node, key), - aliasedKey = getAliasedAttrName(key), - observer = key, - nodeName; - - if (booleanKey) { - this.$$element.prop(key, value); - attrName = booleanKey; - } else if (aliasedKey) { - this[aliasedKey] = value; - observer = aliasedKey; - } + compile.$$addBindingClass = debugInfoEnabled ? function $$addBindingClass($element) { + safeAddClass($element, 'ng-binding'); + } : noop; - this[key] = value; + compile.$$addScopeInfo = debugInfoEnabled ? function $$addScopeInfo($element, scope, isolated, noTemplate) { + var dataName = isolated ? (noTemplate ? '$isolateScopeNoTemplate' : '$isolateScope') : '$scope'; + $element.data(dataName, scope); + } : noop; - // translate normalized key to actual key - if (attrName) { - this.$attr[key] = attrName; - } else { - attrName = this.$attr[key]; - if (!attrName) { - this.$attr[key] = attrName = snake_case(key, '-'); - } - } + compile.$$addScopeClass = debugInfoEnabled ? function $$addScopeClass($element, isolated) { + safeAddClass($element, isolated ? 'ng-isolate-scope' : 'ng-scope'); + } : noop; - nodeName = nodeName_(this.$$element); - - if ((nodeName === 'a' && (key === 'href' || key === 'xlinkHref')) || - (nodeName === 'img' && key === 'src')) { - // sanitize a[href] and img[src] values - this[key] = value = $$sanitizeUri(value, key === 'src'); - } else if (nodeName === 'img' && key === 'srcset') { - // sanitize img[srcset] values - var result = ""; - - // first check if there are spaces because it's not the same pattern - var trimmedSrcset = trim(value); - // ( 999x ,| 999w ,| ,|, ) - var srcPattern = /(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/; - var pattern = /\s/.test(trimmedSrcset) ? srcPattern : /(,)/; - - // split srcset into tuple of uri and descriptor except for the last item - var rawUris = trimmedSrcset.split(pattern); - - // for each tuples - var nbrUrisWith2parts = Math.floor(rawUris.length / 2); - for (var i = 0; i < nbrUrisWith2parts; i++) { - var innerIdx = i * 2; - // sanitize the uri - result += $$sanitizeUri(trim(rawUris[innerIdx]), true); - // add the descriptor - result += (" " + trim(rawUris[innerIdx + 1])); - } + compile.$$createComment = function (directiveName, comment) { + var content = ''; + if (debugInfoEnabled) { + content = ' ' + (directiveName || '') + ': ' + (comment || '') + ' '; + } + return window.document.createComment(content); + }; - // split the last item into uri and descriptor - var lastTuple = trim(rawUris[i * 2]).split(/\s/); + return compile; - // sanitize the last uri - result += $$sanitizeUri(trim(lastTuple[0]), true); + //================================ - // and add the last descriptor if any - if (lastTuple.length === 2) { - result += (" " + trim(lastTuple[1])); - } - this[key] = value = result; - } + function compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, + previousCompileContext) { + if (!($compileNodes instanceof jqLite)) { + // jquery always rewraps, whereas we need to preserve the original selector so that we can + // modify it. + $compileNodes = jqLite($compileNodes); + } - if (writeAttr !== false) { - if (value === null || isUndefined(value)) { - this.$$element.removeAttr(attrName); - } else { - if (SIMPLE_ATTR_NAME.test(attrName)) { - this.$$element.attr(attrName, value); - } else { - setSpecialAttr(this.$$element[0], attrName, value); - } - } - } + var NOT_EMPTY = /\S+/; - // fire observers - var $$observers = this.$$observers; - $$observers && forEach($$observers[observer], function(fn) { - try { - fn(value); - } catch (e) { - $exceptionHandler(e); - } - }); - }, + // We can not compile top level text elements since text nodes can be merged and we will + // not be able to attach scope data to them, so we will wrap them in + for (var i = 0, len = $compileNodes.length; i < len; i++) { + var domNode = $compileNodes[i]; + if (domNode.nodeType === NODE_TYPE_TEXT && domNode.nodeValue.match(NOT_EMPTY) /* non-empty */) { + jqLiteWrapNode(domNode, $compileNodes[i] = window.document.createElement('span')); + } + } - /** - * @ngdoc method - * @name $compile.directive.Attributes#$observe - * @kind function - * - * @description - * Observes an interpolated attribute. - * - * The observer function will be invoked once during the next `$digest` following - * compilation. The observer is then invoked whenever the interpolated value - * changes. - * - * @param {string} key Normalized key. (ie ngAttribute) . - * @param {function(interpolatedValue)} fn Function that will be called whenever - the interpolated value of the attribute changes. - * See the {@link guide/interpolation#how-text-and-attribute-bindings-work Interpolation - * guide} for more info. - * @returns {function()} Returns a deregistration function for this observer. - */ - $observe: function(key, fn) { - var attrs = this, - $$observers = (attrs.$$observers || (attrs.$$observers = createMap())), - listeners = ($$observers[key] || ($$observers[key] = [])); - - listeners.push(fn); - $rootScope.$evalAsync(function() { - if (!listeners.$$inter && attrs.hasOwnProperty(key) && !isUndefined(attrs[key])) { - // no one registered attribute interpolation function, so lets call it manually - fn(attrs[key]); - } - }); + var compositeLinkFn = + compileNodes($compileNodes, transcludeFn, $compileNodes, + maxPriority, ignoreDirective, previousCompileContext); + compile.$$addScopeClass($compileNodes); + var namespace = null; + return function publicLinkFn(scope, cloneConnectFn, options) { + assertArg(scope, 'scope'); + + if (previousCompileContext && previousCompileContext.needsNewScope) { + // A parent directive did a replace and a directive on this element asked + // for transclusion, which caused us to lose a layer of element on which + // we could hold the new transclusion scope, so we will create it manually + // here. + scope = scope.$parent.$new(); + } + + options = options || {}; + var parentBoundTranscludeFn = options.parentBoundTranscludeFn, + transcludeControllers = options.transcludeControllers, + futureParentElement = options.futureParentElement; + + // When `parentBoundTranscludeFn` is passed, it is a + // `controllersBoundTransclude` function (it was previously passed + // as `transclude` to directive.link) so we must unwrap it to get + // its `boundTranscludeFn` + if (parentBoundTranscludeFn && parentBoundTranscludeFn.$$boundTransclude) { + parentBoundTranscludeFn = parentBoundTranscludeFn.$$boundTransclude; + } + + if (!namespace) { + namespace = detectNamespaceForChildElements(futureParentElement); + } + var $linkNode; + if (namespace !== 'html') { + // When using a directive with replace:true and templateUrl the $compileNodes + // (or a child element inside of them) + // might change, so we need to recreate the namespace adapted compileNodes + // for call to the link function. + // Note: This will already clone the nodes... + $linkNode = jqLite( + wrapTemplate(namespace, jqLite('
').append($compileNodes).html()) + ); + } else if (cloneConnectFn) { + // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart + // and sometimes changes the structure of the DOM. + $linkNode = JQLitePrototype.clone.call($compileNodes); + } else { + $linkNode = $compileNodes; + } + + if (transcludeControllers) { + for (var controllerName in transcludeControllers) { + $linkNode.data('$' + controllerName + 'Controller', transcludeControllers[controllerName].instance); + } + } + + compile.$$addScopeInfo($linkNode, scope); + + if (cloneConnectFn) cloneConnectFn($linkNode, scope); + if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn); + return $linkNode; + }; + } - return function() { - arrayRemove(listeners, fn); - }; - } - }; + function detectNamespaceForChildElements(parentElement) { + // TODO: Make this detect MathML as well... + var node = parentElement && parentElement[0]; + if (!node) { + return 'html'; + } else { + return nodeName_(node) !== 'foreignobject' && toString.call(node).match(/SVG/) ? 'svg' : 'html'; + } + } - function setSpecialAttr(element, attrName, value) { - // Attributes names that do not start with letters (such as `(click)`) cannot be set using `setAttribute` - // so we have to jump through some hoops to get such an attribute - // https://github.com/angular/angular.js/pull/13318 - specialAttrHolder.innerHTML = ""; - var attributes = specialAttrHolder.firstChild.attributes; - var attribute = attributes[0]; - // We have to remove the attribute from its container element before we can add it to the destination element - attributes.removeNamedItem(attribute.name); - attribute.value = value; - element.attributes.setNamedItem(attribute); - } + /** + * Compile function matches each node in nodeList against the directives. Once all directives + * for a particular node are collected their compile functions are executed. The compile + * functions return values - the linking functions - are combined into a composite linking + * function, which is the a linking function for the node. + * + * @param {NodeList} nodeList an array of nodes or NodeList to compile + * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the + * scope argument is auto-generated to the new child of the transcluded parent scope. + * @param {DOMElement=} $rootElement If the nodeList is the root of the compilation tree then + * the rootElement must be set the jqLite collection of the compile root. This is + * needed so that the jqLite collection items can be replaced with widgets. + * @param {number=} maxPriority Max directive priority. + * @returns {Function} A composite linking function of all of the matched directives or null. + */ + function compileNodes(nodeList, transcludeFn, $rootElement, maxPriority, ignoreDirective, + previousCompileContext) { + var linkFns = [], + attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound, nodeLinkFnFound; + + for (var i = 0; i < nodeList.length; i++) { + attrs = new Attributes(); + + // we must always refer to nodeList[i] since the nodes can be replaced underneath us. + directives = collectDirectives(nodeList[i], [], attrs, i === 0 ? maxPriority : undefined, + ignoreDirective); + + nodeLinkFn = (directives.length) + ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement, + null, [], [], previousCompileContext) + : null; + + if (nodeLinkFn && nodeLinkFn.scope) { + compile.$$addScopeClass(attrs.$$element); + } + + childLinkFn = (nodeLinkFn && nodeLinkFn.terminal || + !(childNodes = nodeList[i].childNodes) || + !childNodes.length) + ? null + : compileNodes(childNodes, + nodeLinkFn ? ( + (nodeLinkFn.transcludeOnThisElement || !nodeLinkFn.templateOnThisElement) + && nodeLinkFn.transclude) : transcludeFn); + + if (nodeLinkFn || childLinkFn) { + linkFns.push(i, nodeLinkFn, childLinkFn); + linkFnFound = true; + nodeLinkFnFound = nodeLinkFnFound || nodeLinkFn; + } + + //use the previous context only for the first element in the virtual group + previousCompileContext = null; + } - function safeAddClass($element, className) { - try { - $element.addClass(className); - } catch (e) { - // ignore, since it means that we are trying to set class on - // SVG element, where class name is read-only. - } - } + // return a linking function if we have found anything, null otherwise + return linkFnFound ? compositeLinkFn : null; + + function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) { + var nodeLinkFn, childLinkFn, node, childScope, i, ii, idx, childBoundTranscludeFn; + var stableNodeList; + + + if (nodeLinkFnFound) { + // copy nodeList so that if a nodeLinkFn removes or adds an element at this DOM level our + // offsets don't get screwed up + var nodeListLength = nodeList.length; + stableNodeList = new Array(nodeListLength); + + // create a sparse array by only copying the elements which have a linkFn + for (i = 0; i < linkFns.length; i += 3) { + idx = linkFns[i]; + stableNodeList[idx] = nodeList[idx]; + } + } else { + stableNodeList = nodeList; + } + + for (i = 0, ii = linkFns.length; i < ii;) { + node = stableNodeList[linkFns[i++]]; + nodeLinkFn = linkFns[i++]; + childLinkFn = linkFns[i++]; + + if (nodeLinkFn) { + if (nodeLinkFn.scope) { + childScope = scope.$new(); + compile.$$addScopeInfo(jqLite(node), childScope); + } else { + childScope = scope; + } + + if (nodeLinkFn.transcludeOnThisElement) { + childBoundTranscludeFn = createBoundTranscludeFn( + scope, nodeLinkFn.transclude, parentBoundTranscludeFn); + + } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) { + childBoundTranscludeFn = parentBoundTranscludeFn; + + } else if (!parentBoundTranscludeFn && transcludeFn) { + childBoundTranscludeFn = createBoundTranscludeFn(scope, transcludeFn); + + } else { + childBoundTranscludeFn = null; + } + + nodeLinkFn(childLinkFn, childScope, node, $rootElement, childBoundTranscludeFn); + + } else if (childLinkFn) { + childLinkFn(scope, node.childNodes, undefined, parentBoundTranscludeFn); + } + } + } + } + function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn) { + function boundTranscludeFn(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) { - var startSymbol = $interpolate.startSymbol(), - endSymbol = $interpolate.endSymbol(), - denormalizeTemplate = (startSymbol == '{{' && endSymbol == '}}') - ? identity - : function denormalizeTemplate(template) { - return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol); - }, - NG_ATTR_BINDING = /^ngAttr[A-Z]/; - var MULTI_ELEMENT_DIR_RE = /^(.+)Start$/; + if (!transcludedScope) { + transcludedScope = scope.$new(false, containingScope); + transcludedScope.$$transcluded = true; + } - compile.$$addBindingInfo = debugInfoEnabled ? function $$addBindingInfo($element, binding) { - var bindings = $element.data('$binding') || []; + return transcludeFn(transcludedScope, cloneFn, { + parentBoundTranscludeFn: previousBoundTranscludeFn, + transcludeControllers: controllers, + futureParentElement: futureParentElement + }); + } - if (isArray(binding)) { - bindings = bindings.concat(binding); - } else { - bindings.push(binding); - } + // We need to attach the transclusion slots onto the `boundTranscludeFn` + // so that they are available inside the `controllersBoundTransclude` function + var boundSlots = boundTranscludeFn.$$slots = createMap(); + for (var slotName in transcludeFn.$$slots) { + if (transcludeFn.$$slots[slotName]) { + boundSlots[slotName] = createBoundTranscludeFn(scope, transcludeFn.$$slots[slotName], previousBoundTranscludeFn); + } else { + boundSlots[slotName] = null; + } + } - $element.data('$binding', bindings); - } : noop; + return boundTranscludeFn; + } - compile.$$addBindingClass = debugInfoEnabled ? function $$addBindingClass($element) { - safeAddClass($element, 'ng-binding'); - } : noop; + /** + * Looks for directives on the given node and adds them to the directive collection which is + * sorted. + * + * @param node Node to search. + * @param directives An array to which the directives are added to. This array is sorted before + * the function returns. + * @param attrs The shared attrs object which is used to populate the normalized attributes. + * @param {number=} maxPriority Max directive priority. + */ + function collectDirectives(node, directives, attrs, maxPriority, ignoreDirective) { + var nodeType = node.nodeType, + attrsMap = attrs.$attr, + match, + className; + + switch (nodeType) { + case NODE_TYPE_ELEMENT: /* Element */ + // use the node name: + addDirective(directives, + directiveNormalize(nodeName_(node)), 'E', maxPriority, ignoreDirective); + + // iterate over the attributes + for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes, + j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) { + var attrStartName = false; + var attrEndName = false; + + attr = nAttrs[j]; + name = attr.name; + value = trim(attr.value); + + // support ngAttr attribute binding + ngAttrName = directiveNormalize(name); + if (isNgAttr = NG_ATTR_BINDING.test(ngAttrName)) { + name = name.replace(PREFIX_REGEXP, '') + .substr(8).replace(/_(.)/g, function (match, letter) { + return letter.toUpperCase(); + }); + } + + var multiElementMatch = ngAttrName.match(MULTI_ELEMENT_DIR_RE); + if (multiElementMatch && directiveIsMultiElement(multiElementMatch[1])) { + attrStartName = name; + attrEndName = name.substr(0, name.length - 5) + 'end'; + name = name.substr(0, name.length - 6); + } + + nName = directiveNormalize(name.toLowerCase()); + attrsMap[nName] = name; + if (isNgAttr || !attrs.hasOwnProperty(nName)) { + attrs[nName] = value; + if (getBooleanAttrName(node, nName)) { + attrs[nName] = true; // presence means true + } + } + addAttrInterpolateDirective(node, directives, value, nName, isNgAttr); + addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName, + attrEndName); + } + + // use class as directive + className = node.className; + if (isObject(className)) { + // Maybe SVGAnimatedString + className = className.animVal; + } + if (isString(className) && className !== '') { + while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) { + nName = directiveNormalize(match[2]); + if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) { + attrs[nName] = trim(match[3]); + } + className = className.substr(match.index + match[0].length); + } + } + break; + case NODE_TYPE_TEXT: /* Text Node */ + if (msie === 11) { + // Workaround for #11781 + while (node.parentNode && node.nextSibling && node.nextSibling.nodeType === NODE_TYPE_TEXT) { + node.nodeValue = node.nodeValue + node.nextSibling.nodeValue; + node.parentNode.removeChild(node.nextSibling); + } + } + addTextInterpolateDirective(directives, node.nodeValue); + break; + case NODE_TYPE_COMMENT: /* Comment */ + try { + match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue); + if (match) { + nName = directiveNormalize(match[1]); + if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) { + attrs[nName] = trim(match[2]); + } + } + } catch (e) { + // turns out that under some circumstances IE9 throws errors when one attempts to read + // comment's node value. + // Just ignore it and continue. (Can't seem to reproduce in test case.) + } + break; + } - compile.$$addScopeInfo = debugInfoEnabled ? function $$addScopeInfo($element, scope, isolated, noTemplate) { - var dataName = isolated ? (noTemplate ? '$isolateScopeNoTemplate' : '$isolateScope') : '$scope'; - $element.data(dataName, scope); - } : noop; + directives.sort(byPriority); + return directives; + } - compile.$$addScopeClass = debugInfoEnabled ? function $$addScopeClass($element, isolated) { - safeAddClass($element, isolated ? 'ng-isolate-scope' : 'ng-scope'); - } : noop; + /** + * Given a node with an directive-start it collects all of the siblings until it finds + * directive-end. + * @param node + * @param attrStart + * @param attrEnd + * @returns {*} + */ + function groupScan(node, attrStart, attrEnd) { + var nodes = []; + var depth = 0; + if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) { + do { + if (!node) { + throw $compileMinErr('uterdir', + "Unterminated attribute, found '{0}' but no matching '{1}' found.", + attrStart, attrEnd); + } + if (node.nodeType == NODE_TYPE_ELEMENT) { + if (node.hasAttribute(attrStart)) depth++; + if (node.hasAttribute(attrEnd)) depth--; + } + nodes.push(node); + node = node.nextSibling; + } while (depth > 0); + } else { + nodes.push(node); + } - compile.$$createComment = function(directiveName, comment) { - var content = ''; - if (debugInfoEnabled) { - content = ' ' + (directiveName || '') + ': ' + (comment || '') + ' '; - } - return window.document.createComment(content); - }; + return jqLite(nodes); + } - return compile; + /** + * Wrapper for linking function which converts normal linking function into a grouped + * linking function. + * @param linkFn + * @param attrStart + * @param attrEnd + * @returns {Function} + */ + function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) { + return function groupedElementsLink(scope, element, attrs, controllers, transcludeFn) { + element = groupScan(element[0], attrStart, attrEnd); + return linkFn(scope, element, attrs, controllers, transcludeFn); + }; + } - //================================ + /** + * A function generator that is used to support both eager and lazy compilation + * linking function. + * @param eager + * @param $compileNodes + * @param transcludeFn + * @param maxPriority + * @param ignoreDirective + * @param previousCompileContext + * @returns {Function} + */ + function compilationGenerator(eager, $compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext) { + var compiled; + + if (eager) { + return compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext); + } + return function lazyCompilation() { + if (!compiled) { + compiled = compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext); + + // Null out all of these references in order to make them eligible for garbage collection + // since this is a potentially long lived closure + $compileNodes = transcludeFn = previousCompileContext = null; + } + return compiled.apply(this, arguments); + }; + } - function compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, - previousCompileContext) { - if (!($compileNodes instanceof jqLite)) { - // jquery always rewraps, whereas we need to preserve the original selector so that we can - // modify it. - $compileNodes = jqLite($compileNodes); - } + /** + * Once the directives have been collected, their compile functions are executed. This method + * is responsible for inlining directive templates as well as terminating the application + * of the directives if the terminal directive has been reached. + * + * @param {Array} directives Array of collected directives to execute their compile function. + * this needs to be pre-sorted by priority order. + * @param {Node} compileNode The raw DOM node to apply the compile functions to + * @param {Object} templateAttrs The shared attribute function + * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the + * scope argument is auto-generated to the new + * child of the transcluded parent scope. + * @param {JQLite} jqCollection If we are working on the root of the compile tree then this + * argument has the root jqLite array so that we can replace nodes + * on it. + * @param {Object=} originalReplaceDirective An optional directive that will be ignored when + * compiling the transclusion. + * @param {Array.} preLinkFns + * @param {Array.} postLinkFns + * @param {Object} previousCompileContext Context used for previous compilation of the current + * node + * @returns {Function} linkFn + */ + function applyDirectivesToNode(directives, compileNode, templateAttrs, transcludeFn, + jqCollection, originalReplaceDirective, preLinkFns, postLinkFns, + previousCompileContext) { + previousCompileContext = previousCompileContext || {}; + + var terminalPriority = -Number.MAX_VALUE, + newScopeDirective = previousCompileContext.newScopeDirective, + controllerDirectives = previousCompileContext.controllerDirectives, + newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective, + templateDirective = previousCompileContext.templateDirective, + nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective, + hasTranscludeDirective = false, + hasTemplate = false, + hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective, + $compileNode = templateAttrs.$$element = jqLite(compileNode), + directive, + directiveName, + $template, + replaceDirective = originalReplaceDirective, + childTranscludeFn = transcludeFn, + linkFn, + didScanForMultipleTransclusion = false, + mightHaveMultipleTransclusionError = false, + directiveValue; + + // executes all directives on the current element + for (var i = 0, ii = directives.length; i < ii; i++) { + directive = directives[i]; + var attrStart = directive.$$start; + var attrEnd = directive.$$end; + + // collect multiblock sections + if (attrStart) { + $compileNode = groupScan(compileNode, attrStart, attrEnd); + } + $template = undefined; + + if (terminalPriority > directive.priority) { + break; // prevent further processing of directives + } + + if (directiveValue = directive.scope) { + + // skip the check for directives with async templates, we'll check the derived sync + // directive when the template arrives + if (!directive.templateUrl) { + if (isObject(directiveValue)) { + // This directive is trying to add an isolated scope. + // Check that there is no scope of any kind already + assertNoDuplicate('new/isolated scope', newIsolateScopeDirective || newScopeDirective, + directive, $compileNode); + newIsolateScopeDirective = directive; + } else { + // This directive is trying to add a child scope. + // Check that there is no isolated scope already + assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive, + $compileNode); + } + } + + newScopeDirective = newScopeDirective || directive; + } + + directiveName = directive.name; + + // If we encounter a condition that can result in transclusion on the directive, + // then scan ahead in the remaining directives for others that may cause a multiple + // transclusion error to be thrown during the compilation process. If a matching directive + // is found, then we know that when we encounter a transcluded directive, we need to eagerly + // compile the `transclude` function rather than doing it lazily in order to throw + // exceptions at the correct time + if (!didScanForMultipleTransclusion && ((directive.replace && (directive.templateUrl || directive.template)) + || (directive.transclude && !directive.$$tlb))) { + var candidateDirective; + + for (var scanningIndex = i + 1; candidateDirective = directives[scanningIndex++];) { + if ((candidateDirective.transclude && !candidateDirective.$$tlb) + || (candidateDirective.replace && (candidateDirective.templateUrl || candidateDirective.template))) { + mightHaveMultipleTransclusionError = true; + break; + } + } + + didScanForMultipleTransclusion = true; + } + + if (!directive.templateUrl && directive.controller) { + directiveValue = directive.controller; + controllerDirectives = controllerDirectives || createMap(); + assertNoDuplicate("'" + directiveName + "' controller", + controllerDirectives[directiveName], directive, $compileNode); + controllerDirectives[directiveName] = directive; + } + + if (directiveValue = directive.transclude) { + hasTranscludeDirective = true; + + // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion. + // This option should only be used by directives that know how to safely handle element transclusion, + // where the transcluded nodes are added or replaced after linking. + if (!directive.$$tlb) { + assertNoDuplicate('transclusion', nonTlbTranscludeDirective, directive, $compileNode); + nonTlbTranscludeDirective = directive; + } + + if (directiveValue == 'element') { + hasElementTranscludeDirective = true; + terminalPriority = directive.priority; + $template = $compileNode; + $compileNode = templateAttrs.$$element = + jqLite(compile.$$createComment(directiveName, templateAttrs[directiveName])); + compileNode = $compileNode[0]; + replaceWith(jqCollection, sliceArgs($template), compileNode); + + // Support: Chrome < 50 + // https://github.com/angular/angular.js/issues/14041 + + // In the versions of V8 prior to Chrome 50, the document fragment that is created + // in the `replaceWith` function is improperly garbage collected despite still + // being referenced by the `parentNode` property of all of the child nodes. By adding + // a reference to the fragment via a different property, we can avoid that incorrect + // behavior. + // TODO: remove this line after Chrome 50 has been released + $template[0].$$parentNode = $template[0].parentNode; + + childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, terminalPriority, + replaceDirective && replaceDirective.name, { + // Don't pass in: + // - controllerDirectives - otherwise we'll create duplicates controllers + // - newIsolateScopeDirective or templateDirective - combining templates with + // element transclusion doesn't make sense. + // + // We need only nonTlbTranscludeDirective so that we prevent putting transclusion + // on the same element more than once. + nonTlbTranscludeDirective: nonTlbTranscludeDirective + }); + } else { + + var slots = createMap(); + + $template = jqLite(jqLiteClone(compileNode)).contents(); + + if (isObject(directiveValue)) { + + // We have transclusion slots, + // collect them up, compile them and store their transclusion functions + $template = []; + + var slotMap = createMap(); + var filledSlots = createMap(); + + // Parse the element selectors + forEach(directiveValue, function (elementSelector, slotName) { + // If an element selector starts with a ? then it is optional + var optional = (elementSelector.charAt(0) === '?'); + elementSelector = optional ? elementSelector.substring(1) : elementSelector; + + slotMap[elementSelector] = slotName; + + // We explicitly assign `null` since this implies that a slot was defined but not filled. + // Later when calling boundTransclusion functions with a slot name we only error if the + // slot is `undefined` + slots[slotName] = null; + + // filledSlots contains `true` for all slots that are either optional or have been + // filled. This is used to check that we have not missed any required slots + filledSlots[slotName] = optional; + }); + + // Add the matching elements into their slot + forEach($compileNode.contents(), function (node) { + var slotName = slotMap[directiveNormalize(nodeName_(node))]; + if (slotName) { + filledSlots[slotName] = true; + slots[slotName] = slots[slotName] || []; + slots[slotName].push(node); + } else { + $template.push(node); + } + }); + + // Check for required slots that were not filled + forEach(filledSlots, function (filled, slotName) { + if (!filled) { + throw $compileMinErr('reqslot', 'Required transclusion slot `{0}` was not filled.', slotName); + } + }); + + for (var slotName in slots) { + if (slots[slotName]) { + // Only define a transclusion function if the slot was filled + slots[slotName] = compilationGenerator(mightHaveMultipleTransclusionError, slots[slotName], transcludeFn); + } + } + } + + $compileNode.empty(); // clear contents + childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, undefined, + undefined, {needsNewScope: directive.$$isolateScope || directive.$$newScope}); + childTranscludeFn.$$slots = slots; + } + } + + if (directive.template) { + hasTemplate = true; + assertNoDuplicate('template', templateDirective, directive, $compileNode); + templateDirective = directive; + + directiveValue = (isFunction(directive.template)) + ? directive.template($compileNode, templateAttrs) + : directive.template; + + directiveValue = denormalizeTemplate(directiveValue); + + if (directive.replace) { + replaceDirective = directive; + if (jqLiteIsTextNode(directiveValue)) { + $template = []; + } else { + $template = removeComments(wrapTemplate(directive.templateNamespace, trim(directiveValue))); + } + compileNode = $template[0]; + + if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) { + throw $compileMinErr('tplrt', + "Template for directive '{0}' must have exactly one root element. {1}", + directiveName, ''); + } + + replaceWith(jqCollection, $compileNode, compileNode); + + var newTemplateAttrs = {$attr: {}}; + + // combine directives from the original node and from the template: + // - take the array of directives for this element + // - split it into two parts, those that already applied (processed) and those that weren't (unprocessed) + // - collect directives from the template and sort them by priority + // - combine directives as: processed + template + unprocessed + var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs); + var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1)); + + if (newIsolateScopeDirective || newScopeDirective) { + // The original directive caused the current element to be replaced but this element + // also needs to have a new scope, so we need to tell the template directives + // that they would need to get their scope from further up, if they require transclusion + markDirectiveScope(templateDirectives, newIsolateScopeDirective, newScopeDirective); + } + directives = directives.concat(templateDirectives).concat(unprocessedDirectives); + mergeTemplateAttributes(templateAttrs, newTemplateAttrs); + + ii = directives.length; + } else { + $compileNode.html(directiveValue); + } + } + + if (directive.templateUrl) { + hasTemplate = true; + assertNoDuplicate('template', templateDirective, directive, $compileNode); + templateDirective = directive; + + if (directive.replace) { + replaceDirective = directive; + } + + /* jshint -W021 */ + nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode, + /* jshint +W021 */ + templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, { + controllerDirectives: controllerDirectives, + newScopeDirective: (newScopeDirective !== directive) && newScopeDirective, + newIsolateScopeDirective: newIsolateScopeDirective, + templateDirective: templateDirective, + nonTlbTranscludeDirective: nonTlbTranscludeDirective + }); + ii = directives.length; + } else if (directive.compile) { + try { + linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn); + if (isFunction(linkFn)) { + addLinkFns(null, linkFn, attrStart, attrEnd); + } else if (linkFn) { + addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd); + } + } catch (e) { + $exceptionHandler(e, startingTag($compileNode)); + } + } + + if (directive.terminal) { + nodeLinkFn.terminal = true; + terminalPriority = Math.max(terminalPriority, directive.priority); + } - var NOT_EMPTY = /\S+/; + } - // We can not compile top level text elements since text nodes can be merged and we will - // not be able to attach scope data to them, so we will wrap them in - for (var i = 0, len = $compileNodes.length; i < len; i++) { - var domNode = $compileNodes[i]; + nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true; + nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective; + nodeLinkFn.templateOnThisElement = hasTemplate; + nodeLinkFn.transclude = childTranscludeFn; + + previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective; + + // might be normal or delayed nodeLinkFn depending on if templateUrl is present + return nodeLinkFn; + + //////////////////// + + function addLinkFns(pre, post, attrStart, attrEnd) { + if (pre) { + if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd); + pre.require = directive.require; + pre.directiveName = directiveName; + if (newIsolateScopeDirective === directive || directive.$$isolateScope) { + pre = cloneAndAnnotateFn(pre, {isolateScope: true}); + } + preLinkFns.push(pre); + } + if (post) { + if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd); + post.require = directive.require; + post.directiveName = directiveName; + if (newIsolateScopeDirective === directive || directive.$$isolateScope) { + post = cloneAndAnnotateFn(post, {isolateScope: true}); + } + postLinkFns.push(post); + } + } - if (domNode.nodeType === NODE_TYPE_TEXT && domNode.nodeValue.match(NOT_EMPTY) /* non-empty */) { - jqLiteWrapNode(domNode, $compileNodes[i] = window.document.createElement('span')); - } - } + function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) { + var i, ii, linkFn, isolateScope, controllerScope, elementControllers, transcludeFn, $element, + attrs, scopeBindingInfo; + + if (compileNode === linkNode) { + attrs = templateAttrs; + $element = templateAttrs.$$element; + } else { + $element = jqLite(linkNode); + attrs = new Attributes($element, templateAttrs); + } + + controllerScope = scope; + if (newIsolateScopeDirective) { + isolateScope = scope.$new(true); + } else if (newScopeDirective) { + controllerScope = scope.$parent; + } + + if (boundTranscludeFn) { + // track `boundTranscludeFn` so it can be unwrapped if `transcludeFn` + // is later passed as `parentBoundTranscludeFn` to `publicLinkFn` + transcludeFn = controllersBoundTransclude; + transcludeFn.$$boundTransclude = boundTranscludeFn; + // expose the slots on the `$transclude` function + transcludeFn.isSlotFilled = function (slotName) { + return !!boundTranscludeFn.$$slots[slotName]; + }; + } + + if (controllerDirectives) { + elementControllers = setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective); + } + + if (newIsolateScopeDirective) { + // Initialize isolate scope bindings for new isolate scope directive. + compile.$$addScopeInfo($element, isolateScope, true, !(templateDirective && (templateDirective === newIsolateScopeDirective || + templateDirective === newIsolateScopeDirective.$$originalDirective))); + compile.$$addScopeClass($element, true); + isolateScope.$$isolateBindings = + newIsolateScopeDirective.$$isolateBindings; + scopeBindingInfo = initializeDirectiveBindings(scope, attrs, isolateScope, + isolateScope.$$isolateBindings, + newIsolateScopeDirective); + if (scopeBindingInfo.removeWatches) { + isolateScope.$on('$destroy', scopeBindingInfo.removeWatches); + } + } + + // Initialize bindToController bindings + for (var name in elementControllers) { + var controllerDirective = controllerDirectives[name]; + var controller = elementControllers[name]; + var bindings = controllerDirective.$$bindings.bindToController; + + if (controller.identifier && bindings) { + controller.bindingInfo = + initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective); + } else { + controller.bindingInfo = {}; + } + + var controllerResult = controller(); + if (controllerResult !== controller.instance) { + // If the controller constructor has a return value, overwrite the instance + // from setupControllers + controller.instance = controllerResult; + $element.data('$' + controllerDirective.name + 'Controller', controllerResult); + controller.bindingInfo.removeWatches && controller.bindingInfo.removeWatches(); + controller.bindingInfo = + initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective); + } + } + + // Bind the required controllers to the controller, if `require` is an object and `bindToController` is truthy + forEach(controllerDirectives, function (controllerDirective, name) { + var require = controllerDirective.require; + if (controllerDirective.bindToController && !isArray(require) && isObject(require)) { + extend(elementControllers[name].instance, getControllers(name, require, $element, elementControllers)); + } + }); - var compositeLinkFn = - compileNodes($compileNodes, transcludeFn, $compileNodes, - maxPriority, ignoreDirective, previousCompileContext); - compile.$$addScopeClass($compileNodes); - var namespace = null; - return function publicLinkFn(scope, cloneConnectFn, options) { - assertArg(scope, 'scope'); - - if (previousCompileContext && previousCompileContext.needsNewScope) { - // A parent directive did a replace and a directive on this element asked - // for transclusion, which caused us to lose a layer of element on which - // we could hold the new transclusion scope, so we will create it manually - // here. - scope = scope.$parent.$new(); - } + // Handle the init and destroy lifecycle hooks on all controllers that have them + forEach(elementControllers, function (controller) { + var controllerInstance = controller.instance; + if (isFunction(controllerInstance.$onChanges)) { + controllerInstance.$onChanges(controller.bindingInfo.initialChanges); + } + if (isFunction(controllerInstance.$onInit)) { + controllerInstance.$onInit(); + } + if (isFunction(controllerInstance.$onDestroy)) { + controllerScope.$on('$destroy', function callOnDestroyHook() { + controllerInstance.$onDestroy(); + }); + } + }); - options = options || {}; - var parentBoundTranscludeFn = options.parentBoundTranscludeFn, - transcludeControllers = options.transcludeControllers, - futureParentElement = options.futureParentElement; - - // When `parentBoundTranscludeFn` is passed, it is a - // `controllersBoundTransclude` function (it was previously passed - // as `transclude` to directive.link) so we must unwrap it to get - // its `boundTranscludeFn` - if (parentBoundTranscludeFn && parentBoundTranscludeFn.$$boundTransclude) { - parentBoundTranscludeFn = parentBoundTranscludeFn.$$boundTransclude; - } + // PRELINKING + for (i = 0, ii = preLinkFns.length; i < ii; i++) { + linkFn = preLinkFns[i]; + invokeLinkFn(linkFn, + linkFn.isolateScope ? isolateScope : scope, + $element, + attrs, + linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers), + transcludeFn + ); + } + + // RECURSION + // We only pass the isolate scope, if the isolate directive has a template, + // otherwise the child elements do not belong to the isolate directive. + var scopeToChild = scope; + if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) { + scopeToChild = isolateScope; + } + childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn); + + // POSTLINKING + for (i = postLinkFns.length - 1; i >= 0; i--) { + linkFn = postLinkFns[i]; + invokeLinkFn(linkFn, + linkFn.isolateScope ? isolateScope : scope, + $element, + attrs, + linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers), + transcludeFn + ); + } + + // Trigger $postLink lifecycle hooks + forEach(elementControllers, function (controller) { + var controllerInstance = controller.instance; + if (isFunction(controllerInstance.$postLink)) { + controllerInstance.$postLink(); + } + }); - if (!namespace) { - namespace = detectNamespaceForChildElements(futureParentElement); - } - var $linkNode; - if (namespace !== 'html') { - // When using a directive with replace:true and templateUrl the $compileNodes - // (or a child element inside of them) - // might change, so we need to recreate the namespace adapted compileNodes - // for call to the link function. - // Note: This will already clone the nodes... - $linkNode = jqLite( - wrapTemplate(namespace, jqLite('
').append($compileNodes).html()) - ); - } else if (cloneConnectFn) { - // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart - // and sometimes changes the structure of the DOM. - $linkNode = JQLitePrototype.clone.call($compileNodes); - } else { - $linkNode = $compileNodes; - } + // This is the function that is injected as `$transclude`. + // Note: all arguments are optional! + function controllersBoundTransclude(scope, cloneAttachFn, futureParentElement, slotName) { + var transcludeControllers; + // No scope passed in: + if (!isScope(scope)) { + slotName = futureParentElement; + futureParentElement = cloneAttachFn; + cloneAttachFn = scope; + scope = undefined; + } + + if (hasElementTranscludeDirective) { + transcludeControllers = elementControllers; + } + if (!futureParentElement) { + futureParentElement = hasElementTranscludeDirective ? $element.parent() : $element; + } + if (slotName) { + // slotTranscludeFn can be one of three things: + // * a transclude function - a filled slot + // * `null` - an optional slot that was not filled + // * `undefined` - a slot that was not declared (i.e. invalid) + var slotTranscludeFn = boundTranscludeFn.$$slots[slotName]; + if (slotTranscludeFn) { + return slotTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild); + } else if (isUndefined(slotTranscludeFn)) { + throw $compileMinErr('noslot', + 'No parent directive that requires a transclusion with slot name "{0}". ' + + 'Element: {1}', + slotName, startingTag($element)); + } + } else { + return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild); + } + } + } + } - if (transcludeControllers) { - for (var controllerName in transcludeControllers) { - $linkNode.data('$' + controllerName + 'Controller', transcludeControllers[controllerName].instance); - } - } - - compile.$$addScopeInfo($linkNode, scope); - - if (cloneConnectFn) cloneConnectFn($linkNode, scope); - if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn); - return $linkNode; - }; - } - - function detectNamespaceForChildElements(parentElement) { - // TODO: Make this detect MathML as well... - var node = parentElement && parentElement[0]; - if (!node) { - return 'html'; - } else { - return nodeName_(node) !== 'foreignobject' && toString.call(node).match(/SVG/) ? 'svg' : 'html'; - } - } + function getControllers(directiveName, require, $element, elementControllers) { + var value; + + if (isString(require)) { + var match = require.match(REQUIRE_PREFIX_REGEXP); + var name = require.substring(match[0].length); + var inheritType = match[1] || match[3]; + var optional = match[2] === '?'; + + //If only parents then start at the parent element + if (inheritType === '^^') { + $element = $element.parent(); + //Otherwise attempt getting the controller from elementControllers in case + //the element is transcluded (and has no data) and to avoid .data if possible + } else { + value = elementControllers && elementControllers[name]; + value = value && value.instance; + } + + if (!value) { + var dataName = '$' + name + 'Controller'; + value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName); + } + + if (!value && !optional) { + throw $compileMinErr('ctreq', + "Controller '{0}', required by directive '{1}', can't be found!", + name, directiveName); + } + } else if (isArray(require)) { + value = []; + for (var i = 0, ii = require.length; i < ii; i++) { + value[i] = getControllers(directiveName, require[i], $element, elementControllers); + } + } else if (isObject(require)) { + value = {}; + forEach(require, function (controller, property) { + value[property] = getControllers(directiveName, controller, $element, elementControllers); + }); + } - /** - * Compile function matches each node in nodeList against the directives. Once all directives - * for a particular node are collected their compile functions are executed. The compile - * functions return values - the linking functions - are combined into a composite linking - * function, which is the a linking function for the node. - * - * @param {NodeList} nodeList an array of nodes or NodeList to compile - * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the - * scope argument is auto-generated to the new child of the transcluded parent scope. - * @param {DOMElement=} $rootElement If the nodeList is the root of the compilation tree then - * the rootElement must be set the jqLite collection of the compile root. This is - * needed so that the jqLite collection items can be replaced with widgets. - * @param {number=} maxPriority Max directive priority. - * @returns {Function} A composite linking function of all of the matched directives or null. - */ - function compileNodes(nodeList, transcludeFn, $rootElement, maxPriority, ignoreDirective, - previousCompileContext) { - var linkFns = [], - attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound, nodeLinkFnFound; + return value || null; + } - for (var i = 0; i < nodeList.length; i++) { - attrs = new Attributes(); + function setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective) { + var elementControllers = createMap(); + for (var controllerKey in controllerDirectives) { + var directive = controllerDirectives[controllerKey]; + var locals = { + $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope, + $element: $element, + $attrs: attrs, + $transclude: transcludeFn + }; + + var controller = directive.controller; + if (controller == '@') { + controller = attrs[directive.name]; + } + + var controllerInstance = $controller(controller, locals, true, directive.controllerAs); + + // For directives with element transclusion the element is a comment. + // In this case .data will not attach any data. + // Instead, we save the controllers for the element in a local hash and attach to .data + // later, once we have the actual element. + elementControllers[directive.name] = controllerInstance; + $element.data('$' + directive.name + 'Controller', controllerInstance.instance); + } + return elementControllers; + } - // we must always refer to nodeList[i] since the nodes can be replaced underneath us. - directives = collectDirectives(nodeList[i], [], attrs, i === 0 ? maxPriority : undefined, - ignoreDirective); + // Depending upon the context in which a directive finds itself it might need to have a new isolated + // or child scope created. For instance: + // * if the directive has been pulled into a template because another directive with a higher priority + // asked for element transclusion + // * if the directive itself asks for transclusion but it is at the root of a template and the original + // element was replaced. See https://github.com/angular/angular.js/issues/12936 + function markDirectiveScope(directives, isolateScope, newScope) { + for (var j = 0, jj = directives.length; j < jj; j++) { + directives[j] = inherit(directives[j], {$$isolateScope: isolateScope, $$newScope: newScope}); + } + } - nodeLinkFn = (directives.length) - ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement, - null, [], [], previousCompileContext) - : null; + /** + * looks up the directive and decorates it with exception handling and proper parameters. We + * call this the boundDirective. + * + * @param {string} name name of the directive to look up. + * @param {string} location The directive must be found in specific format. + * String containing any of theses characters: + * + * * `E`: element name + * * `A': attribute + * * `C`: class + * * `M`: comment + * @returns {boolean} true if directive was added. + */ + function addDirective(tDirectives, name, location, maxPriority, ignoreDirective, startAttrName, + endAttrName) { + if (name === ignoreDirective) return null; + var match = null; + if (hasDirectives.hasOwnProperty(name)) { + for (var directive, directives = $injector.get(name + Suffix), + i = 0, ii = directives.length; i < ii; i++) { + try { + directive = directives[i]; + if ((isUndefined(maxPriority) || maxPriority > directive.priority) && + directive.restrict.indexOf(location) != -1) { + if (startAttrName) { + directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName}); + } + if (!directive.$$bindings) { + var bindings = directive.$$bindings = + parseDirectiveBindings(directive, directive.name); + if (isObject(bindings.isolateScope)) { + directive.$$isolateBindings = bindings.isolateScope; + } + } + tDirectives.push(directive); + match = directive; + } + } catch (e) { + $exceptionHandler(e); + } + } + } + return match; + } - if (nodeLinkFn && nodeLinkFn.scope) { - compile.$$addScopeClass(attrs.$$element); - } - childLinkFn = (nodeLinkFn && nodeLinkFn.terminal || - !(childNodes = nodeList[i].childNodes) || - !childNodes.length) - ? null - : compileNodes(childNodes, - nodeLinkFn ? ( - (nodeLinkFn.transcludeOnThisElement || !nodeLinkFn.templateOnThisElement) - && nodeLinkFn.transclude) : transcludeFn); - - if (nodeLinkFn || childLinkFn) { - linkFns.push(i, nodeLinkFn, childLinkFn); - linkFnFound = true; - nodeLinkFnFound = nodeLinkFnFound || nodeLinkFn; - } + /** + * looks up the directive and returns true if it is a multi-element directive, + * and therefore requires DOM nodes between -start and -end markers to be grouped + * together. + * + * @param {string} name name of the directive to look up. + * @returns true if directive was registered as multi-element. + */ + function directiveIsMultiElement(name) { + if (hasDirectives.hasOwnProperty(name)) { + for (var directive, directives = $injector.get(name + Suffix), + i = 0, ii = directives.length; i < ii; i++) { + directive = directives[i]; + if (directive.multiElement) { + return true; + } + } + } + return false; + } - //use the previous context only for the first element in the virtual group - previousCompileContext = null; - } + /** + * When the element is replaced with HTML template then the new attributes + * on the template need to be merged with the existing attributes in the DOM. + * The desired effect is to have both of the attributes present. + * + * @param {object} dst destination attributes (original DOM) + * @param {object} src source attributes (from the directive template) + */ + function mergeTemplateAttributes(dst, src) { + var srcAttr = src.$attr, + dstAttr = dst.$attr, + $element = dst.$$element; + + // reapply the old attributes to the new element + forEach(dst, function (value, key) { + if (key.charAt(0) != '$') { + if (src[key] && src[key] !== value) { + value += (key === 'style' ? ';' : ' ') + src[key]; + } + dst.$set(key, value, true, srcAttr[key]); + } + }); + + // copy the new attributes on the old attrs object + forEach(src, function (value, key) { + if (key == 'class') { + safeAddClass($element, value); + dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value; + } else if (key == 'style') { + $element.attr('style', $element.attr('style') + ';' + value); + dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value; + // `dst` will never contain hasOwnProperty as DOM parser won't let it. + // You will get an "InvalidCharacterError: DOM Exception 5" error if you + // have an attribute like "has-own-property" or "data-has-own-property", etc. + } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) { + dst[key] = value; + dstAttr[key] = srcAttr[key]; + } + }); + } - // return a linking function if we have found anything, null otherwise - return linkFnFound ? compositeLinkFn : null; - function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) { - var nodeLinkFn, childLinkFn, node, childScope, i, ii, idx, childBoundTranscludeFn; - var stableNodeList; + function compileTemplateUrl(directives, $compileNode, tAttrs, + $rootElement, childTranscludeFn, preLinkFns, postLinkFns, previousCompileContext) { + var linkQueue = [], + afterTemplateNodeLinkFn, + afterTemplateChildLinkFn, + beforeTemplateCompileNode = $compileNode[0], + origAsyncDirective = directives.shift(), + derivedSyncDirective = inherit(origAsyncDirective, { + templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective + }), + templateUrl = (isFunction(origAsyncDirective.templateUrl)) + ? origAsyncDirective.templateUrl($compileNode, tAttrs) + : origAsyncDirective.templateUrl, + templateNamespace = origAsyncDirective.templateNamespace; + + $compileNode.empty(); + + $templateRequest(templateUrl) + .then(function (content) { + var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn; + + content = denormalizeTemplate(content); + + if (origAsyncDirective.replace) { + if (jqLiteIsTextNode(content)) { + $template = []; + } else { + $template = removeComments(wrapTemplate(templateNamespace, trim(content))); + } + compileNode = $template[0]; + + if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) { + throw $compileMinErr('tplrt', + "Template for directive '{0}' must have exactly one root element. {1}", + origAsyncDirective.name, templateUrl); + } + + tempTemplateAttrs = {$attr: {}}; + replaceWith($rootElement, $compileNode, compileNode); + var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs); + + if (isObject(origAsyncDirective.scope)) { + // the original directive that caused the template to be loaded async required + // an isolate scope + markDirectiveScope(templateDirectives, true); + } + directives = templateDirectives.concat(directives); + mergeTemplateAttributes(tAttrs, tempTemplateAttrs); + } else { + compileNode = beforeTemplateCompileNode; + $compileNode.html(content); + } + + directives.unshift(derivedSyncDirective); + + afterTemplateNodeLinkFn = applyDirectivesToNode(directives, compileNode, tAttrs, + childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns, + previousCompileContext); + forEach($rootElement, function (node, i) { + if (node == compileNode) { + $rootElement[i] = $compileNode[0]; + } + }); + afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn); + + while (linkQueue.length) { + var scope = linkQueue.shift(), + beforeTemplateLinkNode = linkQueue.shift(), + linkRootElement = linkQueue.shift(), + boundTranscludeFn = linkQueue.shift(), + linkNode = $compileNode[0]; + + if (scope.$$destroyed) continue; + + if (beforeTemplateLinkNode !== beforeTemplateCompileNode) { + var oldClasses = beforeTemplateLinkNode.className; + + if (!(previousCompileContext.hasElementTranscludeDirective && + origAsyncDirective.replace)) { + // it was cloned therefore we have to clone as well. + linkNode = jqLiteClone(compileNode); + } + replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode); + + // Copy in CSS classes from original node + safeAddClass(jqLite(linkNode), oldClasses); + } + if (afterTemplateNodeLinkFn.transcludeOnThisElement) { + childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn); + } else { + childBoundTranscludeFn = boundTranscludeFn; + } + afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement, + childBoundTranscludeFn); + } + linkQueue = null; + }); + return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) { + var childBoundTranscludeFn = boundTranscludeFn; + if (scope.$$destroyed) return; + if (linkQueue) { + linkQueue.push(scope, + node, + rootElement, + childBoundTranscludeFn); + } else { + if (afterTemplateNodeLinkFn.transcludeOnThisElement) { + childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn); + } + afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn); + } + }; + } - if (nodeLinkFnFound) { - // copy nodeList so that if a nodeLinkFn removes or adds an element at this DOM level our - // offsets don't get screwed up - var nodeListLength = nodeList.length; - stableNodeList = new Array(nodeListLength); - // create a sparse array by only copying the elements which have a linkFn - for (i = 0; i < linkFns.length; i+=3) { - idx = linkFns[i]; - stableNodeList[idx] = nodeList[idx]; - } - } else { - stableNodeList = nodeList; - } + /** + * Sorting function for bound directives. + */ + function byPriority(a, b) { + var diff = b.priority - a.priority; + if (diff !== 0) return diff; + if (a.name !== b.name) return (a.name < b.name) ? -1 : 1; + return a.index - b.index; + } - for (i = 0, ii = linkFns.length; i < ii;) { - node = stableNodeList[linkFns[i++]]; - nodeLinkFn = linkFns[i++]; - childLinkFn = linkFns[i++]; + function assertNoDuplicate(what, previousDirective, directive, element) { - if (nodeLinkFn) { - if (nodeLinkFn.scope) { - childScope = scope.$new(); - compile.$$addScopeInfo(jqLite(node), childScope); - } else { - childScope = scope; - } + function wrapModuleNameIfDefined(moduleName) { + return moduleName ? + (' (module: ' + moduleName + ')') : + ''; + } - if (nodeLinkFn.transcludeOnThisElement) { - childBoundTranscludeFn = createBoundTranscludeFn( - scope, nodeLinkFn.transclude, parentBoundTranscludeFn); + if (previousDirective) { + throw $compileMinErr('multidir', 'Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}', + previousDirective.name, wrapModuleNameIfDefined(previousDirective.$$moduleName), + directive.name, wrapModuleNameIfDefined(directive.$$moduleName), what, startingTag(element)); + } + } - } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) { - childBoundTranscludeFn = parentBoundTranscludeFn; - } else if (!parentBoundTranscludeFn && transcludeFn) { - childBoundTranscludeFn = createBoundTranscludeFn(scope, transcludeFn); + function addTextInterpolateDirective(directives, text) { + var interpolateFn = $interpolate(text, true); + if (interpolateFn) { + directives.push({ + priority: 0, + compile: function textInterpolateCompileFn(templateNode) { + var templateNodeParent = templateNode.parent(), + hasCompileParent = !!templateNodeParent.length; + + // When transcluding a template that has bindings in the root + // we don't have a parent and thus need to add the class during linking fn. + if (hasCompileParent) compile.$$addBindingClass(templateNodeParent); + + return function textInterpolateLinkFn(scope, node) { + var parent = node.parent(); + if (!hasCompileParent) compile.$$addBindingClass(parent); + compile.$$addBindingInfo(parent, interpolateFn.expressions); + scope.$watch(interpolateFn, function interpolateFnWatchAction(value) { + node[0].nodeValue = value; + }); + }; + } + }); + } + } - } else { - childBoundTranscludeFn = null; - } - nodeLinkFn(childLinkFn, childScope, node, $rootElement, childBoundTranscludeFn); + function wrapTemplate(type, template) { + type = lowercase(type || 'html'); + switch (type) { + case 'svg': + case 'math': + var wrapper = window.document.createElement('div'); + wrapper.innerHTML = '<' + type + '>' + template + ''; + return wrapper.childNodes[0].childNodes; + default: + return template; + } + } - } else if (childLinkFn) { - childLinkFn(scope, node.childNodes, undefined, parentBoundTranscludeFn); - } - } - } - } - function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn) { - function boundTranscludeFn(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) { + function getTrustedContext(node, attrNormalizedName) { + if (attrNormalizedName == "srcdoc") { + return $sce.HTML; + } + var tag = nodeName_(node); + // maction[xlink:href] can source SVG. It's not limited to . + if (attrNormalizedName == "xlinkHref" || + (tag == "form" && attrNormalizedName == "action") || + (tag != "img" && (attrNormalizedName == "src" || + attrNormalizedName == "ngSrc"))) { + return $sce.RESOURCE_URL; + } + } - if (!transcludedScope) { - transcludedScope = scope.$new(false, containingScope); - transcludedScope.$$transcluded = true; - } - return transcludeFn(transcludedScope, cloneFn, { - parentBoundTranscludeFn: previousBoundTranscludeFn, - transcludeControllers: controllers, - futureParentElement: futureParentElement - }); - } + function addAttrInterpolateDirective(node, directives, value, name, allOrNothing) { + var trustedContext = getTrustedContext(node, name); + allOrNothing = ALL_OR_NOTHING_ATTRS[name] || allOrNothing; - // We need to attach the transclusion slots onto the `boundTranscludeFn` - // so that they are available inside the `controllersBoundTransclude` function - var boundSlots = boundTranscludeFn.$$slots = createMap(); - for (var slotName in transcludeFn.$$slots) { - if (transcludeFn.$$slots[slotName]) { - boundSlots[slotName] = createBoundTranscludeFn(scope, transcludeFn.$$slots[slotName], previousBoundTranscludeFn); - } else { - boundSlots[slotName] = null; - } - } + var interpolateFn = $interpolate(value, true, trustedContext, allOrNothing); - return boundTranscludeFn; - } + // no interpolation found -> ignore + if (!interpolateFn) return; - /** - * Looks for directives on the given node and adds them to the directive collection which is - * sorted. - * - * @param node Node to search. - * @param directives An array to which the directives are added to. This array is sorted before - * the function returns. - * @param attrs The shared attrs object which is used to populate the normalized attributes. - * @param {number=} maxPriority Max directive priority. - */ - function collectDirectives(node, directives, attrs, maxPriority, ignoreDirective) { - var nodeType = node.nodeType, - attrsMap = attrs.$attr, - match, - className; - - switch (nodeType) { - case NODE_TYPE_ELEMENT: /* Element */ - // use the node name: - addDirective(directives, - directiveNormalize(nodeName_(node)), 'E', maxPriority, ignoreDirective); - - // iterate over the attributes - for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes, - j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) { - var attrStartName = false; - var attrEndName = false; - - attr = nAttrs[j]; - name = attr.name; - value = trim(attr.value); - - // support ngAttr attribute binding - ngAttrName = directiveNormalize(name); - if (isNgAttr = NG_ATTR_BINDING.test(ngAttrName)) { - name = name.replace(PREFIX_REGEXP, '') - .substr(8).replace(/_(.)/g, function(match, letter) { - return letter.toUpperCase(); - }); - } - var multiElementMatch = ngAttrName.match(MULTI_ELEMENT_DIR_RE); - if (multiElementMatch && directiveIsMultiElement(multiElementMatch[1])) { - attrStartName = name; - attrEndName = name.substr(0, name.length - 5) + 'end'; - name = name.substr(0, name.length - 6); - } + if (name === "multiple" && nodeName_(node) === "select") { + throw $compileMinErr("selmulti", + "Binding to the 'multiple' attribute is not supported. Element: {0}", + startingTag(node)); + } - nName = directiveNormalize(name.toLowerCase()); - attrsMap[nName] = name; - if (isNgAttr || !attrs.hasOwnProperty(nName)) { - attrs[nName] = value; - if (getBooleanAttrName(node, nName)) { - attrs[nName] = true; // presence means true + directives.push({ + priority: 100, + compile: function () { + return { + pre: function attrInterpolatePreLinkFn(scope, element, attr) { + var $$observers = (attr.$$observers || (attr.$$observers = createMap())); + + if (EVENT_HANDLER_ATTR_REGEXP.test(name)) { + throw $compileMinErr('nodomevents', + "Interpolations for HTML DOM event attributes are disallowed. Please use the " + + "ng- versions (such as ng-click instead of onclick) instead."); + } + + // If the attribute has changed since last $interpolate()ed + var newValue = attr[name]; + if (newValue !== value) { + // we need to interpolate again since the attribute value has been updated + // (e.g. by another directive's compile function) + // ensure unset/empty values make interpolateFn falsy + interpolateFn = newValue && $interpolate(newValue, true, trustedContext, allOrNothing); + value = newValue; + } + + // if attribute was updated so that there is no interpolation going on we don't want to + // register any observers + if (!interpolateFn) return; + + // initialize attr object so that it's ready in case we need the value for isolate + // scope initialization, otherwise the value would not be available from isolate + // directive's linking fn during linking phase + attr[name] = interpolateFn(scope); + + ($$observers[name] || ($$observers[name] = [])).$$inter = true; + (attr.$$observers && attr.$$observers[name].$$scope || scope).$watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) { + //special case for class attribute addition + removal + //so that class changes can tap into the animation + //hooks provided by the $animate service. Be sure to + //skip animations when the first digest occurs (when + //both the new and the old values are the same) since + //the CSS classes are the non-interpolated values + if (name === 'class' && newValue != oldValue) { + attr.$updateClass(newValue, oldValue); + } else { + attr.$set(name, newValue); + } + }); + } + }; + } + }); } - } - addAttrInterpolateDirective(node, directives, value, nName, isNgAttr); - addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName, - attrEndName); - } - - // use class as directive - className = node.className; - if (isObject(className)) { - // Maybe SVGAnimatedString - className = className.animVal; - } - if (isString(className) && className !== '') { - while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) { - nName = directiveNormalize(match[2]); - if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) { - attrs[nName] = trim(match[3]); - } - className = className.substr(match.index + match[0].length); - } - } - break; - case NODE_TYPE_TEXT: /* Text Node */ - if (msie === 11) { - // Workaround for #11781 - while (node.parentNode && node.nextSibling && node.nextSibling.nodeType === NODE_TYPE_TEXT) { - node.nodeValue = node.nodeValue + node.nextSibling.nodeValue; - node.parentNode.removeChild(node.nextSibling); - } - } - addTextInterpolateDirective(directives, node.nodeValue); - break; - case NODE_TYPE_COMMENT: /* Comment */ - try { - match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue); - if (match) { - nName = directiveNormalize(match[1]); - if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) { - attrs[nName] = trim(match[2]); - } - } - } catch (e) { - // turns out that under some circumstances IE9 throws errors when one attempts to read - // comment's node value. - // Just ignore it and continue. (Can't seem to reproduce in test case.) - } - break; - } - - directives.sort(byPriority); - return directives; - } - /** - * Given a node with an directive-start it collects all of the siblings until it finds - * directive-end. - * @param node - * @param attrStart - * @param attrEnd - * @returns {*} - */ - function groupScan(node, attrStart, attrEnd) { - var nodes = []; - var depth = 0; - if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) { - do { - if (!node) { - throw $compileMinErr('uterdir', - "Unterminated attribute, found '{0}' but no matching '{1}' found.", - attrStart, attrEnd); - } - if (node.nodeType == NODE_TYPE_ELEMENT) { - if (node.hasAttribute(attrStart)) depth++; - if (node.hasAttribute(attrEnd)) depth--; - } - nodes.push(node); - node = node.nextSibling; - } while (depth > 0); - } else { - nodes.push(node); - } - - return jqLite(nodes); - } - - /** - * Wrapper for linking function which converts normal linking function into a grouped - * linking function. - * @param linkFn - * @param attrStart - * @param attrEnd - * @returns {Function} - */ - function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) { - return function groupedElementsLink(scope, element, attrs, controllers, transcludeFn) { - element = groupScan(element[0], attrStart, attrEnd); - return linkFn(scope, element, attrs, controllers, transcludeFn); - }; - } - /** - * A function generator that is used to support both eager and lazy compilation - * linking function. - * @param eager - * @param $compileNodes - * @param transcludeFn - * @param maxPriority - * @param ignoreDirective - * @param previousCompileContext - * @returns {Function} - */ - function compilationGenerator(eager, $compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext) { - var compiled; - - if (eager) { - return compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext); - } - return function lazyCompilation() { - if (!compiled) { - compiled = compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext); + /** + * This is a special jqLite.replaceWith, which can replace items which + * have no parents, provided that the containing jqLite collection is provided. + * + * @param {JqLite=} $rootElement The root of the compile tree. Used so that we can replace nodes + * in the root of the tree. + * @param {JqLite} elementsToRemove The jqLite element which we are going to replace. We keep + * the shell, but replace its DOM node reference. + * @param {Node} newNode The new DOM node. + */ + function replaceWith($rootElement, elementsToRemove, newNode) { + var firstElementToRemove = elementsToRemove[0], + removeCount = elementsToRemove.length, + parent = firstElementToRemove.parentNode, + i, ii; + + if ($rootElement) { + for (i = 0, ii = $rootElement.length; i < ii; i++) { + if ($rootElement[i] == firstElementToRemove) { + $rootElement[i++] = newNode; + for (var j = i, j2 = j + removeCount - 1, + jj = $rootElement.length; + j < jj; j++, j2++) { + if (j2 < jj) { + $rootElement[j] = $rootElement[j2]; + } else { + delete $rootElement[j]; + } + } + $rootElement.length -= removeCount - 1; + + // If the replaced element is also the jQuery .context then replace it + // .context is a deprecated jQuery api, so we should set it only when jQuery set it + // http://api.jquery.com/context/ + if ($rootElement.context === firstElementToRemove) { + $rootElement.context = newNode; + } + break; + } + } + } - // Null out all of these references in order to make them eligible for garbage collection - // since this is a potentially long lived closure - $compileNodes = transcludeFn = previousCompileContext = null; - } - return compiled.apply(this, arguments); - }; - } + if (parent) { + parent.replaceChild(newNode, firstElementToRemove); + } - /** - * Once the directives have been collected, their compile functions are executed. This method - * is responsible for inlining directive templates as well as terminating the application - * of the directives if the terminal directive has been reached. - * - * @param {Array} directives Array of collected directives to execute their compile function. - * this needs to be pre-sorted by priority order. - * @param {Node} compileNode The raw DOM node to apply the compile functions to - * @param {Object} templateAttrs The shared attribute function - * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the - * scope argument is auto-generated to the new - * child of the transcluded parent scope. - * @param {JQLite} jqCollection If we are working on the root of the compile tree then this - * argument has the root jqLite array so that we can replace nodes - * on it. - * @param {Object=} originalReplaceDirective An optional directive that will be ignored when - * compiling the transclusion. - * @param {Array.} preLinkFns - * @param {Array.} postLinkFns - * @param {Object} previousCompileContext Context used for previous compilation of the current - * node - * @returns {Function} linkFn - */ - function applyDirectivesToNode(directives, compileNode, templateAttrs, transcludeFn, - jqCollection, originalReplaceDirective, preLinkFns, postLinkFns, - previousCompileContext) { - previousCompileContext = previousCompileContext || {}; - - var terminalPriority = -Number.MAX_VALUE, - newScopeDirective = previousCompileContext.newScopeDirective, - controllerDirectives = previousCompileContext.controllerDirectives, - newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective, - templateDirective = previousCompileContext.templateDirective, - nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective, - hasTranscludeDirective = false, - hasTemplate = false, - hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective, - $compileNode = templateAttrs.$$element = jqLite(compileNode), - directive, - directiveName, - $template, - replaceDirective = originalReplaceDirective, - childTranscludeFn = transcludeFn, - linkFn, - didScanForMultipleTransclusion = false, - mightHaveMultipleTransclusionError = false, - directiveValue; - - // executes all directives on the current element - for (var i = 0, ii = directives.length; i < ii; i++) { - directive = directives[i]; - var attrStart = directive.$$start; - var attrEnd = directive.$$end; - - // collect multiblock sections - if (attrStart) { - $compileNode = groupScan(compileNode, attrStart, attrEnd); - } - $template = undefined; + // Append all the `elementsToRemove` to a fragment. This will... + // - remove them from the DOM + // - allow them to still be traversed with .nextSibling + // - allow a single fragment.qSA to fetch all elements being removed + var fragment = window.document.createDocumentFragment(); + for (i = 0; i < removeCount; i++) { + fragment.appendChild(elementsToRemove[i]); + } - if (terminalPriority > directive.priority) { - break; // prevent further processing of directives - } + if (jqLite.hasData(firstElementToRemove)) { + // Copy over user data (that includes Angular's $scope etc.). Don't copy private + // data here because there's no public interface in jQuery to do that and copying over + // event listeners (which is the main use of private data) wouldn't work anyway. + jqLite.data(newNode, jqLite.data(firstElementToRemove)); - if (directiveValue = directive.scope) { - - // skip the check for directives with async templates, we'll check the derived sync - // directive when the template arrives - if (!directive.templateUrl) { - if (isObject(directiveValue)) { - // This directive is trying to add an isolated scope. - // Check that there is no scope of any kind already - assertNoDuplicate('new/isolated scope', newIsolateScopeDirective || newScopeDirective, - directive, $compileNode); - newIsolateScopeDirective = directive; - } else { - // This directive is trying to add a child scope. - // Check that there is no isolated scope already - assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive, - $compileNode); - } - } + // Remove $destroy event listeners from `firstElementToRemove` + jqLite(firstElementToRemove).off('$destroy'); + } - newScopeDirective = newScopeDirective || directive; - } + // Cleanup any data/listeners on the elements and children. + // This includes invoking the $destroy event on any elements with listeners. + jqLite.cleanData(fragment.querySelectorAll('*')); - directiveName = directive.name; - - // If we encounter a condition that can result in transclusion on the directive, - // then scan ahead in the remaining directives for others that may cause a multiple - // transclusion error to be thrown during the compilation process. If a matching directive - // is found, then we know that when we encounter a transcluded directive, we need to eagerly - // compile the `transclude` function rather than doing it lazily in order to throw - // exceptions at the correct time - if (!didScanForMultipleTransclusion && ((directive.replace && (directive.templateUrl || directive.template)) - || (directive.transclude && !directive.$$tlb))) { - var candidateDirective; - - for (var scanningIndex = i + 1; candidateDirective = directives[scanningIndex++];) { - if ((candidateDirective.transclude && !candidateDirective.$$tlb) - || (candidateDirective.replace && (candidateDirective.templateUrl || candidateDirective.template))) { - mightHaveMultipleTransclusionError = true; - break; + // Update the jqLite collection to only contain the `newNode` + for (i = 1; i < removeCount; i++) { + delete elementsToRemove[i]; } + elementsToRemove[0] = newNode; + elementsToRemove.length = 1; } - didScanForMultipleTransclusion = true; - } - - if (!directive.templateUrl && directive.controller) { - directiveValue = directive.controller; - controllerDirectives = controllerDirectives || createMap(); - assertNoDuplicate("'" + directiveName + "' controller", - controllerDirectives[directiveName], directive, $compileNode); - controllerDirectives[directiveName] = directive; - } - - if (directiveValue = directive.transclude) { - hasTranscludeDirective = true; - - // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion. - // This option should only be used by directives that know how to safely handle element transclusion, - // where the transcluded nodes are added or replaced after linking. - if (!directive.$$tlb) { - assertNoDuplicate('transclusion', nonTlbTranscludeDirective, directive, $compileNode); - nonTlbTranscludeDirective = directive; - } - - if (directiveValue == 'element') { - hasElementTranscludeDirective = true; - terminalPriority = directive.priority; - $template = $compileNode; - $compileNode = templateAttrs.$$element = - jqLite(compile.$$createComment(directiveName, templateAttrs[directiveName])); - compileNode = $compileNode[0]; - replaceWith(jqCollection, sliceArgs($template), compileNode); - - // Support: Chrome < 50 - // https://github.com/angular/angular.js/issues/14041 - - // In the versions of V8 prior to Chrome 50, the document fragment that is created - // in the `replaceWith` function is improperly garbage collected despite still - // being referenced by the `parentNode` property of all of the child nodes. By adding - // a reference to the fragment via a different property, we can avoid that incorrect - // behavior. - // TODO: remove this line after Chrome 50 has been released - $template[0].$$parentNode = $template[0].parentNode; - - childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, terminalPriority, - replaceDirective && replaceDirective.name, { - // Don't pass in: - // - controllerDirectives - otherwise we'll create duplicates controllers - // - newIsolateScopeDirective or templateDirective - combining templates with - // element transclusion doesn't make sense. - // - // We need only nonTlbTranscludeDirective so that we prevent putting transclusion - // on the same element more than once. - nonTlbTranscludeDirective: nonTlbTranscludeDirective - }); - } else { - var slots = createMap(); + function cloneAndAnnotateFn(fn, annotation) { + return extend(function () { + return fn.apply(null, arguments); + }, fn, annotation); + } - $template = jqLite(jqLiteClone(compileNode)).contents(); - if (isObject(directiveValue)) { + function invokeLinkFn(linkFn, scope, $element, attrs, controllers, transcludeFn) { + try { + linkFn(scope, $element, attrs, controllers, transcludeFn); + } catch (e) { + $exceptionHandler(e, startingTag($element)); + } + } - // We have transclusion slots, - // collect them up, compile them and store their transclusion functions - $template = []; - var slotMap = createMap(); - var filledSlots = createMap(); + // Set up $watches for isolate scope and controller bindings. This process + // only occurs for isolate scopes and new scopes with controllerAs. + function initializeDirectiveBindings(scope, attrs, destination, bindings, directive) { + var removeWatchCollection = []; + var initialChanges = {}; + var changes; + forEach(bindings, function initializeBinding(definition, scopeName) { + var attrName = definition.attrName, + optional = definition.optional, + mode = definition.mode, // @, =, or & + lastValue, + parentGet, parentSet, compare, removeWatch; + + switch (mode) { + + case '@': + if (!optional && !hasOwnProperty.call(attrs, attrName)) { + destination[scopeName] = attrs[attrName] = void 0; + } + attrs.$observe(attrName, function (value) { + if (isString(value) || isBoolean(value)) { + var oldValue = destination[scopeName]; + recordChanges(scopeName, value, oldValue); + destination[scopeName] = value; + } + }); + attrs.$$observers[attrName].$$scope = scope; + lastValue = attrs[attrName]; + if (isString(lastValue)) { + // If the attribute has been provided then we trigger an interpolation to ensure + // the value is there for use in the link fn + destination[scopeName] = $interpolate(lastValue)(scope); + } else if (isBoolean(lastValue)) { + // If the attributes is one of the BOOLEAN_ATTR then Angular will have converted + // the value to boolean rather than a string, so we special case this situation + destination[scopeName] = lastValue; + } + initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]); + break; + + case '=': + if (!hasOwnProperty.call(attrs, attrName)) { + if (optional) break; + attrs[attrName] = void 0; + } + if (optional && !attrs[attrName]) break; + + parentGet = $parse(attrs[attrName]); + if (parentGet.literal) { + compare = equals; + } else { + compare = function simpleCompare(a, b) { + return a === b || (a !== a && b !== b); + }; + } + parentSet = parentGet.assign || function () { + // reset the change, or we will throw this exception on every $digest + lastValue = destination[scopeName] = parentGet(scope); + throw $compileMinErr('nonassign', + "Expression '{0}' in attribute '{1}' used with directive '{2}' is non-assignable!", + attrs[attrName], attrName, directive.name); + }; + lastValue = destination[scopeName] = parentGet(scope); + var parentValueWatch = function parentValueWatch(parentValue) { + if (!compare(parentValue, destination[scopeName])) { + // we are out of sync and need to copy + if (!compare(parentValue, lastValue)) { + // parent changed and it has precedence + destination[scopeName] = parentValue; + } else { + // if the parent can be assigned then do so + parentSet(scope, parentValue = destination[scopeName]); + } + } + return lastValue = parentValue; + }; + parentValueWatch.$stateful = true; + if (definition.collection) { + removeWatch = scope.$watchCollection(attrs[attrName], parentValueWatch); + } else { + removeWatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal); + } + removeWatchCollection.push(removeWatch); + break; + + case '<': + if (!hasOwnProperty.call(attrs, attrName)) { + if (optional) break; + attrs[attrName] = void 0; + } + if (optional && !attrs[attrName]) break; + + parentGet = $parse(attrs[attrName]); + + destination[scopeName] = parentGet(scope); + initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]); + + removeWatch = scope.$watch(parentGet, function parentValueWatchAction(newValue, oldValue) { + if (newValue === oldValue) { + // If the new and old values are identical then this is the first time the watch has been triggered + // So instead we use the current value on the destination as the old value + oldValue = destination[scopeName]; + } + recordChanges(scopeName, newValue, oldValue); + destination[scopeName] = newValue; + }, parentGet.literal); + + removeWatchCollection.push(removeWatch); + break; + + case '&': + // Don't assign Object.prototype method to scope + parentGet = attrs.hasOwnProperty(attrName) ? $parse(attrs[attrName]) : noop; + + // Don't assign noop to destination if expression is not valid + if (parentGet === noop && optional) break; + + destination[scopeName] = function (locals) { + return parentGet(scope, locals); + }; + break; + } + }); + + function recordChanges(key, currentValue, previousValue) { + if (isFunction(destination.$onChanges) && currentValue !== previousValue) { + // If we have not already scheduled the top level onChangesQueue handler then do so now + if (!onChangesQueue) { + scope.$$postDigest(flushOnChangesQueue); + onChangesQueue = []; + } + // If we have not already queued a trigger of onChanges for this controller then do so now + if (!changes) { + changes = {}; + onChangesQueue.push(triggerOnChangesHook); + } + // If the has been a change on this property already then we need to reuse the previous value + if (changes[key]) { + previousValue = changes[key].previousValue; + } + // Store this change + changes[key] = new SimpleChange(previousValue, currentValue); + } + } - // Parse the element selectors - forEach(directiveValue, function(elementSelector, slotName) { - // If an element selector starts with a ? then it is optional - var optional = (elementSelector.charAt(0) === '?'); - elementSelector = optional ? elementSelector.substring(1) : elementSelector; + function triggerOnChangesHook() { + destination.$onChanges(changes); + // Now clear the changes so that we schedule onChanges when more changes arrive + changes = undefined; + } - slotMap[elementSelector] = slotName; + return { + initialChanges: initialChanges, + removeWatches: removeWatchCollection.length && function removeWatches() { + for (var i = 0, ii = removeWatchCollection.length; i < ii; ++i) { + removeWatchCollection[i](); + } + } + }; + } + }]; + } - // We explicitly assign `null` since this implies that a slot was defined but not filled. - // Later when calling boundTransclusion functions with a slot name we only error if the - // slot is `undefined` - slots[slotName] = null; + function SimpleChange(previous, current) { + this.previousValue = previous; + this.currentValue = current; + } - // filledSlots contains `true` for all slots that are either optional or have been - // filled. This is used to check that we have not missed any required slots - filledSlots[slotName] = optional; - }); + SimpleChange.prototype.isFirstChange = function () { + return this.previousValue === _UNINITIALIZED_VALUE; + }; - // Add the matching elements into their slot - forEach($compileNode.contents(), function(node) { - var slotName = slotMap[directiveNormalize(nodeName_(node))]; - if (slotName) { - filledSlots[slotName] = true; - slots[slotName] = slots[slotName] || []; - slots[slotName].push(node); - } else { - $template.push(node); - } - }); - // Check for required slots that were not filled - forEach(filledSlots, function(filled, slotName) { - if (!filled) { - throw $compileMinErr('reqslot', 'Required transclusion slot `{0}` was not filled.', slotName); - } - }); + var PREFIX_REGEXP = /^((?:x|data)[\:\-_])/i; - for (var slotName in slots) { - if (slots[slotName]) { - // Only define a transclusion function if the slot was filled - slots[slotName] = compilationGenerator(mightHaveMultipleTransclusionError, slots[slotName], transcludeFn); - } - } - } + /** + * Converts all accepted directives format into proper directive name. + * @param name Name to normalize + */ + function directiveNormalize(name) { + return camelCase(name.replace(PREFIX_REGEXP, '')); + } - $compileNode.empty(); // clear contents - childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, undefined, - undefined, { needsNewScope: directive.$$isolateScope || directive.$$newScope}); - childTranscludeFn.$$slots = slots; - } - } + /** + * @ngdoc type + * @name $compile.directive.Attributes + * + * @description + * A shared object between directive compile / linking functions which contains normalized DOM + * element attributes. The values reflect current binding state `{{ }}`. The normalization is + * needed since all of these are treated as equivalent in Angular: + * + * ``` + * + * ``` + */ - if (directive.template) { - hasTemplate = true; - assertNoDuplicate('template', templateDirective, directive, $compileNode); - templateDirective = directive; + /** + * @ngdoc property + * @name $compile.directive.Attributes#$attr + * + * @description + * A map of DOM element attribute names to the normalized name. This is + * needed to do reverse lookup from normalized name back to actual name. + */ - directiveValue = (isFunction(directive.template)) - ? directive.template($compileNode, templateAttrs) - : directive.template; - directiveValue = denormalizeTemplate(directiveValue); + /** + * @ngdoc method + * @name $compile.directive.Attributes#$set + * @kind function + * + * @description + * Set DOM element attribute value. + * + * + * @param {string} name Normalized element attribute name of the property to modify. The name is + * reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr} + * property to the original name. + * @param {string} value Value to set the attribute to. The value can be an interpolated string. + */ - if (directive.replace) { - replaceDirective = directive; - if (jqLiteIsTextNode(directiveValue)) { - $template = []; - } else { - $template = removeComments(wrapTemplate(directive.templateNamespace, trim(directiveValue))); - } - compileNode = $template[0]; - if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) { - throw $compileMinErr('tplrt', - "Template for directive '{0}' must have exactly one root element. {1}", - directiveName, ''); - } + /** + * Closure compiler type information + */ - replaceWith(jqCollection, $compileNode, compileNode); + function nodesetLinkingFn(/* angular.Scope */ scope, + /* NodeList */ nodeList, + /* Element */ rootElement, + /* function(Function) */ boundTranscludeFn) { + } - var newTemplateAttrs = {$attr: {}}; + function directiveLinkingFn(/* nodesetLinkingFn */ nodesetLinkingFn, + /* angular.Scope */ scope, + /* Node */ node, + /* Element */ rootElement, + /* function(Function) */ boundTranscludeFn) { + } - // combine directives from the original node and from the template: - // - take the array of directives for this element - // - split it into two parts, those that already applied (processed) and those that weren't (unprocessed) - // - collect directives from the template and sort them by priority - // - combine directives as: processed + template + unprocessed - var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs); - var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1)); + function tokenDifference(str1, str2) { + var values = '', + tokens1 = str1.split(/\s+/), + tokens2 = str2.split(/\s+/); - if (newIsolateScopeDirective || newScopeDirective) { - // The original directive caused the current element to be replaced but this element - // also needs to have a new scope, so we need to tell the template directives - // that they would need to get their scope from further up, if they require transclusion - markDirectiveScope(templateDirectives, newIsolateScopeDirective, newScopeDirective); + outer: + for (var i = 0; i < tokens1.length; i++) { + var token = tokens1[i]; + for (var j = 0; j < tokens2.length; j++) { + if (token == tokens2[j]) continue outer; + } + values += (values.length > 0 ? ' ' : '') + token; } - directives = directives.concat(templateDirectives).concat(unprocessedDirectives); - mergeTemplateAttributes(templateAttrs, newTemplateAttrs); - - ii = directives.length; - } else { - $compileNode.html(directiveValue); - } - } - - if (directive.templateUrl) { - hasTemplate = true; - assertNoDuplicate('template', templateDirective, directive, $compileNode); - templateDirective = directive; + return values; + } - if (directive.replace) { - replaceDirective = directive; - } + function removeComments(jqNodes) { + jqNodes = jqLite(jqNodes); + var i = jqNodes.length; - /* jshint -W021 */ - nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode, - /* jshint +W021 */ - templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, { - controllerDirectives: controllerDirectives, - newScopeDirective: (newScopeDirective !== directive) && newScopeDirective, - newIsolateScopeDirective: newIsolateScopeDirective, - templateDirective: templateDirective, - nonTlbTranscludeDirective: nonTlbTranscludeDirective - }); - ii = directives.length; - } else if (directive.compile) { - try { - linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn); - if (isFunction(linkFn)) { - addLinkFns(null, linkFn, attrStart, attrEnd); - } else if (linkFn) { - addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd); - } - } catch (e) { - $exceptionHandler(e, startingTag($compileNode)); - } + if (i <= 1) { + return jqNodes; } - if (directive.terminal) { - nodeLinkFn.terminal = true; - terminalPriority = Math.max(terminalPriority, directive.priority); + while (i--) { + var node = jqNodes[i]; + if (node.nodeType === NODE_TYPE_COMMENT) { + splice.call(jqNodes, i, 1); + } } + return jqNodes; + } - } - - nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true; - nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective; - nodeLinkFn.templateOnThisElement = hasTemplate; - nodeLinkFn.transclude = childTranscludeFn; - - previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective; + var $controllerMinErr = minErr('$controller'); - // might be normal or delayed nodeLinkFn depending on if templateUrl is present - return nodeLinkFn; - //////////////////// + var CNTRL_REG = /^(\S+)(\s+as\s+([\w$]+))?$/; - function addLinkFns(pre, post, attrStart, attrEnd) { - if (pre) { - if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd); - pre.require = directive.require; - pre.directiveName = directiveName; - if (newIsolateScopeDirective === directive || directive.$$isolateScope) { - pre = cloneAndAnnotateFn(pre, {isolateScope: true}); - } - preLinkFns.push(pre); - } - if (post) { - if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd); - post.require = directive.require; - post.directiveName = directiveName; - if (newIsolateScopeDirective === directive || directive.$$isolateScope) { - post = cloneAndAnnotateFn(post, {isolateScope: true}); - } - postLinkFns.push(post); + function identifierForController(controller, ident) { + if (ident && isString(ident)) return ident; + if (isString(controller)) { + var match = CNTRL_REG.exec(controller); + if (match) return match[3]; } - } + } - function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) { - var i, ii, linkFn, isolateScope, controllerScope, elementControllers, transcludeFn, $element, - attrs, scopeBindingInfo; - if (compileNode === linkNode) { - attrs = templateAttrs; - $element = templateAttrs.$$element; - } else { - $element = jqLite(linkNode); - attrs = new Attributes($element, templateAttrs); - } + /** + * @ngdoc provider + * @name $controllerProvider + * @description + * The {@link ng.$controller $controller service} is used by Angular to create new + * controllers. + * + * This provider allows controller registration via the + * {@link ng.$controllerProvider#register register} method. + */ + function $ControllerProvider() { + var controllers = {}, + globals = false; - controllerScope = scope; - if (newIsolateScopeDirective) { - isolateScope = scope.$new(true); - } else if (newScopeDirective) { - controllerScope = scope.$parent; - } + /** + * @ngdoc method + * @name $controllerProvider#has + * @param {string} name Controller name to check. + */ + this.has = function (name) { + return controllers.hasOwnProperty(name); + }; - if (boundTranscludeFn) { - // track `boundTranscludeFn` so it can be unwrapped if `transcludeFn` - // is later passed as `parentBoundTranscludeFn` to `publicLinkFn` - transcludeFn = controllersBoundTransclude; - transcludeFn.$$boundTransclude = boundTranscludeFn; - // expose the slots on the `$transclude` function - transcludeFn.isSlotFilled = function(slotName) { - return !!boundTranscludeFn.$$slots[slotName]; - }; - } + /** + * @ngdoc method + * @name $controllerProvider#register + * @param {string|Object} name Controller name, or an object map of controllers where the keys are + * the names and the values are the constructors. + * @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI + * annotations in the array notation). + */ + this.register = function (name, constructor) { + assertNotHasOwnProperty(name, 'controller'); + if (isObject(name)) { + extend(controllers, name); + } else { + controllers[name] = constructor; + } + }; - if (controllerDirectives) { - elementControllers = setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective); - } + /** + * @ngdoc method + * @name $controllerProvider#allowGlobals + * @description If called, allows `$controller` to find controller constructors on `window` + */ + this.allowGlobals = function () { + globals = true; + }; - if (newIsolateScopeDirective) { - // Initialize isolate scope bindings for new isolate scope directive. - compile.$$addScopeInfo($element, isolateScope, true, !(templateDirective && (templateDirective === newIsolateScopeDirective || - templateDirective === newIsolateScopeDirective.$$originalDirective))); - compile.$$addScopeClass($element, true); - isolateScope.$$isolateBindings = - newIsolateScopeDirective.$$isolateBindings; - scopeBindingInfo = initializeDirectiveBindings(scope, attrs, isolateScope, - isolateScope.$$isolateBindings, - newIsolateScopeDirective); - if (scopeBindingInfo.removeWatches) { - isolateScope.$on('$destroy', scopeBindingInfo.removeWatches); - } - } - // Initialize bindToController bindings - for (var name in elementControllers) { - var controllerDirective = controllerDirectives[name]; - var controller = elementControllers[name]; - var bindings = controllerDirective.$$bindings.bindToController; - - if (controller.identifier && bindings) { - controller.bindingInfo = - initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective); - } else { - controller.bindingInfo = {}; - } + this.$get = ['$injector', '$window', function ($injector, $window) { + + /** + * @ngdoc service + * @name $controller + * @requires $injector + * + * @param {Function|string} constructor If called with a function then it's considered to be the + * controller constructor function. Otherwise it's considered to be a string which is used + * to retrieve the controller constructor using the following steps: + * + * * check if a controller with given name is registered via `$controllerProvider` + * * check if evaluating the string on the current scope returns a constructor + * * if $controllerProvider#allowGlobals, check `window[constructor]` on the global + * `window` object (not recommended) + * + * The string can use the `controller as property` syntax, where the controller instance is published + * as the specified property on the `scope`; the `scope` must be injected into `locals` param for this + * to work correctly. + * + * @param {Object} locals Injection locals for Controller. + * @return {Object} Instance of given controller. + * + * @description + * `$controller` service is responsible for instantiating controllers. + * + * It's just a simple call to {@link auto.$injector $injector}, but extracted into + * a service, so that one can override this service with [BC version](https://gist.github.com/1649788). + */ + return function $controller(expression, locals, later, ident) { + // PRIVATE API: + // param `later` --- indicates that the controller's constructor is invoked at a later time. + // If true, $controller will allocate the object with the correct + // prototype chain, but will not invoke the controller until a returned + // callback is invoked. + // param `ident` --- An optional label which overrides the label parsed from the controller + // expression, if any. + var instance, match, constructor, identifier; + later = later === true; + if (ident && isString(ident)) { + identifier = ident; + } - var controllerResult = controller(); - if (controllerResult !== controller.instance) { - // If the controller constructor has a return value, overwrite the instance - // from setupControllers - controller.instance = controllerResult; - $element.data('$' + controllerDirective.name + 'Controller', controllerResult); - controller.bindingInfo.removeWatches && controller.bindingInfo.removeWatches(); - controller.bindingInfo = - initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective); - } - } + if (isString(expression)) { + match = expression.match(CNTRL_REG); + if (!match) { + throw $controllerMinErr('ctrlfmt', + "Badly formed controller string '{0}'. " + + "Must match `__name__ as __id__` or `__name__`.", expression); + } + constructor = match[1], + identifier = identifier || match[3]; + expression = controllers.hasOwnProperty(constructor) + ? controllers[constructor] + : getter(locals.$scope, constructor, true) || + (globals ? getter($window, constructor, true) : undefined); + + assertArgFn(expression, constructor, true); + } - // Bind the required controllers to the controller, if `require` is an object and `bindToController` is truthy - forEach(controllerDirectives, function(controllerDirective, name) { - var require = controllerDirective.require; - if (controllerDirective.bindToController && !isArray(require) && isObject(require)) { - extend(elementControllers[name].instance, getControllers(name, require, $element, elementControllers)); - } - }); + if (later) { + // Instantiate controller later: + // This machinery is used to create an instance of the object before calling the + // controller's constructor itself. + // + // This allows properties to be added to the controller before the constructor is + // invoked. Primarily, this is used for isolate scope bindings in $compile. + // + // This feature is not intended for use by applications, and is thus not documented + // publicly. + // Object creation: http://jsperf.com/create-constructor/2 + var controllerPrototype = (isArray(expression) ? + expression[expression.length - 1] : expression).prototype; + instance = Object.create(controllerPrototype || null); + + if (identifier) { + addIdentifier(locals, identifier, instance, constructor || expression.name); + } - // Handle the init and destroy lifecycle hooks on all controllers that have them - forEach(elementControllers, function(controller) { - var controllerInstance = controller.instance; - if (isFunction(controllerInstance.$onChanges)) { - controllerInstance.$onChanges(controller.bindingInfo.initialChanges); - } - if (isFunction(controllerInstance.$onInit)) { - controllerInstance.$onInit(); - } - if (isFunction(controllerInstance.$onDestroy)) { - controllerScope.$on('$destroy', function callOnDestroyHook() { - controllerInstance.$onDestroy(); - }); - } - }); + var instantiate; + return instantiate = extend(function $controllerInit() { + var result = $injector.invoke(expression, instance, locals, constructor); + if (result !== instance && (isObject(result) || isFunction(result))) { + instance = result; + if (identifier) { + // If result changed, re-assign controllerAs value to scope. + addIdentifier(locals, identifier, instance, constructor || expression.name); + } + } + return instance; + }, { + instance: instance, + identifier: identifier + }); + } - // PRELINKING - for (i = 0, ii = preLinkFns.length; i < ii; i++) { - linkFn = preLinkFns[i]; - invokeLinkFn(linkFn, - linkFn.isolateScope ? isolateScope : scope, - $element, - attrs, - linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers), - transcludeFn - ); - } + instance = $injector.instantiate(expression, locals, constructor); - // RECURSION - // We only pass the isolate scope, if the isolate directive has a template, - // otherwise the child elements do not belong to the isolate directive. - var scopeToChild = scope; - if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) { - scopeToChild = isolateScope; - } - childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn); - - // POSTLINKING - for (i = postLinkFns.length - 1; i >= 0; i--) { - linkFn = postLinkFns[i]; - invokeLinkFn(linkFn, - linkFn.isolateScope ? isolateScope : scope, - $element, - attrs, - linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers), - transcludeFn - ); - } + if (identifier) { + addIdentifier(locals, identifier, instance, constructor || expression.name); + } - // Trigger $postLink lifecycle hooks - forEach(elementControllers, function(controller) { - var controllerInstance = controller.instance; - if (isFunction(controllerInstance.$postLink)) { - controllerInstance.$postLink(); - } - }); + return instance; + }; - // This is the function that is injected as `$transclude`. - // Note: all arguments are optional! - function controllersBoundTransclude(scope, cloneAttachFn, futureParentElement, slotName) { - var transcludeControllers; - // No scope passed in: - if (!isScope(scope)) { - slotName = futureParentElement; - futureParentElement = cloneAttachFn; - cloneAttachFn = scope; - scope = undefined; - } + function addIdentifier(locals, identifier, instance, name) { + if (!(locals && isObject(locals.$scope))) { + throw minErr('$controller')('noscp', + "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.", + name, identifier); + } - if (hasElementTranscludeDirective) { - transcludeControllers = elementControllers; - } - if (!futureParentElement) { - futureParentElement = hasElementTranscludeDirective ? $element.parent() : $element; - } - if (slotName) { - // slotTranscludeFn can be one of three things: - // * a transclude function - a filled slot - // * `null` - an optional slot that was not filled - // * `undefined` - a slot that was not declared (i.e. invalid) - var slotTranscludeFn = boundTranscludeFn.$$slots[slotName]; - if (slotTranscludeFn) { - return slotTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild); - } else if (isUndefined(slotTranscludeFn)) { - throw $compileMinErr('noslot', - 'No parent directive that requires a transclusion with slot name "{0}". ' + - 'Element: {1}', - slotName, startingTag($element)); - } - } else { - return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild); - } - } - } + locals.$scope[identifier] = instance; + } + }]; } - function getControllers(directiveName, require, $element, elementControllers) { - var value; - - if (isString(require)) { - var match = require.match(REQUIRE_PREFIX_REGEXP); - var name = require.substring(match[0].length); - var inheritType = match[1] || match[3]; - var optional = match[2] === '?'; - - //If only parents then start at the parent element - if (inheritType === '^^') { - $element = $element.parent(); - //Otherwise attempt getting the controller from elementControllers in case - //the element is transcluded (and has no data) and to avoid .data if possible - } else { - value = elementControllers && elementControllers[name]; - value = value && value.instance; - } - - if (!value) { - var dataName = '$' + name + 'Controller'; - value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName); - } - - if (!value && !optional) { - throw $compileMinErr('ctreq', - "Controller '{0}', required by directive '{1}', can't be found!", - name, directiveName); - } - } else if (isArray(require)) { - value = []; - for (var i = 0, ii = require.length; i < ii; i++) { - value[i] = getControllers(directiveName, require[i], $element, elementControllers); - } - } else if (isObject(require)) { - value = {}; - forEach(require, function(controller, property) { - value[property] = getControllers(directiveName, controller, $element, elementControllers); - }); - } - - return value || null; - } - - function setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective) { - var elementControllers = createMap(); - for (var controllerKey in controllerDirectives) { - var directive = controllerDirectives[controllerKey]; - var locals = { - $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope, - $element: $element, - $attrs: attrs, - $transclude: transcludeFn - }; - - var controller = directive.controller; - if (controller == '@') { - controller = attrs[directive.name]; - } - - var controllerInstance = $controller(controller, locals, true, directive.controllerAs); - - // For directives with element transclusion the element is a comment. - // In this case .data will not attach any data. - // Instead, we save the controllers for the element in a local hash and attach to .data - // later, once we have the actual element. - elementControllers[directive.name] = controllerInstance; - $element.data('$' + directive.name + 'Controller', controllerInstance.instance); - } - return elementControllers; - } - - // Depending upon the context in which a directive finds itself it might need to have a new isolated - // or child scope created. For instance: - // * if the directive has been pulled into a template because another directive with a higher priority - // asked for element transclusion - // * if the directive itself asks for transclusion but it is at the root of a template and the original - // element was replaced. See https://github.com/angular/angular.js/issues/12936 - function markDirectiveScope(directives, isolateScope, newScope) { - for (var j = 0, jj = directives.length; j < jj; j++) { - directives[j] = inherit(directives[j], {$$isolateScope: isolateScope, $$newScope: newScope}); - } - } - - /** - * looks up the directive and decorates it with exception handling and proper parameters. We - * call this the boundDirective. - * - * @param {string} name name of the directive to look up. - * @param {string} location The directive must be found in specific format. - * String containing any of theses characters: - * - * * `E`: element name - * * `A': attribute - * * `C`: class - * * `M`: comment - * @returns {boolean} true if directive was added. - */ - function addDirective(tDirectives, name, location, maxPriority, ignoreDirective, startAttrName, - endAttrName) { - if (name === ignoreDirective) return null; - var match = null; - if (hasDirectives.hasOwnProperty(name)) { - for (var directive, directives = $injector.get(name + Suffix), - i = 0, ii = directives.length; i < ii; i++) { - try { - directive = directives[i]; - if ((isUndefined(maxPriority) || maxPriority > directive.priority) && - directive.restrict.indexOf(location) != -1) { - if (startAttrName) { - directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName}); - } - if (!directive.$$bindings) { - var bindings = directive.$$bindings = - parseDirectiveBindings(directive, directive.name); - if (isObject(bindings.isolateScope)) { - directive.$$isolateBindings = bindings.isolateScope; - } - } - tDirectives.push(directive); - match = directive; - } - } catch (e) { $exceptionHandler(e); } - } - } - return match; - } - - /** - * looks up the directive and returns true if it is a multi-element directive, - * and therefore requires DOM nodes between -start and -end markers to be grouped - * together. + * @ngdoc service + * @name $document + * @requires $window + * + * @description + * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object. * - * @param {string} name name of the directive to look up. - * @returns true if directive was registered as multi-element. + * @example + + +
+

$document title:

+

window.document title:

+
+ + + angular.module('documentExample', []) + .controller('ExampleController', ['$scope', '$document', function($scope, $document) { + $scope.title = $document[0].title; + $scope.windowTitle = angular.element(window.document)[0].title; + }]); + + */ - function directiveIsMultiElement(name) { - if (hasDirectives.hasOwnProperty(name)) { - for (var directive, directives = $injector.get(name + Suffix), - i = 0, ii = directives.length; i < ii; i++) { - directive = directives[i]; - if (directive.multiElement) { - return true; - } - } - } - return false; + function $DocumentProvider() { + this.$get = ['$window', function (window) { + return jqLite(window.document); + }]; } /** - * When the element is replaced with HTML template then the new attributes - * on the template need to be merged with the existing attributes in the DOM. - * The desired effect is to have both of the attributes present. + * @ngdoc service + * @name $exceptionHandler + * @requires ng.$log + * + * @description + * Any uncaught exception in angular expressions is delegated to this service. + * The default implementation simply delegates to `$log.error` which logs it into + * the browser console. + * + * In unit tests, if `angular-mocks.js` is loaded, this service is overridden by + * {@link ngMock.$exceptionHandler mock $exceptionHandler} which aids in testing. + * + * ## Example: + * + * ```js + * angular.module('exceptionOverride', []).factory('$exceptionHandler', function() { + * return function(exception, cause) { + * exception.message += ' (caused by "' + cause + '")'; + * throw exception; + * }; + * }); + * ``` + * + * This example will override the normal action of `$exceptionHandler`, to make angular + * exceptions fail hard when they happen, instead of just logging to the console. + * + *
+ * Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind` + * methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler} + * (unless executed during a digest). + * + * If you wish, you can manually delegate exceptions, e.g. + * `try { ... } catch(e) { $exceptionHandler(e); }` + * + * @param {Error} exception Exception associated with the error. + * @param {string=} cause optional information about the context in which + * the error was thrown. * - * @param {object} dst destination attributes (original DOM) - * @param {object} src source attributes (from the directive template) */ - function mergeTemplateAttributes(dst, src) { - var srcAttr = src.$attr, - dstAttr = dst.$attr, - $element = dst.$$element; - - // reapply the old attributes to the new element - forEach(dst, function(value, key) { - if (key.charAt(0) != '$') { - if (src[key] && src[key] !== value) { - value += (key === 'style' ? ';' : ' ') + src[key]; - } - dst.$set(key, value, true, srcAttr[key]); - } - }); + function $ExceptionHandlerProvider() { + this.$get = ['$log', function ($log) { + return function (exception, cause) { + $log.error.apply($log, arguments); + }; + }]; + } + + var $$ForceReflowProvider = function () { + this.$get = ['$document', function ($document) { + return function (domNode) { + //the line below will force the browser to perform a repaint so + //that all the animated elements within the animation frame will + //be properly updated and drawn on screen. This is required to + //ensure that the preparation animation is properly flushed so that + //the active state picks up from there. DO NOT REMOVE THIS LINE. + //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH + //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND + //WILL TAKE YEARS AWAY FROM YOUR LIFE. + if (domNode) { + if (!domNode.nodeType && domNode instanceof jqLite) { + domNode = domNode[0]; + } + } else { + domNode = $document[0].body; + } + return domNode.offsetWidth + 1; + }; + }]; + }; + + var APPLICATION_JSON = 'application/json'; + var CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': APPLICATION_JSON + ';charset=utf-8'}; + var JSON_START = /^\[|^\{(?!\{)/; + var JSON_ENDS = { + '[': /]$/, + '{': /}$/ + }; + var JSON_PROTECTION_PREFIX = /^\)\]\}',?\n/; + var $httpMinErr = minErr('$http'); + var $httpMinErrLegacyFn = function (method) { + return function () { + throw $httpMinErr('legacy', 'The method `{0}` on the promise returned from `$http` has been disabled.', method); + }; + }; - // copy the new attributes on the old attrs object - forEach(src, function(value, key) { - if (key == 'class') { - safeAddClass($element, value); - dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value; - } else if (key == 'style') { - $element.attr('style', $element.attr('style') + ';' + value); - dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value; - // `dst` will never contain hasOwnProperty as DOM parser won't let it. - // You will get an "InvalidCharacterError: DOM Exception 5" error if you - // have an attribute like "has-own-property" or "data-has-own-property", etc. - } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) { - dst[key] = value; - dstAttr[key] = srcAttr[key]; + function serializeValue(v) { + if (isObject(v)) { + return isDate(v) ? v.toISOString() : toJson(v); } - }); + return v; } - function compileTemplateUrl(directives, $compileNode, tAttrs, - $rootElement, childTranscludeFn, preLinkFns, postLinkFns, previousCompileContext) { - var linkQueue = [], - afterTemplateNodeLinkFn, - afterTemplateChildLinkFn, - beforeTemplateCompileNode = $compileNode[0], - origAsyncDirective = directives.shift(), - derivedSyncDirective = inherit(origAsyncDirective, { - templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective - }), - templateUrl = (isFunction(origAsyncDirective.templateUrl)) - ? origAsyncDirective.templateUrl($compileNode, tAttrs) - : origAsyncDirective.templateUrl, - templateNamespace = origAsyncDirective.templateNamespace; - - $compileNode.empty(); - - $templateRequest(templateUrl) - .then(function(content) { - var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn; - - content = denormalizeTemplate(content); - - if (origAsyncDirective.replace) { - if (jqLiteIsTextNode(content)) { - $template = []; - } else { - $template = removeComments(wrapTemplate(templateNamespace, trim(content))); - } - compileNode = $template[0]; - - if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) { - throw $compileMinErr('tplrt', - "Template for directive '{0}' must have exactly one root element. {1}", - origAsyncDirective.name, templateUrl); - } - - tempTemplateAttrs = {$attr: {}}; - replaceWith($rootElement, $compileNode, compileNode); - var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs); - - if (isObject(origAsyncDirective.scope)) { - // the original directive that caused the template to be loaded async required - // an isolate scope - markDirectiveScope(templateDirectives, true); - } - directives = templateDirectives.concat(directives); - mergeTemplateAttributes(tAttrs, tempTemplateAttrs); - } else { - compileNode = beforeTemplateCompileNode; - $compileNode.html(content); - } - - directives.unshift(derivedSyncDirective); - - afterTemplateNodeLinkFn = applyDirectivesToNode(directives, compileNode, tAttrs, - childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns, - previousCompileContext); - forEach($rootElement, function(node, i) { - if (node == compileNode) { - $rootElement[i] = $compileNode[0]; - } - }); - afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn); - - while (linkQueue.length) { - var scope = linkQueue.shift(), - beforeTemplateLinkNode = linkQueue.shift(), - linkRootElement = linkQueue.shift(), - boundTranscludeFn = linkQueue.shift(), - linkNode = $compileNode[0]; - - if (scope.$$destroyed) continue; - - if (beforeTemplateLinkNode !== beforeTemplateCompileNode) { - var oldClasses = beforeTemplateLinkNode.className; - - if (!(previousCompileContext.hasElementTranscludeDirective && - origAsyncDirective.replace)) { - // it was cloned therefore we have to clone as well. - linkNode = jqLiteClone(compileNode); - } - replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode); - - // Copy in CSS classes from original node - safeAddClass(jqLite(linkNode), oldClasses); - } - if (afterTemplateNodeLinkFn.transcludeOnThisElement) { - childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn); - } else { - childBoundTranscludeFn = boundTranscludeFn; - } - afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement, - childBoundTranscludeFn); - } - linkQueue = null; - }); + function $HttpParamSerializerProvider() { + /** + * @ngdoc service + * @name $httpParamSerializer + * @description + * + * Default {@link $http `$http`} params serializer that converts objects to strings + * according to the following rules: + * + * * `{'foo': 'bar'}` results in `foo=bar` + * * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object) + * * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element) + * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D"` (stringified and encoded representation of an object) + * + * Note that serializer will sort the request parameters alphabetically. + * */ + + this.$get = function () { + return function ngParamSerializer(params) { + if (!params) return ''; + var parts = []; + forEachSorted(params, function (value, key) { + if (value === null || isUndefined(value)) return; + if (isArray(value)) { + forEach(value, function (v) { + parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(v))); + }); + } else { + parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(value))); + } + }); - return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) { - var childBoundTranscludeFn = boundTranscludeFn; - if (scope.$$destroyed) return; - if (linkQueue) { - linkQueue.push(scope, - node, - rootElement, - childBoundTranscludeFn); - } else { - if (afterTemplateNodeLinkFn.transcludeOnThisElement) { - childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn); - } - afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn); - } - }; + return parts.join('&'); + }; + }; } - - /** - * Sorting function for bound directives. - */ - function byPriority(a, b) { - var diff = b.priority - a.priority; - if (diff !== 0) return diff; - if (a.name !== b.name) return (a.name < b.name) ? -1 : 1; - return a.index - b.index; + function $HttpParamSerializerJQLikeProvider() { + /** + * @ngdoc service + * @name $httpParamSerializerJQLike + * @description + * + * Alternative {@link $http `$http`} params serializer that follows + * jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic. + * The serializer will also sort the params alphabetically. + * + * To use it for serializing `$http` request parameters, set it as the `paramSerializer` property: + * + * ```js + * $http({ + * url: myUrl, + * method: 'GET', + * params: myParams, + * paramSerializer: '$httpParamSerializerJQLike' + * }); + * ``` + * + * It is also possible to set it as the default `paramSerializer` in the + * {@link $httpProvider#defaults `$httpProvider`}. + * + * Additionally, you can inject the serializer and use it explicitly, for example to serialize + * form data for submission: + * + * ```js + * .controller(function($http, $httpParamSerializerJQLike) { + * //... + * + * $http({ + * url: myUrl, + * method: 'POST', + * data: $httpParamSerializerJQLike(myData), + * headers: { + * 'Content-Type': 'application/x-www-form-urlencoded' + * } + * }); + * + * }); + * ``` + * + * */ + this.$get = function () { + return function jQueryLikeParamSerializer(params) { + if (!params) return ''; + var parts = []; + serialize(params, '', true); + return parts.join('&'); + + function serialize(toSerialize, prefix, topLevel) { + if (toSerialize === null || isUndefined(toSerialize)) return; + if (isArray(toSerialize)) { + forEach(toSerialize, function (value, index) { + serialize(value, prefix + '[' + (isObject(value) ? index : '') + ']'); + }); + } else if (isObject(toSerialize) && !isDate(toSerialize)) { + forEachSorted(toSerialize, function (value, key) { + serialize(value, prefix + + (topLevel ? '' : '[') + + key + + (topLevel ? '' : ']')); + }); + } else { + parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize))); + } + } + }; + }; } - function assertNoDuplicate(what, previousDirective, directive, element) { + function defaultHttpResponseTransform(data, headers) { + if (isString(data)) { + // Strip json vulnerability protection prefix and trim whitespace + var tempData = data.replace(JSON_PROTECTION_PREFIX, '').trim(); - function wrapModuleNameIfDefined(moduleName) { - return moduleName ? - (' (module: ' + moduleName + ')') : - ''; - } + if (tempData) { + var contentType = headers('Content-Type'); + if ((contentType && (contentType.indexOf(APPLICATION_JSON) === 0)) || isJsonLike(tempData)) { + data = fromJson(tempData); + } + } + } - if (previousDirective) { - throw $compileMinErr('multidir', 'Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}', - previousDirective.name, wrapModuleNameIfDefined(previousDirective.$$moduleName), - directive.name, wrapModuleNameIfDefined(directive.$$moduleName), what, startingTag(element)); - } + return data; } - - function addTextInterpolateDirective(directives, text) { - var interpolateFn = $interpolate(text, true); - if (interpolateFn) { - directives.push({ - priority: 0, - compile: function textInterpolateCompileFn(templateNode) { - var templateNodeParent = templateNode.parent(), - hasCompileParent = !!templateNodeParent.length; - - // When transcluding a template that has bindings in the root - // we don't have a parent and thus need to add the class during linking fn. - if (hasCompileParent) compile.$$addBindingClass(templateNodeParent); - - return function textInterpolateLinkFn(scope, node) { - var parent = node.parent(); - if (!hasCompileParent) compile.$$addBindingClass(parent); - compile.$$addBindingInfo(parent, interpolateFn.expressions); - scope.$watch(interpolateFn, function interpolateFnWatchAction(value) { - node[0].nodeValue = value; - }); - }; - } - }); - } + function isJsonLike(str) { + var jsonStart = str.match(JSON_START); + return jsonStart && JSON_ENDS[jsonStart[0]].test(str); } + /** + * Parse headers into key value object + * + * @param {string} headers Raw headers as a string + * @returns {Object} Parsed headers as key value object + */ + function parseHeaders(headers) { + var parsed = createMap(), i; - function wrapTemplate(type, template) { - type = lowercase(type || 'html'); - switch (type) { - case 'svg': - case 'math': - var wrapper = window.document.createElement('div'); - wrapper.innerHTML = '<' + type + '>' + template + ''; - return wrapper.childNodes[0].childNodes; - default: - return template; - } - } + function fillInParsed(key, val) { + if (key) { + parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val; + } + } + if (isString(headers)) { + forEach(headers.split('\n'), function (line) { + i = line.indexOf(':'); + fillInParsed(lowercase(trim(line.substr(0, i))), trim(line.substr(i + 1))); + }); + } else if (isObject(headers)) { + forEach(headers, function (headerVal, headerKey) { + fillInParsed(lowercase(headerKey), trim(headerVal)); + }); + } - function getTrustedContext(node, attrNormalizedName) { - if (attrNormalizedName == "srcdoc") { - return $sce.HTML; - } - var tag = nodeName_(node); - // maction[xlink:href] can source SVG. It's not limited to . - if (attrNormalizedName == "xlinkHref" || - (tag == "form" && attrNormalizedName == "action") || - (tag != "img" && (attrNormalizedName == "src" || - attrNormalizedName == "ngSrc"))) { - return $sce.RESOURCE_URL; - } + return parsed; } - function addAttrInterpolateDirective(node, directives, value, name, allOrNothing) { - var trustedContext = getTrustedContext(node, name); - allOrNothing = ALL_OR_NOTHING_ATTRS[name] || allOrNothing; - - var interpolateFn = $interpolate(value, true, trustedContext, allOrNothing); - - // no interpolation found -> ignore - if (!interpolateFn) return; + /** + * Returns a function that provides access to parsed headers. + * + * Headers are lazy parsed when first requested. + * @see parseHeaders + * + * @param {(string|Object)} headers Headers to provide access to. + * @returns {function(string=)} Returns a getter function which if called with: + * + * - if called with single an argument returns a single header value or null + * - if called with no arguments returns an object containing all headers. + */ + function headersGetter(headers) { + var headersObj; + return function (name) { + if (!headersObj) headersObj = parseHeaders(headers); - if (name === "multiple" && nodeName_(node) === "select") { - throw $compileMinErr("selmulti", - "Binding to the 'multiple' attribute is not supported. Element: {0}", - startingTag(node)); - } + if (name) { + var value = headersObj[lowercase(name)]; + if (value === void 0) { + value = null; + } + return value; + } - directives.push({ - priority: 100, - compile: function() { - return { - pre: function attrInterpolatePreLinkFn(scope, element, attr) { - var $$observers = (attr.$$observers || (attr.$$observers = createMap())); - - if (EVENT_HANDLER_ATTR_REGEXP.test(name)) { - throw $compileMinErr('nodomevents', - "Interpolations for HTML DOM event attributes are disallowed. Please use the " + - "ng- versions (such as ng-click instead of onclick) instead."); - } - - // If the attribute has changed since last $interpolate()ed - var newValue = attr[name]; - if (newValue !== value) { - // we need to interpolate again since the attribute value has been updated - // (e.g. by another directive's compile function) - // ensure unset/empty values make interpolateFn falsy - interpolateFn = newValue && $interpolate(newValue, true, trustedContext, allOrNothing); - value = newValue; - } - - // if attribute was updated so that there is no interpolation going on we don't want to - // register any observers - if (!interpolateFn) return; - - // initialize attr object so that it's ready in case we need the value for isolate - // scope initialization, otherwise the value would not be available from isolate - // directive's linking fn during linking phase - attr[name] = interpolateFn(scope); - - ($$observers[name] || ($$observers[name] = [])).$$inter = true; - (attr.$$observers && attr.$$observers[name].$$scope || scope). - $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) { - //special case for class attribute addition + removal - //so that class changes can tap into the animation - //hooks provided by the $animate service. Be sure to - //skip animations when the first digest occurs (when - //both the new and the old values are the same) since - //the CSS classes are the non-interpolated values - if (name === 'class' && newValue != oldValue) { - attr.$updateClass(newValue, oldValue); - } else { - attr.$set(name, newValue); - } - }); - } - }; - } - }); + return headersObj; + }; } /** - * This is a special jqLite.replaceWith, which can replace items which - * have no parents, provided that the containing jqLite collection is provided. - * - * @param {JqLite=} $rootElement The root of the compile tree. Used so that we can replace nodes - * in the root of the tree. - * @param {JqLite} elementsToRemove The jqLite element which we are going to replace. We keep - * the shell, but replace its DOM node reference. - * @param {Node} newNode The new DOM node. + * Chain all given functions + * + * This function is used for both request and response transforming + * + * @param {*} data Data to transform. + * @param {function(string=)} headers HTTP headers getter fn. + * @param {number} status HTTP status code of the response. + * @param {(Function|Array.)} fns Function or an array of functions. + * @returns {*} Transformed data. */ - function replaceWith($rootElement, elementsToRemove, newNode) { - var firstElementToRemove = elementsToRemove[0], - removeCount = elementsToRemove.length, - parent = firstElementToRemove.parentNode, - i, ii; - - if ($rootElement) { - for (i = 0, ii = $rootElement.length; i < ii; i++) { - if ($rootElement[i] == firstElementToRemove) { - $rootElement[i++] = newNode; - for (var j = i, j2 = j + removeCount - 1, - jj = $rootElement.length; - j < jj; j++, j2++) { - if (j2 < jj) { - $rootElement[j] = $rootElement[j2]; - } else { - delete $rootElement[j]; - } - } - $rootElement.length -= removeCount - 1; - - // If the replaced element is also the jQuery .context then replace it - // .context is a deprecated jQuery api, so we should set it only when jQuery set it - // http://api.jquery.com/context/ - if ($rootElement.context === firstElementToRemove) { - $rootElement.context = newNode; - } - break; - } + function transformData(data, headers, status, fns) { + if (isFunction(fns)) { + return fns(data, headers, status); } - } - - if (parent) { - parent.replaceChild(newNode, firstElementToRemove); - } - - // Append all the `elementsToRemove` to a fragment. This will... - // - remove them from the DOM - // - allow them to still be traversed with .nextSibling - // - allow a single fragment.qSA to fetch all elements being removed - var fragment = window.document.createDocumentFragment(); - for (i = 0; i < removeCount; i++) { - fragment.appendChild(elementsToRemove[i]); - } - - if (jqLite.hasData(firstElementToRemove)) { - // Copy over user data (that includes Angular's $scope etc.). Don't copy private - // data here because there's no public interface in jQuery to do that and copying over - // event listeners (which is the main use of private data) wouldn't work anyway. - jqLite.data(newNode, jqLite.data(firstElementToRemove)); - - // Remove $destroy event listeners from `firstElementToRemove` - jqLite(firstElementToRemove).off('$destroy'); - } - // Cleanup any data/listeners on the elements and children. - // This includes invoking the $destroy event on any elements with listeners. - jqLite.cleanData(fragment.querySelectorAll('*')); + forEach(fns, function (fn) { + data = fn(data, headers, status); + }); - // Update the jqLite collection to only contain the `newNode` - for (i = 1; i < removeCount; i++) { - delete elementsToRemove[i]; - } - elementsToRemove[0] = newNode; - elementsToRemove.length = 1; + return data; } - function cloneAndAnnotateFn(fn, annotation) { - return extend(function() { return fn.apply(null, arguments); }, fn, annotation); + function isSuccess(status) { + return 200 <= status && status < 300; } - function invokeLinkFn(linkFn, scope, $element, attrs, controllers, transcludeFn) { - try { - linkFn(scope, $element, attrs, controllers, transcludeFn); - } catch (e) { - $exceptionHandler(e, startingTag($element)); - } - } + /** + * @ngdoc provider + * @name $httpProvider + * @description + * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service. + * */ + function $HttpProvider() { + /** + * @ngdoc property + * @name $httpProvider#defaults + * @description + * + * Object containing default values for all {@link ng.$http $http} requests. + * + * - **`defaults.cache`** - {boolean|Object} - A boolean value or object created with + * {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of HTTP responses + * by default. See {@link $http#caching $http Caching} for more information. + * + * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token. + * Defaults value is `'XSRF-TOKEN'`. + * + * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the + * XSRF token. Defaults value is `'X-XSRF-TOKEN'`. + * + * - **`defaults.headers`** - {Object} - Default headers for all $http requests. + * Refer to {@link ng.$http#setting-http-headers $http} for documentation on + * setting default headers. + * - **`defaults.headers.common`** + * - **`defaults.headers.post`** + * - **`defaults.headers.put`** + * - **`defaults.headers.patch`** + * + * + * - **`defaults.paramSerializer`** - `{string|function(Object):string}` - A function + * used to the prepare string representation of request parameters (specified as an object). + * If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}. + * Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}. + * + **/ + var defaults = this.defaults = { + // transform incoming response data + transformResponse: [defaultHttpResponseTransform], + + // transform outgoing request data + transformRequest: [function (d) { + return isObject(d) && !isFile(d) && !isBlob(d) && !isFormData(d) ? toJson(d) : d; + }], + + // default headers + headers: { + common: { + 'Accept': 'application/json, text/plain, */*' + }, + post: shallowCopy(CONTENT_TYPE_APPLICATION_JSON), + put: shallowCopy(CONTENT_TYPE_APPLICATION_JSON), + patch: shallowCopy(CONTENT_TYPE_APPLICATION_JSON) + }, + xsrfCookieName: 'XSRF-TOKEN', + xsrfHeaderName: 'X-XSRF-TOKEN', - // Set up $watches for isolate scope and controller bindings. This process - // only occurs for isolate scopes and new scopes with controllerAs. - function initializeDirectiveBindings(scope, attrs, destination, bindings, directive) { - var removeWatchCollection = []; - var initialChanges = {}; - var changes; - forEach(bindings, function initializeBinding(definition, scopeName) { - var attrName = definition.attrName, - optional = definition.optional, - mode = definition.mode, // @, =, or & - lastValue, - parentGet, parentSet, compare, removeWatch; - - switch (mode) { - - case '@': - if (!optional && !hasOwnProperty.call(attrs, attrName)) { - destination[scopeName] = attrs[attrName] = void 0; - } - attrs.$observe(attrName, function(value) { - if (isString(value) || isBoolean(value)) { - var oldValue = destination[scopeName]; - recordChanges(scopeName, value, oldValue); - destination[scopeName] = value; - } - }); - attrs.$$observers[attrName].$$scope = scope; - lastValue = attrs[attrName]; - if (isString(lastValue)) { - // If the attribute has been provided then we trigger an interpolation to ensure - // the value is there for use in the link fn - destination[scopeName] = $interpolate(lastValue)(scope); - } else if (isBoolean(lastValue)) { - // If the attributes is one of the BOOLEAN_ATTR then Angular will have converted - // the value to boolean rather than a string, so we special case this situation - destination[scopeName] = lastValue; - } - initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]); - break; - - case '=': - if (!hasOwnProperty.call(attrs, attrName)) { - if (optional) break; - attrs[attrName] = void 0; - } - if (optional && !attrs[attrName]) break; - - parentGet = $parse(attrs[attrName]); - if (parentGet.literal) { - compare = equals; - } else { - compare = function simpleCompare(a, b) { return a === b || (a !== a && b !== b); }; - } - parentSet = parentGet.assign || function() { - // reset the change, or we will throw this exception on every $digest - lastValue = destination[scopeName] = parentGet(scope); - throw $compileMinErr('nonassign', - "Expression '{0}' in attribute '{1}' used with directive '{2}' is non-assignable!", - attrs[attrName], attrName, directive.name); - }; - lastValue = destination[scopeName] = parentGet(scope); - var parentValueWatch = function parentValueWatch(parentValue) { - if (!compare(parentValue, destination[scopeName])) { - // we are out of sync and need to copy - if (!compare(parentValue, lastValue)) { - // parent changed and it has precedence - destination[scopeName] = parentValue; - } else { - // if the parent can be assigned then do so - parentSet(scope, parentValue = destination[scopeName]); - } - } - return lastValue = parentValue; - }; - parentValueWatch.$stateful = true; - if (definition.collection) { - removeWatch = scope.$watchCollection(attrs[attrName], parentValueWatch); - } else { - removeWatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal); - } - removeWatchCollection.push(removeWatch); - break; + paramSerializer: '$httpParamSerializer' + }; - case '<': - if (!hasOwnProperty.call(attrs, attrName)) { - if (optional) break; - attrs[attrName] = void 0; + var useApplyAsync = false; + /** + * @ngdoc method + * @name $httpProvider#useApplyAsync + * @description + * + * Configure $http service to combine processing of multiple http responses received at around + * the same time via {@link ng.$rootScope.Scope#$applyAsync $rootScope.$applyAsync}. This can result in + * significant performance improvement for bigger applications that make many HTTP requests + * concurrently (common during application bootstrap). + * + * Defaults to false. If no value is specified, returns the current configured value. + * + * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred + * "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window + * to load and share the same digest cycle. + * + * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining. + * otherwise, returns the current configured value. + **/ + this.useApplyAsync = function (value) { + if (isDefined(value)) { + useApplyAsync = !!value; + return this; } - if (optional && !attrs[attrName]) break; - - parentGet = $parse(attrs[attrName]); + return useApplyAsync; + }; - destination[scopeName] = parentGet(scope); - initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]); + var useLegacyPromise = true; + /** + * @ngdoc method + * @name $httpProvider#useLegacyPromiseExtensions + * @description + * + * Configure `$http` service to return promises without the shorthand methods `success` and `error`. + * This should be used to make sure that applications work without these methods. + * + * Defaults to true. If no value is specified, returns the current configured value. + * + * @param {boolean=} value If true, `$http` will return a promise with the deprecated legacy `success` and `error` methods. + * + * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining. + * otherwise, returns the current configured value. + **/ + this.useLegacyPromiseExtensions = function (value) { + if (isDefined(value)) { + useLegacyPromise = !!value; + return this; + } + return useLegacyPromise; + }; - removeWatch = scope.$watch(parentGet, function parentValueWatchAction(newValue, oldValue) { - if (newValue === oldValue) { - // If the new and old values are identical then this is the first time the watch has been triggered - // So instead we use the current value on the destination as the old value - oldValue = destination[scopeName]; - } - recordChanges(scopeName, newValue, oldValue); - destination[scopeName] = newValue; - }, parentGet.literal); + /** + * @ngdoc property + * @name $httpProvider#interceptors + * @description + * + * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http} + * pre-processing of request or postprocessing of responses. + * + * These service factories are ordered by request, i.e. they are applied in the same order as the + * array, on request, but reverse order, on response. + * + * {@link ng.$http#interceptors Interceptors detailed info} + **/ + var interceptorFactories = this.interceptors = []; + + this.$get = ['$httpBackend', '$$cookieReader', '$cacheFactory', '$rootScope', '$q', '$injector', + function ($httpBackend, $$cookieReader, $cacheFactory, $rootScope, $q, $injector) { + + var defaultCache = $cacheFactory('$http'); + + /** + * Make sure that default param serializer is exposed as a function + */ + defaults.paramSerializer = isString(defaults.paramSerializer) ? + $injector.get(defaults.paramSerializer) : defaults.paramSerializer; + + /** + * Interceptors stored in reverse order. Inner interceptors before outer interceptors. + * The reversal is needed so that we can build up the interception chain around the + * server request. + */ + var reversedInterceptors = []; + + forEach(interceptorFactories, function (interceptorFactory) { + reversedInterceptors.unshift(isString(interceptorFactory) + ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory)); + }); - removeWatchCollection.push(removeWatch); - break; + /** + * @ngdoc service + * @kind function + * @name $http + * @requires ng.$httpBackend + * @requires $cacheFactory + * @requires $rootScope + * @requires $q + * @requires $injector + * + * @description + * The `$http` service is a core Angular service that facilitates communication with the remote + * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest) + * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP). + * + * For unit testing applications that use `$http` service, see + * {@link ngMock.$httpBackend $httpBackend mock}. + * + * For a higher level of abstraction, please check out the {@link ngResource.$resource + * $resource} service. + * + * The $http API is based on the {@link ng.$q deferred/promise APIs} exposed by + * the $q service. While for simple usage patterns this doesn't matter much, for advanced usage + * it is important to familiarize yourself with these APIs and the guarantees they provide. + * + * + * ## General usage + * The `$http` service is a function which takes a single argument — a {@link $http#usage configuration object} — + * that is used to generate an HTTP request and returns a {@link ng.$q promise}. + * + * ```js + * // Simple GET request example: + * $http({ + * method: 'GET', + * url: '/someUrl' + * }).then(function successCallback(response) { + * // this callback will be called asynchronously + * // when the response is available + * }, function errorCallback(response) { + * // called asynchronously if an error occurs + * // or server returns response with an error status. + * }); + * ``` + * + * The response object has these properties: + * + * - **data** – `{string|Object}` – The response body transformed with the transform + * functions. + * - **status** – `{number}` – HTTP status code of the response. + * - **headers** – `{function([headerName])}` – Header getter function. + * - **config** – `{Object}` – The configuration object that was used to generate the request. + * - **statusText** – `{string}` – HTTP status text of the response. + * + * A response status code between 200 and 299 is considered a success status and + * will result in the success callback being called. Note that if the response is a redirect, + * XMLHttpRequest will transparently follow it, meaning that the error callback will not be + * called for such responses. + * + * + * ## Shortcut methods + * + * Shortcut methods are also available. All shortcut methods require passing in the URL, and + * request data must be passed in for POST/PUT requests. An optional config can be passed as the + * last argument. + * + * ```js + * $http.get('/someUrl', config).then(successCallback, errorCallback); + * $http.post('/someUrl', data, config).then(successCallback, errorCallback); + * ``` + * + * Complete list of shortcut methods: + * + * - {@link ng.$http#get $http.get} + * - {@link ng.$http#head $http.head} + * - {@link ng.$http#post $http.post} + * - {@link ng.$http#put $http.put} + * - {@link ng.$http#delete $http.delete} + * - {@link ng.$http#jsonp $http.jsonp} + * - {@link ng.$http#patch $http.patch} + * + * + * ## Writing Unit Tests that use $http + * When unit testing (using {@link ngMock ngMock}), it is necessary to call + * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending + * request using trained responses. + * + * ``` + * $httpBackend.expectGET(...); + * $http.get(...); + * $httpBackend.flush(); + * ``` + * + * ## Deprecation Notice + *
+ * The `$http` legacy promise methods `success` and `error` have been deprecated. + * Use the standard `then` method instead. + * If {@link $httpProvider#useLegacyPromiseExtensions `$httpProvider.useLegacyPromiseExtensions`} is set to + * `false` then these methods will throw {@link $http:legacy `$http/legacy`} error. + *
+ * + * ## Setting HTTP Headers + * + * The $http service will automatically add certain HTTP headers to all requests. These defaults + * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration + * object, which currently contains this default configuration: + * + * - `$httpProvider.defaults.headers.common` (headers that are common for all requests): + * - `Accept: application/json, text/plain, * / *` + * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests) + * - `Content-Type: application/json` + * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests) + * - `Content-Type: application/json` + * + * To add or overwrite these defaults, simply add or remove a property from these configuration + * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object + * with the lowercased HTTP method name as the key, e.g. + * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }`. + * + * The defaults can also be set at runtime via the `$http.defaults` object in the same + * fashion. For example: + * + * ``` + * module.run(function($http) { + * $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w'; + * }); + * ``` + * + * In addition, you can supply a `headers` property in the config object passed when + * calling `$http(config)`, which overrides the defaults without changing them globally. + * + * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis, + * Use the `headers` property, setting the desired header to `undefined`. For example: + * + * ```js + * var req = { + * method: 'POST', + * url: 'http://example.com', + * headers: { + * 'Content-Type': undefined + * }, + * data: { test: 'test' } + * } + * + * $http(req).then(function(){...}, function(){...}); + * ``` + * + * ## Transforming Requests and Responses + * + * Both requests and responses can be transformed using transformation functions: `transformRequest` + * and `transformResponse`. These properties can be a single function that returns + * the transformed value (`function(data, headersGetter, status)`) or an array of such transformation functions, + * which allows you to `push` or `unshift` a new transformation function into the transformation chain. + * + *
+ * **Note:** Angular does not make a copy of the `data` parameter before it is passed into the `transformRequest` pipeline. + * That means changes to the properties of `data` are not local to the transform function (since Javascript passes objects by reference). + * For example, when calling `$http.get(url, $scope.myObject)`, modifications to the object's properties in a transformRequest + * function will be reflected on the scope and in any templates where the object is data-bound. + * To prevent this, transform functions should have no side-effects. + * If you need to modify properties, it is recommended to make a copy of the data, or create new object to return. + *
+ * + * ### Default Transformations + * + * The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and + * `defaults.transformResponse` properties. If a request does not provide its own transformations + * then these will be applied. + * + * You can augment or replace the default transformations by modifying these properties by adding to or + * replacing the array. + * + * Angular provides the following default transformations: + * + * Request transformations (`$httpProvider.defaults.transformRequest` and `$http.defaults.transformRequest`): + * + * - If the `data` property of the request configuration object contains an object, serialize it + * into JSON format. + * + * Response transformations (`$httpProvider.defaults.transformResponse` and `$http.defaults.transformResponse`): + * + * - If XSRF prefix is detected, strip it (see Security Considerations section below). + * - If JSON response is detected, deserialize it using a JSON parser. + * + * + * ### Overriding the Default Transformations Per Request + * + * If you wish override the request/response transformations only for a single request then provide + * `transformRequest` and/or `transformResponse` properties on the configuration object passed + * into `$http`. + * + * Note that if you provide these properties on the config object the default transformations will be + * overwritten. If you wish to augment the default transformations then you must include them in your + * local transformation array. + * + * The following code demonstrates adding a new response transformation to be run after the default response + * transformations have been run. + * + * ```js + * function appendTransform(defaults, transform) { + * + * // We can't guarantee that the default transformation is an array + * defaults = angular.isArray(defaults) ? defaults : [defaults]; + * + * // Append the new transformation to the defaults + * return defaults.concat(transform); + * } + * + * $http({ + * url: '...', + * method: 'GET', + * transformResponse: appendTransform($http.defaults.transformResponse, function(value) { + * return doTransform(value); + * }) + * }); + * ``` + * + * + * ## Caching + * + * {@link ng.$http `$http`} responses are not cached by default. To enable caching, you must + * set the config.cache value or the default cache value to TRUE or to a cache object (created + * with {@link ng.$cacheFactory `$cacheFactory`}). If defined, the value of config.cache takes + * precedence over the default cache value. + * + * In order to: + * * cache all responses - set the default cache value to TRUE or to a cache object + * * cache a specific response - set config.cache value to TRUE or to a cache object + * + * If caching is enabled, but neither the default cache nor config.cache are set to a cache object, + * then the default `$cacheFactory($http)` object is used. + * + * The default cache value can be set by updating the + * {@link ng.$http#defaults `$http.defaults.cache`} property or the + * {@link $httpProvider#defaults `$httpProvider.defaults.cache`} property. + * + * When caching is enabled, {@link ng.$http `$http`} stores the response from the server using + * the relevant cache object. The next time the same request is made, the response is returned + * from the cache without sending a request to the server. + * + * Take note that: + * + * * Only GET and JSONP requests are cached. + * * The cache key is the request URL including search parameters; headers are not considered. + * * Cached responses are returned asynchronously, in the same way as responses from the server. + * * If multiple identical requests are made using the same cache, which is not yet populated, + * one request will be made to the server and remaining requests will return the same response. + * * A cache-control header on the response does not affect if or how responses are cached. + * + * + * ## Interceptors + * + * Before you start creating interceptors, be sure to understand the + * {@link ng.$q $q and deferred/promise APIs}. + * + * For purposes of global error handling, authentication, or any kind of synchronous or + * asynchronous pre-processing of request or postprocessing of responses, it is desirable to be + * able to intercept requests before they are handed to the server and + * responses before they are handed over to the application code that + * initiated these requests. The interceptors leverage the {@link ng.$q + * promise APIs} to fulfill this need for both synchronous and asynchronous pre-processing. + * + * The interceptors are service factories that are registered with the `$httpProvider` by + * adding them to the `$httpProvider.interceptors` array. The factory is called and + * injected with dependencies (if specified) and returns the interceptor. + * + * There are two kinds of interceptors (and two kinds of rejection interceptors): + * + * * `request`: interceptors get called with a http {@link $http#usage config} object. The function is free to + * modify the `config` object or create a new one. The function needs to return the `config` + * object directly, or a promise containing the `config` or a new `config` object. + * * `requestError`: interceptor gets called when a previous interceptor threw an error or + * resolved with a rejection. + * * `response`: interceptors get called with http `response` object. The function is free to + * modify the `response` object or create a new one. The function needs to return the `response` + * object directly, or as a promise containing the `response` or a new `response` object. + * * `responseError`: interceptor gets called when a previous interceptor threw an error or + * resolved with a rejection. + * + * + * ```js + * // register the interceptor as a service + * $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) { + * return { + * // optional method + * 'request': function(config) { + * // do something on success + * return config; + * }, + * + * // optional method + * 'requestError': function(rejection) { + * // do something on error + * if (canRecover(rejection)) { + * return responseOrNewPromise + * } + * return $q.reject(rejection); + * }, + * + * + * + * // optional method + * 'response': function(response) { + * // do something on success + * return response; + * }, + * + * // optional method + * 'responseError': function(rejection) { + * // do something on error + * if (canRecover(rejection)) { + * return responseOrNewPromise + * } + * return $q.reject(rejection); + * } + * }; + * }); + * + * $httpProvider.interceptors.push('myHttpInterceptor'); + * + * + * // alternatively, register the interceptor via an anonymous factory + * $httpProvider.interceptors.push(function($q, dependency1, dependency2) { + * return { + * 'request': function(config) { + * // same as above + * }, + * + * 'response': function(response) { + * // same as above + * } + * }; + * }); + * ``` + * + * ## Security Considerations + * + * When designing web applications, consider security threats from: + * + * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx) + * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) + * + * Both server and the client must cooperate in order to eliminate these threats. Angular comes + * pre-configured with strategies that address these issues, but for this to work backend server + * cooperation is required. + * + * ### JSON Vulnerability Protection + * + * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx) + * allows third party website to turn your JSON resource URL into + * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To + * counter this your server can prefix all JSON requests with following string `")]}',\n"`. + * Angular will automatically strip the prefix before processing it as JSON. + * + * For example if your server needs to return: + * ```js + * ['one','two'] + * ``` + * + * which is vulnerable to attack, your server can return: + * ```js + * )]}', + * ['one','two'] + * ``` + * + * Angular will strip the prefix, before processing the JSON. + * + * + * ### Cross Site Request Forgery (XSRF) Protection + * + * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is an attack technique by + * which the attacker can trick an authenticated user into unknowingly executing actions on your + * website. Angular provides a mechanism to counter XSRF. When performing XHR requests, the + * $http service reads a token from a cookie (by default, `XSRF-TOKEN`) and sets it as an HTTP + * header (`X-XSRF-TOKEN`). Since only JavaScript that runs on your domain could read the + * cookie, your server can be assured that the XHR came from JavaScript running on your domain. + * The header will not be set for cross-domain requests. + * + * To take advantage of this, your server needs to set a token in a JavaScript readable session + * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the + * server can verify that the cookie matches `X-XSRF-TOKEN` HTTP header, and therefore be sure + * that only JavaScript running on your domain could have sent the request. The token must be + * unique for each user and must be verifiable by the server (to prevent the JavaScript from + * making up its own tokens). We recommend that the token is a digest of your site's + * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography)) + * for added security. + * + * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName + * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time, + * or the per-request config object. + * + * In order to prevent collisions in environments where multiple Angular apps share the + * same domain or subdomain, we recommend that each application uses unique cookie name. + * + * @param {object} config Object describing the request to be made and how it should be + * processed. The object has following properties: + * + * - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc) + * - **url** – `{string}` – Absolute or relative URL of the resource that is being requested. + * - **params** – `{Object.}` – Map of strings or objects which will be serialized + * with the `paramSerializer` and appended as GET parameters. + * - **data** – `{string|Object}` – Data to be sent as the request message data. + * - **headers** – `{Object}` – Map of strings or functions which return strings representing + * HTTP headers to send to the server. If the return value of a function is null, the + * header will not be sent. Functions accept a config object as an argument. + * - **eventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest object. + * To bind events to the XMLHttpRequest upload object, use `uploadEventHandlers`. + * The handler will be called in the context of a `$apply` block. + * - **uploadEventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest upload + * object. To bind events to the XMLHttpRequest object, use `eventHandlers`. + * The handler will be called in the context of a `$apply` block. + * - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token. + * - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token. + * - **transformRequest** – + * `{function(data, headersGetter)|Array.}` – + * transform function or an array of such functions. The transform function takes the http + * request body and headers and returns its transformed (typically serialized) version. + * See {@link ng.$http#overriding-the-default-transformations-per-request + * Overriding the Default Transformations} + * - **transformResponse** – + * `{function(data, headersGetter, status)|Array.}` – + * transform function or an array of such functions. The transform function takes the http + * response body, headers and status and returns its transformed (typically deserialized) version. + * See {@link ng.$http#overriding-the-default-transformations-per-request + * Overriding the Default Transformations} + * - **paramSerializer** - `{string|function(Object):string}` - A function used to + * prepare the string representation of request parameters (specified as an object). + * If specified as string, it is interpreted as function registered with the + * {@link $injector $injector}, which means you can create your own serializer + * by registering it as a {@link auto.$provide#service service}. + * The default serializer is the {@link $httpParamSerializer $httpParamSerializer}; + * alternatively, you can use the {@link $httpParamSerializerJQLike $httpParamSerializerJQLike} + * - **cache** – `{boolean|Object}` – A boolean value or object created with + * {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of the HTTP response. + * See {@link $http#caching $http Caching} for more information. + * - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise} + * that should abort the request when resolved. + * - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the + * XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials) + * for more information. + * - **responseType** - `{string}` - see + * [XMLHttpRequest.responseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype). + * + * @returns {HttpPromise} Returns a {@link ng.$q `Promise}` that will be resolved to a response object + * when the request succeeds or fails. + * + * + * @property {Array.} pendingRequests Array of config objects for currently pending + * requests. This is primarily meant to be used for debugging purposes. + * + * + * @example + + +
+ + +
+ + + + 
http status code: {{status}}
+ 
http response data: {{data}}
+
+ + + angular.module('httpExample', []) + .controller('FetchController', ['$scope', '$http', '$templateCache', + function($scope, $http, $templateCache) { + $scope.method = 'GET'; + $scope.url = 'http-hello.html'; - case '&': - // Don't assign Object.prototype method to scope - parentGet = attrs.hasOwnProperty(attrName) ? $parse(attrs[attrName]) : noop; + $scope.fetch = function() { + $scope.code = null; + $scope.response = null; - // Don't assign noop to destination if expression is not valid - if (parentGet === noop && optional) break; + $http({method: $scope.method, url: $scope.url, cache: $templateCache}). + then(function(response) { + $scope.status = response.status; + $scope.data = response.data; + }, function(response) { + $scope.data = response.data || "Request failed"; + $scope.status = response.status; + }); + }; - destination[scopeName] = function(locals) { - return parentGet(scope, locals); - }; - break; - } - }); + $scope.updateModel = function(method, url) { + $scope.method = method; + $scope.url = url; + }; + }]); + + + Hello, $http! + + + var status = element(by.binding('status')); + var data = element(by.binding('data')); + var fetchBtn = element(by.id('fetchbtn')); + var sampleGetBtn = element(by.id('samplegetbtn')); + var sampleJsonpBtn = element(by.id('samplejsonpbtn')); + var invalidJsonpBtn = element(by.id('invalidjsonpbtn')); + + it('should make an xhr GET request', function() { + sampleGetBtn.click(); + fetchBtn.click(); + expect(status.getText()).toMatch('200'); + expect(data.getText()).toMatch(/Hello, \$http!/); + }); - function recordChanges(key, currentValue, previousValue) { - if (isFunction(destination.$onChanges) && currentValue !== previousValue) { - // If we have not already scheduled the top level onChangesQueue handler then do so now - if (!onChangesQueue) { - scope.$$postDigest(flushOnChangesQueue); - onChangesQueue = []; - } - // If we have not already queued a trigger of onChanges for this controller then do so now - if (!changes) { - changes = {}; - onChangesQueue.push(triggerOnChangesHook); - } - // If the has been a change on this property already then we need to reuse the previous value - if (changes[key]) { - previousValue = changes[key].previousValue; - } - // Store this change - changes[key] = new SimpleChange(previousValue, currentValue); - } - } + // Commented out due to flakes. See https://github.com/angular/angular.js/issues/9185 + // it('should make a JSONP request to angularjs.org', function() { +// sampleJsonpBtn.click(); +// fetchBtn.click(); +// expect(status.getText()).toMatch('200'); +// expect(data.getText()).toMatch(/Super Hero!/); +// }); - function triggerOnChangesHook() { - destination.$onChanges(changes); - // Now clear the changes so that we schedule onChanges when more changes arrive - changes = undefined; - } + it('should make JSONP request to invalid URL and invoke the error handler', + function() { + invalidJsonpBtn.click(); + fetchBtn.click(); + expect(status.getText()).toMatch('0'); + expect(data.getText()).toMatch('Request failed'); + }); + + + */ + function $http(requestConfig) { - return { - initialChanges: initialChanges, - removeWatches: removeWatchCollection.length && function removeWatches() { - for (var i = 0, ii = removeWatchCollection.length; i < ii; ++i) { - removeWatchCollection[i](); - } - } - }; - } - }]; -} + if (!isObject(requestConfig)) { + throw minErr('$http')('badreq', 'Http request configuration must be an object. Received: {0}', requestConfig); + } -function SimpleChange(previous, current) { - this.previousValue = previous; - this.currentValue = current; -} -SimpleChange.prototype.isFirstChange = function() { return this.previousValue === _UNINITIALIZED_VALUE; }; + if (!isString(requestConfig.url)) { + throw minErr('$http')('badreq', 'Http request configuration url must be a string. Received: {0}', requestConfig.url); + } + var config = extend({ + method: 'get', + transformRequest: defaults.transformRequest, + transformResponse: defaults.transformResponse, + paramSerializer: defaults.paramSerializer + }, requestConfig); + + config.headers = mergeHeaders(requestConfig); + config.method = uppercase(config.method); + config.paramSerializer = isString(config.paramSerializer) ? + $injector.get(config.paramSerializer) : config.paramSerializer; + + var serverRequest = function (config) { + var headers = config.headers; + var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest); + + // strip content-type if data is undefined + if (isUndefined(reqData)) { + forEach(headers, function (value, header) { + if (lowercase(header) === 'content-type') { + delete headers[header]; + } + }); + } + + if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) { + config.withCredentials = defaults.withCredentials; + } + + // send request + return sendReq(config, reqData).then(transformResponse, transformResponse); + }; + + var chain = [serverRequest, undefined]; + var promise = $q.when(config); + + // apply interceptors + forEach(reversedInterceptors, function (interceptor) { + if (interceptor.request || interceptor.requestError) { + chain.unshift(interceptor.request, interceptor.requestError); + } + if (interceptor.response || interceptor.responseError) { + chain.push(interceptor.response, interceptor.responseError); + } + }); + + while (chain.length) { + var thenFn = chain.shift(); + var rejectFn = chain.shift(); + + promise = promise.then(thenFn, rejectFn); + } -var PREFIX_REGEXP = /^((?:x|data)[\:\-_])/i; -/** - * Converts all accepted directives format into proper directive name. - * @param name Name to normalize - */ -function directiveNormalize(name) { - return camelCase(name.replace(PREFIX_REGEXP, '')); -} + if (useLegacyPromise) { + promise.success = function (fn) { + assertArgFn(fn, 'fn'); -/** - * @ngdoc type - * @name $compile.directive.Attributes - * - * @description - * A shared object between directive compile / linking functions which contains normalized DOM - * element attributes. The values reflect current binding state `{{ }}`. The normalization is - * needed since all of these are treated as equivalent in Angular: - * - * ``` - * - * ``` - */ + promise.then(function (response) { + fn(response.data, response.status, response.headers, config); + }); + return promise; + }; -/** - * @ngdoc property - * @name $compile.directive.Attributes#$attr - * - * @description - * A map of DOM element attribute names to the normalized name. This is - * needed to do reverse lookup from normalized name back to actual name. - */ + promise.error = function (fn) { + assertArgFn(fn, 'fn'); + promise.then(null, function (response) { + fn(response.data, response.status, response.headers, config); + }); + return promise; + }; + } else { + promise.success = $httpMinErrLegacyFn('success'); + promise.error = $httpMinErrLegacyFn('error'); + } -/** - * @ngdoc method - * @name $compile.directive.Attributes#$set - * @kind function - * - * @description - * Set DOM element attribute value. - * - * - * @param {string} name Normalized element attribute name of the property to modify. The name is - * reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr} - * property to the original name. - * @param {string} value Value to set the attribute to. The value can be an interpolated string. - */ + return promise; + function transformResponse(response) { + // make a copy since the response must be cacheable + var resp = extend({}, response); + resp.data = transformData(response.data, response.headers, response.status, + config.transformResponse); + return (isSuccess(response.status)) + ? resp + : $q.reject(resp); + } + function executeHeaderFns(headers, config) { + var headerContent, processedHeaders = {}; + + forEach(headers, function (headerFn, header) { + if (isFunction(headerFn)) { + headerContent = headerFn(config); + if (headerContent != null) { + processedHeaders[header] = headerContent; + } + } else { + processedHeaders[header] = headerFn; + } + }); -/** - * Closure compiler type information - */ + return processedHeaders; + } -function nodesetLinkingFn( - /* angular.Scope */ scope, - /* NodeList */ nodeList, - /* Element */ rootElement, - /* function(Function) */ boundTranscludeFn -) {} - -function directiveLinkingFn( - /* nodesetLinkingFn */ nodesetLinkingFn, - /* angular.Scope */ scope, - /* Node */ node, - /* Element */ rootElement, - /* function(Function) */ boundTranscludeFn -) {} - -function tokenDifference(str1, str2) { - var values = '', - tokens1 = str1.split(/\s+/), - tokens2 = str2.split(/\s+/); - - outer: - for (var i = 0; i < tokens1.length; i++) { - var token = tokens1[i]; - for (var j = 0; j < tokens2.length; j++) { - if (token == tokens2[j]) continue outer; - } - values += (values.length > 0 ? ' ' : '') + token; - } - return values; -} - -function removeComments(jqNodes) { - jqNodes = jqLite(jqNodes); - var i = jqNodes.length; - - if (i <= 1) { - return jqNodes; - } - - while (i--) { - var node = jqNodes[i]; - if (node.nodeType === NODE_TYPE_COMMENT) { - splice.call(jqNodes, i, 1); - } - } - return jqNodes; -} + function mergeHeaders(config) { + var defHeaders = defaults.headers, + reqHeaders = extend({}, config.headers), + defHeaderName, lowercaseDefHeaderName, reqHeaderName; -var $controllerMinErr = minErr('$controller'); + defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]); + // using for-in instead of forEach to avoid unnecessary iteration after header has been found + defaultHeadersIteration: + for (defHeaderName in defHeaders) { + lowercaseDefHeaderName = lowercase(defHeaderName); -var CNTRL_REG = /^(\S+)(\s+as\s+([\w$]+))?$/; -function identifierForController(controller, ident) { - if (ident && isString(ident)) return ident; - if (isString(controller)) { - var match = CNTRL_REG.exec(controller); - if (match) return match[3]; - } -} + for (reqHeaderName in reqHeaders) { + if (lowercase(reqHeaderName) === lowercaseDefHeaderName) { + continue defaultHeadersIteration; + } + } + reqHeaders[defHeaderName] = defHeaders[defHeaderName]; + } -/** - * @ngdoc provider - * @name $controllerProvider - * @description - * The {@link ng.$controller $controller service} is used by Angular to create new - * controllers. - * - * This provider allows controller registration via the - * {@link ng.$controllerProvider#register register} method. - */ -function $ControllerProvider() { - var controllers = {}, - globals = false; - - /** - * @ngdoc method - * @name $controllerProvider#has - * @param {string} name Controller name to check. - */ - this.has = function(name) { - return controllers.hasOwnProperty(name); - }; - - /** - * @ngdoc method - * @name $controllerProvider#register - * @param {string|Object} name Controller name, or an object map of controllers where the keys are - * the names and the values are the constructors. - * @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI - * annotations in the array notation). - */ - this.register = function(name, constructor) { - assertNotHasOwnProperty(name, 'controller'); - if (isObject(name)) { - extend(controllers, name); - } else { - controllers[name] = constructor; - } - }; + // execute if header value is a function for merged headers + return executeHeaderFns(reqHeaders, shallowCopy(config)); + } + } - /** - * @ngdoc method - * @name $controllerProvider#allowGlobals - * @description If called, allows `$controller` to find controller constructors on `window` - */ - this.allowGlobals = function() { - globals = true; - }; + $http.pendingRequests = []; + + /** + * @ngdoc method + * @name $http#get + * + * @description + * Shortcut method to perform `GET` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + + /** + * @ngdoc method + * @name $http#delete + * + * @description + * Shortcut method to perform `DELETE` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + + /** + * @ngdoc method + * @name $http#head + * + * @description + * Shortcut method to perform `HEAD` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + + /** + * @ngdoc method + * @name $http#jsonp + * + * @description + * Shortcut method to perform `JSONP` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request. + * The name of the callback should be the string `JSON_CALLBACK`. + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + createShortMethods('get', 'delete', 'head', 'jsonp'); + + /** + * @ngdoc method + * @name $http#post + * + * @description + * Shortcut method to perform `POST` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {*} data Request content + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + + /** + * @ngdoc method + * @name $http#put + * + * @description + * Shortcut method to perform `PUT` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {*} data Request content + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + + /** + * @ngdoc method + * @name $http#patch + * + * @description + * Shortcut method to perform `PATCH` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {*} data Request content + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + createShortMethodsWithData('post', 'put', 'patch'); + + /** + * @ngdoc property + * @name $http#defaults + * + * @description + * Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of + * default headers, withCredentials as well as request and response transformations. + * + * See "Setting HTTP Headers" and "Transforming Requests and Responses" sections above. + */ + $http.defaults = defaults; + + + return $http; + + + function createShortMethods(names) { + forEach(arguments, function (name) { + $http[name] = function (url, config) { + return $http(extend({}, config || {}, { + method: name, + url: url + })); + }; + }); + } + + + function createShortMethodsWithData(name) { + forEach(arguments, function (name) { + $http[name] = function (url, data, config) { + return $http(extend({}, config || {}, { + method: name, + url: url, + data: data + })); + }; + }); + } + + + /** + * Makes the request. + * + * !!! ACCESSES CLOSURE VARS: + * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests + */ + function sendReq(config, reqData) { + var deferred = $q.defer(), + promise = deferred.promise, + cache, + cachedResp, + reqHeaders = config.headers, + url = buildUrl(config.url, config.paramSerializer(config.params)); + + $http.pendingRequests.push(config); + promise.then(removePendingReq, removePendingReq); + + + if ((config.cache || defaults.cache) && config.cache !== false && + (config.method === 'GET' || config.method === 'JSONP')) { + cache = isObject(config.cache) ? config.cache + : isObject(defaults.cache) ? defaults.cache + : defaultCache; + } + + if (cache) { + cachedResp = cache.get(url); + if (isDefined(cachedResp)) { + if (isPromiseLike(cachedResp)) { + // cached request has already been sent, but there is no response yet + cachedResp.then(resolvePromiseWithResult, resolvePromiseWithResult); + } else { + // serving from cache + if (isArray(cachedResp)) { + resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3]); + } else { + resolvePromise(cachedResp, 200, {}, 'OK'); + } + } + } else { + // put the promise for the non-transformed response into cache as a placeholder + cache.put(url, promise); + } + } + + + // if we won't have the response in cache, set the xsrf headers and + // send the request to the backend + if (isUndefined(cachedResp)) { + var xsrfValue = urlIsSameOrigin(config.url) + ? $$cookieReader()[config.xsrfCookieName || defaults.xsrfCookieName] + : undefined; + if (xsrfValue) { + reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue; + } + + $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout, + config.withCredentials, config.responseType, + createApplyHandlers(config.eventHandlers), + createApplyHandlers(config.uploadEventHandlers)); + } + + return promise; + + function createApplyHandlers(eventHandlers) { + if (eventHandlers) { + var applyHandlers = {}; + forEach(eventHandlers, function (eventHandler, key) { + applyHandlers[key] = function (event) { + if (useApplyAsync) { + $rootScope.$applyAsync(callEventHandler); + } else if ($rootScope.$$phase) { + callEventHandler(); + } else { + $rootScope.$apply(callEventHandler); + } + + function callEventHandler() { + eventHandler(event); + } + }; + }); + return applyHandlers; + } + } + + + /** + * Callback registered to $httpBackend(): + * - caches the response if desired + * - resolves the raw $http promise + * - calls $apply + */ + function done(status, response, headersString, statusText) { + if (cache) { + if (isSuccess(status)) { + cache.put(url, [status, response, parseHeaders(headersString), statusText]); + } else { + // remove promise from the cache + cache.remove(url); + } + } + + function resolveHttpPromise() { + resolvePromise(response, status, headersString, statusText); + } + + if (useApplyAsync) { + $rootScope.$applyAsync(resolveHttpPromise); + } else { + resolveHttpPromise(); + if (!$rootScope.$$phase) $rootScope.$apply(); + } + } + + + /** + * Resolves the raw $http promise. + */ + function resolvePromise(response, status, headers, statusText) { + //status: HTTP response status code, 0, -1 (aborted by timeout / promise) + status = status >= -1 ? status : 0; + + (isSuccess(status) ? deferred.resolve : deferred.reject)({ + data: response, + status: status, + headers: headersGetter(headers), + config: config, + statusText: statusText + }); + } + + function resolvePromiseWithResult(result) { + resolvePromise(result.data, result.status, shallowCopy(result.headers()), result.statusText); + } + + function removePendingReq() { + var idx = $http.pendingRequests.indexOf(config); + if (idx !== -1) $http.pendingRequests.splice(idx, 1); + } + } - this.$get = ['$injector', '$window', function($injector, $window) { + function buildUrl(url, serializedParams) { + if (serializedParams.length > 0) { + url += ((url.indexOf('?') == -1) ? '?' : '&') + serializedParams; + } + return url; + } + }]; + } /** * @ngdoc service - * @name $controller - * @requires $injector + * @name $xhrFactory * - * @param {Function|string} constructor If called with a function then it's considered to be the - * controller constructor function. Otherwise it's considered to be a string which is used - * to retrieve the controller constructor using the following steps: + * @description + * Factory function used to create XMLHttpRequest objects. * - * * check if a controller with given name is registered via `$controllerProvider` - * * check if evaluating the string on the current scope returns a constructor - * * if $controllerProvider#allowGlobals, check `window[constructor]` on the global - * `window` object (not recommended) + * Replace or decorate this service to create your own custom XMLHttpRequest objects. * - * The string can use the `controller as property` syntax, where the controller instance is published - * as the specified property on the `scope`; the `scope` must be injected into `locals` param for this - * to work correctly. + * ``` + * angular.module('myApp', []) + * .factory('$xhrFactory', function() { + * return function createXhr(method, url) { + * return new window.XMLHttpRequest({mozSystem: true}); + * }; + * }); + * ``` * - * @param {Object} locals Injection locals for Controller. - * @return {Object} Instance of given controller. + * @param {string} method HTTP method of the request (GET, POST, PUT, ..) + * @param {string} url URL of the request. + */ + function $xhrFactoryProvider() { + this.$get = function () { + return function createXhr() { + return new window.XMLHttpRequest(); + }; + }; + } + + /** + * @ngdoc service + * @name $httpBackend + * @requires $window + * @requires $document + * @requires $xhrFactory * * @description - * `$controller` service is responsible for instantiating controllers. + * HTTP backend used by the {@link ng.$http service} that delegates to + * XMLHttpRequest object or JSONP and deals with browser incompatibilities. + * + * You should never need to use this service directly, instead use the higher-level abstractions: + * {@link ng.$http $http} or {@link ngResource.$resource $resource}. * - * It's just a simple call to {@link auto.$injector $injector}, but extracted into - * a service, so that one can override this service with [BC version](https://gist.github.com/1649788). + * During testing this implementation is swapped with {@link ngMock.$httpBackend mock + * $httpBackend} which can be trained with responses. */ - return function $controller(expression, locals, later, ident) { - // PRIVATE API: - // param `later` --- indicates that the controller's constructor is invoked at a later time. - // If true, $controller will allocate the object with the correct - // prototype chain, but will not invoke the controller until a returned - // callback is invoked. - // param `ident` --- An optional label which overrides the label parsed from the controller - // expression, if any. - var instance, match, constructor, identifier; - later = later === true; - if (ident && isString(ident)) { - identifier = ident; - } + function $HttpBackendProvider() { + this.$get = ['$browser', '$window', '$document', '$xhrFactory', function ($browser, $window, $document, $xhrFactory) { + return createHttpBackend($browser, $xhrFactory, $browser.defer, $window.angular.callbacks, $document[0]); + }]; + } + + function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) { + // TODO(vojta): fix the signature + return function (method, url, post, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers) { + $browser.$$incOutstandingRequestCount(); + url = url || $browser.url(); + + if (lowercase(method) == 'jsonp') { + var callbackId = '_' + (callbacks.counter++).toString(36); + callbacks[callbackId] = function (data) { + callbacks[callbackId].data = data; + callbacks[callbackId].called = true; + }; - if (isString(expression)) { - match = expression.match(CNTRL_REG); - if (!match) { - throw $controllerMinErr('ctrlfmt', - "Badly formed controller string '{0}'. " + - "Must match `__name__ as __id__` or `__name__`.", expression); - } - constructor = match[1], - identifier = identifier || match[3]; - expression = controllers.hasOwnProperty(constructor) - ? controllers[constructor] - : getter(locals.$scope, constructor, true) || - (globals ? getter($window, constructor, true) : undefined); - - assertArgFn(expression, constructor, true); - } + var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId), + callbackId, function (status, text) { + completeRequest(callback, status, callbacks[callbackId].data, "", text); + callbacks[callbackId] = noop; + }); + } else { - if (later) { - // Instantiate controller later: - // This machinery is used to create an instance of the object before calling the - // controller's constructor itself. - // - // This allows properties to be added to the controller before the constructor is - // invoked. Primarily, this is used for isolate scope bindings in $compile. - // - // This feature is not intended for use by applications, and is thus not documented - // publicly. - // Object creation: http://jsperf.com/create-constructor/2 - var controllerPrototype = (isArray(expression) ? - expression[expression.length - 1] : expression).prototype; - instance = Object.create(controllerPrototype || null); - - if (identifier) { - addIdentifier(locals, identifier, instance, constructor || expression.name); - } + var xhr = createXhr(method, url); - var instantiate; - return instantiate = extend(function $controllerInit() { - var result = $injector.invoke(expression, instance, locals, constructor); - if (result !== instance && (isObject(result) || isFunction(result))) { - instance = result; - if (identifier) { - // If result changed, re-assign controllerAs value to scope. - addIdentifier(locals, identifier, instance, constructor || expression.name); - } - } - return instance; - }, { - instance: instance, - identifier: identifier - }); - } + xhr.open(method, url, true); + forEach(headers, function (value, key) { + if (isDefined(value)) { + xhr.setRequestHeader(key, value); + } + }); - instance = $injector.instantiate(expression, locals, constructor); + xhr.onload = function requestLoaded() { + var statusText = xhr.statusText || ''; - if (identifier) { - addIdentifier(locals, identifier, instance, constructor || expression.name); - } + // responseText is the old-school way of retrieving response (supported by IE9) + // response/responseType properties were introduced in XHR Level2 spec (supported by IE10) + var response = ('response' in xhr) ? xhr.response : xhr.responseText; - return instance; - }; + // normalize IE9 bug (http://bugs.jquery.com/ticket/1450) + var status = xhr.status === 1223 ? 204 : xhr.status; - function addIdentifier(locals, identifier, instance, name) { - if (!(locals && isObject(locals.$scope))) { - throw minErr('$controller')('noscp', - "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.", - name, identifier); - } + // fix status code when it is 0 (0 status is undocumented). + // Occurs when accessing file resources or on Android 4.1 stock browser + // while retrieving files from application cache. + if (status === 0) { + status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0; + } - locals.$scope[identifier] = instance; - } - }]; -} + completeRequest(callback, + status, + response, + xhr.getAllResponseHeaders(), + statusText); + }; -/** - * @ngdoc service - * @name $document - * @requires $window - * - * @description - * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object. - * - * @example - - -
-

$document title:

-

window.document title:

-
- - - angular.module('documentExample', []) - .controller('ExampleController', ['$scope', '$document', function($scope, $document) { - $scope.title = $document[0].title; - $scope.windowTitle = angular.element(window.document)[0].title; - }]); - - - */ -function $DocumentProvider() { - this.$get = ['$window', function(window) { - return jqLite(window.document); - }]; -} + var requestError = function () { + // The response is always empty + // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error + completeRequest(callback, -1, null, null, ''); + }; -/** - * @ngdoc service - * @name $exceptionHandler - * @requires ng.$log - * - * @description - * Any uncaught exception in angular expressions is delegated to this service. - * The default implementation simply delegates to `$log.error` which logs it into - * the browser console. - * - * In unit tests, if `angular-mocks.js` is loaded, this service is overridden by - * {@link ngMock.$exceptionHandler mock $exceptionHandler} which aids in testing. - * - * ## Example: - * - * ```js - * angular.module('exceptionOverride', []).factory('$exceptionHandler', function() { - * return function(exception, cause) { - * exception.message += ' (caused by "' + cause + '")'; - * throw exception; - * }; - * }); - * ``` - * - * This example will override the normal action of `$exceptionHandler`, to make angular - * exceptions fail hard when they happen, instead of just logging to the console. - * - *
- * Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind` - * methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler} - * (unless executed during a digest). - * - * If you wish, you can manually delegate exceptions, e.g. - * `try { ... } catch(e) { $exceptionHandler(e); }` - * - * @param {Error} exception Exception associated with the error. - * @param {string=} cause optional information about the context in which - * the error was thrown. - * - */ -function $ExceptionHandlerProvider() { - this.$get = ['$log', function($log) { - return function(exception, cause) { - $log.error.apply($log, arguments); - }; - }]; -} - -var $$ForceReflowProvider = function() { - this.$get = ['$document', function($document) { - return function(domNode) { - //the line below will force the browser to perform a repaint so - //that all the animated elements within the animation frame will - //be properly updated and drawn on screen. This is required to - //ensure that the preparation animation is properly flushed so that - //the active state picks up from there. DO NOT REMOVE THIS LINE. - //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH - //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND - //WILL TAKE YEARS AWAY FROM YOUR LIFE. - if (domNode) { - if (!domNode.nodeType && domNode instanceof jqLite) { - domNode = domNode[0]; - } - } else { - domNode = $document[0].body; - } - return domNode.offsetWidth + 1; - }; - }]; -}; - -var APPLICATION_JSON = 'application/json'; -var CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': APPLICATION_JSON + ';charset=utf-8'}; -var JSON_START = /^\[|^\{(?!\{)/; -var JSON_ENDS = { - '[': /]$/, - '{': /}$/ -}; -var JSON_PROTECTION_PREFIX = /^\)\]\}',?\n/; -var $httpMinErr = minErr('$http'); -var $httpMinErrLegacyFn = function(method) { - return function() { - throw $httpMinErr('legacy', 'The method `{0}` on the promise returned from `$http` has been disabled.', method); - }; -}; - -function serializeValue(v) { - if (isObject(v)) { - return isDate(v) ? v.toISOString() : toJson(v); - } - return v; -} - - -function $HttpParamSerializerProvider() { - /** - * @ngdoc service - * @name $httpParamSerializer - * @description - * - * Default {@link $http `$http`} params serializer that converts objects to strings - * according to the following rules: - * - * * `{'foo': 'bar'}` results in `foo=bar` - * * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object) - * * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element) - * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D"` (stringified and encoded representation of an object) - * - * Note that serializer will sort the request parameters alphabetically. - * */ - - this.$get = function() { - return function ngParamSerializer(params) { - if (!params) return ''; - var parts = []; - forEachSorted(params, function(value, key) { - if (value === null || isUndefined(value)) return; - if (isArray(value)) { - forEach(value, function(v) { - parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(v))); - }); - } else { - parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(value))); - } - }); - - return parts.join('&'); - }; - }; -} - -function $HttpParamSerializerJQLikeProvider() { - /** - * @ngdoc service - * @name $httpParamSerializerJQLike - * @description - * - * Alternative {@link $http `$http`} params serializer that follows - * jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic. - * The serializer will also sort the params alphabetically. - * - * To use it for serializing `$http` request parameters, set it as the `paramSerializer` property: - * - * ```js - * $http({ - * url: myUrl, - * method: 'GET', - * params: myParams, - * paramSerializer: '$httpParamSerializerJQLike' - * }); - * ``` - * - * It is also possible to set it as the default `paramSerializer` in the - * {@link $httpProvider#defaults `$httpProvider`}. - * - * Additionally, you can inject the serializer and use it explicitly, for example to serialize - * form data for submission: - * - * ```js - * .controller(function($http, $httpParamSerializerJQLike) { - * //... - * - * $http({ - * url: myUrl, - * method: 'POST', - * data: $httpParamSerializerJQLike(myData), - * headers: { - * 'Content-Type': 'application/x-www-form-urlencoded' - * } - * }); - * - * }); - * ``` - * - * */ - this.$get = function() { - return function jQueryLikeParamSerializer(params) { - if (!params) return ''; - var parts = []; - serialize(params, '', true); - return parts.join('&'); - - function serialize(toSerialize, prefix, topLevel) { - if (toSerialize === null || isUndefined(toSerialize)) return; - if (isArray(toSerialize)) { - forEach(toSerialize, function(value, index) { - serialize(value, prefix + '[' + (isObject(value) ? index : '') + ']'); - }); - } else if (isObject(toSerialize) && !isDate(toSerialize)) { - forEachSorted(toSerialize, function(value, key) { - serialize(value, prefix + - (topLevel ? '' : '[') + - key + - (topLevel ? '' : ']')); - }); - } else { - parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize))); - } - } - }; - }; -} - -function defaultHttpResponseTransform(data, headers) { - if (isString(data)) { - // Strip json vulnerability protection prefix and trim whitespace - var tempData = data.replace(JSON_PROTECTION_PREFIX, '').trim(); - - if (tempData) { - var contentType = headers('Content-Type'); - if ((contentType && (contentType.indexOf(APPLICATION_JSON) === 0)) || isJsonLike(tempData)) { - data = fromJson(tempData); - } - } - } - - return data; -} - -function isJsonLike(str) { - var jsonStart = str.match(JSON_START); - return jsonStart && JSON_ENDS[jsonStart[0]].test(str); -} - -/** - * Parse headers into key value object - * - * @param {string} headers Raw headers as a string - * @returns {Object} Parsed headers as key value object - */ -function parseHeaders(headers) { - var parsed = createMap(), i; - - function fillInParsed(key, val) { - if (key) { - parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val; - } - } - - if (isString(headers)) { - forEach(headers.split('\n'), function(line) { - i = line.indexOf(':'); - fillInParsed(lowercase(trim(line.substr(0, i))), trim(line.substr(i + 1))); - }); - } else if (isObject(headers)) { - forEach(headers, function(headerVal, headerKey) { - fillInParsed(lowercase(headerKey), trim(headerVal)); - }); - } - - return parsed; -} - - -/** - * Returns a function that provides access to parsed headers. - * - * Headers are lazy parsed when first requested. - * @see parseHeaders - * - * @param {(string|Object)} headers Headers to provide access to. - * @returns {function(string=)} Returns a getter function which if called with: - * - * - if called with single an argument returns a single header value or null - * - if called with no arguments returns an object containing all headers. - */ -function headersGetter(headers) { - var headersObj; - - return function(name) { - if (!headersObj) headersObj = parseHeaders(headers); - - if (name) { - var value = headersObj[lowercase(name)]; - if (value === void 0) { - value = null; - } - return value; - } - - return headersObj; - }; -} - - -/** - * Chain all given functions - * - * This function is used for both request and response transforming - * - * @param {*} data Data to transform. - * @param {function(string=)} headers HTTP headers getter fn. - * @param {number} status HTTP status code of the response. - * @param {(Function|Array.)} fns Function or an array of functions. - * @returns {*} Transformed data. - */ -function transformData(data, headers, status, fns) { - if (isFunction(fns)) { - return fns(data, headers, status); - } - - forEach(fns, function(fn) { - data = fn(data, headers, status); - }); - - return data; -} - - -function isSuccess(status) { - return 200 <= status && status < 300; -} - - -/** - * @ngdoc provider - * @name $httpProvider - * @description - * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service. - * */ -function $HttpProvider() { - /** - * @ngdoc property - * @name $httpProvider#defaults - * @description - * - * Object containing default values for all {@link ng.$http $http} requests. - * - * - **`defaults.cache`** - {boolean|Object} - A boolean value or object created with - * {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of HTTP responses - * by default. See {@link $http#caching $http Caching} for more information. - * - * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token. - * Defaults value is `'XSRF-TOKEN'`. - * - * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the - * XSRF token. Defaults value is `'X-XSRF-TOKEN'`. - * - * - **`defaults.headers`** - {Object} - Default headers for all $http requests. - * Refer to {@link ng.$http#setting-http-headers $http} for documentation on - * setting default headers. - * - **`defaults.headers.common`** - * - **`defaults.headers.post`** - * - **`defaults.headers.put`** - * - **`defaults.headers.patch`** - * - * - * - **`defaults.paramSerializer`** - `{string|function(Object):string}` - A function - * used to the prepare string representation of request parameters (specified as an object). - * If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}. - * Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}. - * - **/ - var defaults = this.defaults = { - // transform incoming response data - transformResponse: [defaultHttpResponseTransform], - - // transform outgoing request data - transformRequest: [function(d) { - return isObject(d) && !isFile(d) && !isBlob(d) && !isFormData(d) ? toJson(d) : d; - }], - - // default headers - headers: { - common: { - 'Accept': 'application/json, text/plain, */*' - }, - post: shallowCopy(CONTENT_TYPE_APPLICATION_JSON), - put: shallowCopy(CONTENT_TYPE_APPLICATION_JSON), - patch: shallowCopy(CONTENT_TYPE_APPLICATION_JSON) - }, - - xsrfCookieName: 'XSRF-TOKEN', - xsrfHeaderName: 'X-XSRF-TOKEN', - - paramSerializer: '$httpParamSerializer' - }; - - var useApplyAsync = false; - /** - * @ngdoc method - * @name $httpProvider#useApplyAsync - * @description - * - * Configure $http service to combine processing of multiple http responses received at around - * the same time via {@link ng.$rootScope.Scope#$applyAsync $rootScope.$applyAsync}. This can result in - * significant performance improvement for bigger applications that make many HTTP requests - * concurrently (common during application bootstrap). - * - * Defaults to false. If no value is specified, returns the current configured value. - * - * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred - * "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window - * to load and share the same digest cycle. - * - * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining. - * otherwise, returns the current configured value. - **/ - this.useApplyAsync = function(value) { - if (isDefined(value)) { - useApplyAsync = !!value; - return this; - } - return useApplyAsync; - }; - - var useLegacyPromise = true; - /** - * @ngdoc method - * @name $httpProvider#useLegacyPromiseExtensions - * @description - * - * Configure `$http` service to return promises without the shorthand methods `success` and `error`. - * This should be used to make sure that applications work without these methods. - * - * Defaults to true. If no value is specified, returns the current configured value. - * - * @param {boolean=} value If true, `$http` will return a promise with the deprecated legacy `success` and `error` methods. - * - * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining. - * otherwise, returns the current configured value. - **/ - this.useLegacyPromiseExtensions = function(value) { - if (isDefined(value)) { - useLegacyPromise = !!value; - return this; - } - return useLegacyPromise; - }; - - /** - * @ngdoc property - * @name $httpProvider#interceptors - * @description - * - * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http} - * pre-processing of request or postprocessing of responses. - * - * These service factories are ordered by request, i.e. they are applied in the same order as the - * array, on request, but reverse order, on response. - * - * {@link ng.$http#interceptors Interceptors detailed info} - **/ - var interceptorFactories = this.interceptors = []; - - this.$get = ['$httpBackend', '$$cookieReader', '$cacheFactory', '$rootScope', '$q', '$injector', - function($httpBackend, $$cookieReader, $cacheFactory, $rootScope, $q, $injector) { - - var defaultCache = $cacheFactory('$http'); - - /** - * Make sure that default param serializer is exposed as a function - */ - defaults.paramSerializer = isString(defaults.paramSerializer) ? - $injector.get(defaults.paramSerializer) : defaults.paramSerializer; - - /** - * Interceptors stored in reverse order. Inner interceptors before outer interceptors. - * The reversal is needed so that we can build up the interception chain around the - * server request. - */ - var reversedInterceptors = []; - - forEach(interceptorFactories, function(interceptorFactory) { - reversedInterceptors.unshift(isString(interceptorFactory) - ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory)); - }); - - /** - * @ngdoc service - * @kind function - * @name $http - * @requires ng.$httpBackend - * @requires $cacheFactory - * @requires $rootScope - * @requires $q - * @requires $injector - * - * @description - * The `$http` service is a core Angular service that facilitates communication with the remote - * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest) - * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP). - * - * For unit testing applications that use `$http` service, see - * {@link ngMock.$httpBackend $httpBackend mock}. - * - * For a higher level of abstraction, please check out the {@link ngResource.$resource - * $resource} service. - * - * The $http API is based on the {@link ng.$q deferred/promise APIs} exposed by - * the $q service. While for simple usage patterns this doesn't matter much, for advanced usage - * it is important to familiarize yourself with these APIs and the guarantees they provide. - * - * - * ## General usage - * The `$http` service is a function which takes a single argument — a {@link $http#usage configuration object} — - * that is used to generate an HTTP request and returns a {@link ng.$q promise}. - * - * ```js - * // Simple GET request example: - * $http({ - * method: 'GET', - * url: '/someUrl' - * }).then(function successCallback(response) { - * // this callback will be called asynchronously - * // when the response is available - * }, function errorCallback(response) { - * // called asynchronously if an error occurs - * // or server returns response with an error status. - * }); - * ``` - * - * The response object has these properties: - * - * - **data** – `{string|Object}` – The response body transformed with the transform - * functions. - * - **status** – `{number}` – HTTP status code of the response. - * - **headers** – `{function([headerName])}` – Header getter function. - * - **config** – `{Object}` – The configuration object that was used to generate the request. - * - **statusText** – `{string}` – HTTP status text of the response. - * - * A response status code between 200 and 299 is considered a success status and - * will result in the success callback being called. Note that if the response is a redirect, - * XMLHttpRequest will transparently follow it, meaning that the error callback will not be - * called for such responses. - * - * - * ## Shortcut methods - * - * Shortcut methods are also available. All shortcut methods require passing in the URL, and - * request data must be passed in for POST/PUT requests. An optional config can be passed as the - * last argument. - * - * ```js - * $http.get('/someUrl', config).then(successCallback, errorCallback); - * $http.post('/someUrl', data, config).then(successCallback, errorCallback); - * ``` - * - * Complete list of shortcut methods: - * - * - {@link ng.$http#get $http.get} - * - {@link ng.$http#head $http.head} - * - {@link ng.$http#post $http.post} - * - {@link ng.$http#put $http.put} - * - {@link ng.$http#delete $http.delete} - * - {@link ng.$http#jsonp $http.jsonp} - * - {@link ng.$http#patch $http.patch} - * - * - * ## Writing Unit Tests that use $http - * When unit testing (using {@link ngMock ngMock}), it is necessary to call - * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending - * request using trained responses. - * - * ``` - * $httpBackend.expectGET(...); - * $http.get(...); - * $httpBackend.flush(); - * ``` - * - * ## Deprecation Notice - *
- * The `$http` legacy promise methods `success` and `error` have been deprecated. - * Use the standard `then` method instead. - * If {@link $httpProvider#useLegacyPromiseExtensions `$httpProvider.useLegacyPromiseExtensions`} is set to - * `false` then these methods will throw {@link $http:legacy `$http/legacy`} error. - *
- * - * ## Setting HTTP Headers - * - * The $http service will automatically add certain HTTP headers to all requests. These defaults - * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration - * object, which currently contains this default configuration: - * - * - `$httpProvider.defaults.headers.common` (headers that are common for all requests): - * - `Accept: application/json, text/plain, * / *` - * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests) - * - `Content-Type: application/json` - * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests) - * - `Content-Type: application/json` - * - * To add or overwrite these defaults, simply add or remove a property from these configuration - * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object - * with the lowercased HTTP method name as the key, e.g. - * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }`. - * - * The defaults can also be set at runtime via the `$http.defaults` object in the same - * fashion. For example: - * - * ``` - * module.run(function($http) { - * $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w'; - * }); - * ``` - * - * In addition, you can supply a `headers` property in the config object passed when - * calling `$http(config)`, which overrides the defaults without changing them globally. - * - * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis, - * Use the `headers` property, setting the desired header to `undefined`. For example: - * - * ```js - * var req = { - * method: 'POST', - * url: 'http://example.com', - * headers: { - * 'Content-Type': undefined - * }, - * data: { test: 'test' } - * } - * - * $http(req).then(function(){...}, function(){...}); - * ``` - * - * ## Transforming Requests and Responses - * - * Both requests and responses can be transformed using transformation functions: `transformRequest` - * and `transformResponse`. These properties can be a single function that returns - * the transformed value (`function(data, headersGetter, status)`) or an array of such transformation functions, - * which allows you to `push` or `unshift` a new transformation function into the transformation chain. - * - *
- * **Note:** Angular does not make a copy of the `data` parameter before it is passed into the `transformRequest` pipeline. - * That means changes to the properties of `data` are not local to the transform function (since Javascript passes objects by reference). - * For example, when calling `$http.get(url, $scope.myObject)`, modifications to the object's properties in a transformRequest - * function will be reflected on the scope and in any templates where the object is data-bound. - * To prevent this, transform functions should have no side-effects. - * If you need to modify properties, it is recommended to make a copy of the data, or create new object to return. - *
- * - * ### Default Transformations - * - * The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and - * `defaults.transformResponse` properties. If a request does not provide its own transformations - * then these will be applied. - * - * You can augment or replace the default transformations by modifying these properties by adding to or - * replacing the array. - * - * Angular provides the following default transformations: - * - * Request transformations (`$httpProvider.defaults.transformRequest` and `$http.defaults.transformRequest`): - * - * - If the `data` property of the request configuration object contains an object, serialize it - * into JSON format. - * - * Response transformations (`$httpProvider.defaults.transformResponse` and `$http.defaults.transformResponse`): - * - * - If XSRF prefix is detected, strip it (see Security Considerations section below). - * - If JSON response is detected, deserialize it using a JSON parser. - * - * - * ### Overriding the Default Transformations Per Request - * - * If you wish override the request/response transformations only for a single request then provide - * `transformRequest` and/or `transformResponse` properties on the configuration object passed - * into `$http`. - * - * Note that if you provide these properties on the config object the default transformations will be - * overwritten. If you wish to augment the default transformations then you must include them in your - * local transformation array. - * - * The following code demonstrates adding a new response transformation to be run after the default response - * transformations have been run. - * - * ```js - * function appendTransform(defaults, transform) { - * - * // We can't guarantee that the default transformation is an array - * defaults = angular.isArray(defaults) ? defaults : [defaults]; - * - * // Append the new transformation to the defaults - * return defaults.concat(transform); - * } - * - * $http({ - * url: '...', - * method: 'GET', - * transformResponse: appendTransform($http.defaults.transformResponse, function(value) { - * return doTransform(value); - * }) - * }); - * ``` - * - * - * ## Caching - * - * {@link ng.$http `$http`} responses are not cached by default. To enable caching, you must - * set the config.cache value or the default cache value to TRUE or to a cache object (created - * with {@link ng.$cacheFactory `$cacheFactory`}). If defined, the value of config.cache takes - * precedence over the default cache value. - * - * In order to: - * * cache all responses - set the default cache value to TRUE or to a cache object - * * cache a specific response - set config.cache value to TRUE or to a cache object - * - * If caching is enabled, but neither the default cache nor config.cache are set to a cache object, - * then the default `$cacheFactory($http)` object is used. - * - * The default cache value can be set by updating the - * {@link ng.$http#defaults `$http.defaults.cache`} property or the - * {@link $httpProvider#defaults `$httpProvider.defaults.cache`} property. - * - * When caching is enabled, {@link ng.$http `$http`} stores the response from the server using - * the relevant cache object. The next time the same request is made, the response is returned - * from the cache without sending a request to the server. - * - * Take note that: - * - * * Only GET and JSONP requests are cached. - * * The cache key is the request URL including search parameters; headers are not considered. - * * Cached responses are returned asynchronously, in the same way as responses from the server. - * * If multiple identical requests are made using the same cache, which is not yet populated, - * one request will be made to the server and remaining requests will return the same response. - * * A cache-control header on the response does not affect if or how responses are cached. - * - * - * ## Interceptors - * - * Before you start creating interceptors, be sure to understand the - * {@link ng.$q $q and deferred/promise APIs}. - * - * For purposes of global error handling, authentication, or any kind of synchronous or - * asynchronous pre-processing of request or postprocessing of responses, it is desirable to be - * able to intercept requests before they are handed to the server and - * responses before they are handed over to the application code that - * initiated these requests. The interceptors leverage the {@link ng.$q - * promise APIs} to fulfill this need for both synchronous and asynchronous pre-processing. - * - * The interceptors are service factories that are registered with the `$httpProvider` by - * adding them to the `$httpProvider.interceptors` array. The factory is called and - * injected with dependencies (if specified) and returns the interceptor. - * - * There are two kinds of interceptors (and two kinds of rejection interceptors): - * - * * `request`: interceptors get called with a http {@link $http#usage config} object. The function is free to - * modify the `config` object or create a new one. The function needs to return the `config` - * object directly, or a promise containing the `config` or a new `config` object. - * * `requestError`: interceptor gets called when a previous interceptor threw an error or - * resolved with a rejection. - * * `response`: interceptors get called with http `response` object. The function is free to - * modify the `response` object or create a new one. The function needs to return the `response` - * object directly, or as a promise containing the `response` or a new `response` object. - * * `responseError`: interceptor gets called when a previous interceptor threw an error or - * resolved with a rejection. - * - * - * ```js - * // register the interceptor as a service - * $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) { - * return { - * // optional method - * 'request': function(config) { - * // do something on success - * return config; - * }, - * - * // optional method - * 'requestError': function(rejection) { - * // do something on error - * if (canRecover(rejection)) { - * return responseOrNewPromise - * } - * return $q.reject(rejection); - * }, - * - * - * - * // optional method - * 'response': function(response) { - * // do something on success - * return response; - * }, - * - * // optional method - * 'responseError': function(rejection) { - * // do something on error - * if (canRecover(rejection)) { - * return responseOrNewPromise - * } - * return $q.reject(rejection); - * } - * }; - * }); - * - * $httpProvider.interceptors.push('myHttpInterceptor'); - * - * - * // alternatively, register the interceptor via an anonymous factory - * $httpProvider.interceptors.push(function($q, dependency1, dependency2) { - * return { - * 'request': function(config) { - * // same as above - * }, - * - * 'response': function(response) { - * // same as above - * } - * }; - * }); - * ``` - * - * ## Security Considerations - * - * When designing web applications, consider security threats from: - * - * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx) - * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) - * - * Both server and the client must cooperate in order to eliminate these threats. Angular comes - * pre-configured with strategies that address these issues, but for this to work backend server - * cooperation is required. - * - * ### JSON Vulnerability Protection - * - * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx) - * allows third party website to turn your JSON resource URL into - * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To - * counter this your server can prefix all JSON requests with following string `")]}',\n"`. - * Angular will automatically strip the prefix before processing it as JSON. - * - * For example if your server needs to return: - * ```js - * ['one','two'] - * ``` - * - * which is vulnerable to attack, your server can return: - * ```js - * )]}', - * ['one','two'] - * ``` - * - * Angular will strip the prefix, before processing the JSON. - * - * - * ### Cross Site Request Forgery (XSRF) Protection - * - * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is an attack technique by - * which the attacker can trick an authenticated user into unknowingly executing actions on your - * website. Angular provides a mechanism to counter XSRF. When performing XHR requests, the - * $http service reads a token from a cookie (by default, `XSRF-TOKEN`) and sets it as an HTTP - * header (`X-XSRF-TOKEN`). Since only JavaScript that runs on your domain could read the - * cookie, your server can be assured that the XHR came from JavaScript running on your domain. - * The header will not be set for cross-domain requests. - * - * To take advantage of this, your server needs to set a token in a JavaScript readable session - * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the - * server can verify that the cookie matches `X-XSRF-TOKEN` HTTP header, and therefore be sure - * that only JavaScript running on your domain could have sent the request. The token must be - * unique for each user and must be verifiable by the server (to prevent the JavaScript from - * making up its own tokens). We recommend that the token is a digest of your site's - * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography)) - * for added security. - * - * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName - * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time, - * or the per-request config object. - * - * In order to prevent collisions in environments where multiple Angular apps share the - * same domain or subdomain, we recommend that each application uses unique cookie name. - * - * @param {object} config Object describing the request to be made and how it should be - * processed. The object has following properties: - * - * - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc) - * - **url** – `{string}` – Absolute or relative URL of the resource that is being requested. - * - **params** – `{Object.}` – Map of strings or objects which will be serialized - * with the `paramSerializer` and appended as GET parameters. - * - **data** – `{string|Object}` – Data to be sent as the request message data. - * - **headers** – `{Object}` – Map of strings or functions which return strings representing - * HTTP headers to send to the server. If the return value of a function is null, the - * header will not be sent. Functions accept a config object as an argument. - * - **eventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest object. - * To bind events to the XMLHttpRequest upload object, use `uploadEventHandlers`. - * The handler will be called in the context of a `$apply` block. - * - **uploadEventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest upload - * object. To bind events to the XMLHttpRequest object, use `eventHandlers`. - * The handler will be called in the context of a `$apply` block. - * - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token. - * - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token. - * - **transformRequest** – - * `{function(data, headersGetter)|Array.}` – - * transform function or an array of such functions. The transform function takes the http - * request body and headers and returns its transformed (typically serialized) version. - * See {@link ng.$http#overriding-the-default-transformations-per-request - * Overriding the Default Transformations} - * - **transformResponse** – - * `{function(data, headersGetter, status)|Array.}` – - * transform function or an array of such functions. The transform function takes the http - * response body, headers and status and returns its transformed (typically deserialized) version. - * See {@link ng.$http#overriding-the-default-transformations-per-request - * Overriding the Default Transformations} - * - **paramSerializer** - `{string|function(Object):string}` - A function used to - * prepare the string representation of request parameters (specified as an object). - * If specified as string, it is interpreted as function registered with the - * {@link $injector $injector}, which means you can create your own serializer - * by registering it as a {@link auto.$provide#service service}. - * The default serializer is the {@link $httpParamSerializer $httpParamSerializer}; - * alternatively, you can use the {@link $httpParamSerializerJQLike $httpParamSerializerJQLike} - * - **cache** – `{boolean|Object}` – A boolean value or object created with - * {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of the HTTP response. - * See {@link $http#caching $http Caching} for more information. - * - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise} - * that should abort the request when resolved. - * - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the - * XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials) - * for more information. - * - **responseType** - `{string}` - see - * [XMLHttpRequest.responseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype). - * - * @returns {HttpPromise} Returns a {@link ng.$q `Promise}` that will be resolved to a response object - * when the request succeeds or fails. - * - * - * @property {Array.} pendingRequests Array of config objects for currently pending - * requests. This is primarily meant to be used for debugging purposes. - * - * - * @example - - -
- - -
- - - - 
http status code: {{status}}
- 
http response data: {{data}}
-
- - - angular.module('httpExample', []) - .controller('FetchController', ['$scope', '$http', '$templateCache', - function($scope, $http, $templateCache) { - $scope.method = 'GET'; - $scope.url = 'http-hello.html'; - - $scope.fetch = function() { - $scope.code = null; - $scope.response = null; - - $http({method: $scope.method, url: $scope.url, cache: $templateCache}). - then(function(response) { - $scope.status = response.status; - $scope.data = response.data; - }, function(response) { - $scope.data = response.data || "Request failed"; - $scope.status = response.status; - }); - }; - - $scope.updateModel = function(method, url) { - $scope.method = method; - $scope.url = url; - }; - }]); - - - Hello, $http! - - - var status = element(by.binding('status')); - var data = element(by.binding('data')); - var fetchBtn = element(by.id('fetchbtn')); - var sampleGetBtn = element(by.id('samplegetbtn')); - var sampleJsonpBtn = element(by.id('samplejsonpbtn')); - var invalidJsonpBtn = element(by.id('invalidjsonpbtn')); - - it('should make an xhr GET request', function() { - sampleGetBtn.click(); - fetchBtn.click(); - expect(status.getText()).toMatch('200'); - expect(data.getText()).toMatch(/Hello, \$http!/); - }); - -// Commented out due to flakes. See https://github.com/angular/angular.js/issues/9185 -// it('should make a JSONP request to angularjs.org', function() { -// sampleJsonpBtn.click(); -// fetchBtn.click(); -// expect(status.getText()).toMatch('200'); -// expect(data.getText()).toMatch(/Super Hero!/); -// }); - - it('should make JSONP request to invalid URL and invoke the error handler', - function() { - invalidJsonpBtn.click(); - fetchBtn.click(); - expect(status.getText()).toMatch('0'); - expect(data.getText()).toMatch('Request failed'); - }); - - - */ - function $http(requestConfig) { - - if (!isObject(requestConfig)) { - throw minErr('$http')('badreq', 'Http request configuration must be an object. Received: {0}', requestConfig); - } - - if (!isString(requestConfig.url)) { - throw minErr('$http')('badreq', 'Http request configuration url must be a string. Received: {0}', requestConfig.url); - } - - var config = extend({ - method: 'get', - transformRequest: defaults.transformRequest, - transformResponse: defaults.transformResponse, - paramSerializer: defaults.paramSerializer - }, requestConfig); - - config.headers = mergeHeaders(requestConfig); - config.method = uppercase(config.method); - config.paramSerializer = isString(config.paramSerializer) ? - $injector.get(config.paramSerializer) : config.paramSerializer; - - var serverRequest = function(config) { - var headers = config.headers; - var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest); - - // strip content-type if data is undefined - if (isUndefined(reqData)) { - forEach(headers, function(value, header) { - if (lowercase(header) === 'content-type') { - delete headers[header]; - } - }); - } - - if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) { - config.withCredentials = defaults.withCredentials; - } - - // send request - return sendReq(config, reqData).then(transformResponse, transformResponse); - }; - - var chain = [serverRequest, undefined]; - var promise = $q.when(config); - - // apply interceptors - forEach(reversedInterceptors, function(interceptor) { - if (interceptor.request || interceptor.requestError) { - chain.unshift(interceptor.request, interceptor.requestError); - } - if (interceptor.response || interceptor.responseError) { - chain.push(interceptor.response, interceptor.responseError); - } - }); - - while (chain.length) { - var thenFn = chain.shift(); - var rejectFn = chain.shift(); - - promise = promise.then(thenFn, rejectFn); - } - - if (useLegacyPromise) { - promise.success = function(fn) { - assertArgFn(fn, 'fn'); - - promise.then(function(response) { - fn(response.data, response.status, response.headers, config); - }); - return promise; - }; - - promise.error = function(fn) { - assertArgFn(fn, 'fn'); - - promise.then(null, function(response) { - fn(response.data, response.status, response.headers, config); - }); - return promise; - }; - } else { - promise.success = $httpMinErrLegacyFn('success'); - promise.error = $httpMinErrLegacyFn('error'); - } - - return promise; - - function transformResponse(response) { - // make a copy since the response must be cacheable - var resp = extend({}, response); - resp.data = transformData(response.data, response.headers, response.status, - config.transformResponse); - return (isSuccess(response.status)) - ? resp - : $q.reject(resp); - } - - function executeHeaderFns(headers, config) { - var headerContent, processedHeaders = {}; - - forEach(headers, function(headerFn, header) { - if (isFunction(headerFn)) { - headerContent = headerFn(config); - if (headerContent != null) { - processedHeaders[header] = headerContent; - } - } else { - processedHeaders[header] = headerFn; - } - }); - - return processedHeaders; - } - - function mergeHeaders(config) { - var defHeaders = defaults.headers, - reqHeaders = extend({}, config.headers), - defHeaderName, lowercaseDefHeaderName, reqHeaderName; - - defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]); - - // using for-in instead of forEach to avoid unnecessary iteration after header has been found - defaultHeadersIteration: - for (defHeaderName in defHeaders) { - lowercaseDefHeaderName = lowercase(defHeaderName); - - for (reqHeaderName in reqHeaders) { - if (lowercase(reqHeaderName) === lowercaseDefHeaderName) { - continue defaultHeadersIteration; - } - } - - reqHeaders[defHeaderName] = defHeaders[defHeaderName]; - } - - // execute if header value is a function for merged headers - return executeHeaderFns(reqHeaders, shallowCopy(config)); - } - } - - $http.pendingRequests = []; - - /** - * @ngdoc method - * @name $http#get - * - * @description - * Shortcut method to perform `GET` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#delete - * - * @description - * Shortcut method to perform `DELETE` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#head - * - * @description - * Shortcut method to perform `HEAD` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#jsonp - * - * @description - * Shortcut method to perform `JSONP` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request. - * The name of the callback should be the string `JSON_CALLBACK`. - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - createShortMethods('get', 'delete', 'head', 'jsonp'); - - /** - * @ngdoc method - * @name $http#post - * - * @description - * Shortcut method to perform `POST` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {*} data Request content - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#put - * - * @description - * Shortcut method to perform `PUT` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {*} data Request content - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#patch - * - * @description - * Shortcut method to perform `PATCH` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {*} data Request content - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - createShortMethodsWithData('post', 'put', 'patch'); - - /** - * @ngdoc property - * @name $http#defaults - * - * @description - * Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of - * default headers, withCredentials as well as request and response transformations. - * - * See "Setting HTTP Headers" and "Transforming Requests and Responses" sections above. - */ - $http.defaults = defaults; - - - return $http; - - - function createShortMethods(names) { - forEach(arguments, function(name) { - $http[name] = function(url, config) { - return $http(extend({}, config || {}, { - method: name, - url: url - })); - }; - }); - } - - - function createShortMethodsWithData(name) { - forEach(arguments, function(name) { - $http[name] = function(url, data, config) { - return $http(extend({}, config || {}, { - method: name, - url: url, - data: data - })); - }; - }); - } - - - /** - * Makes the request. - * - * !!! ACCESSES CLOSURE VARS: - * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests - */ - function sendReq(config, reqData) { - var deferred = $q.defer(), - promise = deferred.promise, - cache, - cachedResp, - reqHeaders = config.headers, - url = buildUrl(config.url, config.paramSerializer(config.params)); - - $http.pendingRequests.push(config); - promise.then(removePendingReq, removePendingReq); - - - if ((config.cache || defaults.cache) && config.cache !== false && - (config.method === 'GET' || config.method === 'JSONP')) { - cache = isObject(config.cache) ? config.cache - : isObject(defaults.cache) ? defaults.cache - : defaultCache; - } - - if (cache) { - cachedResp = cache.get(url); - if (isDefined(cachedResp)) { - if (isPromiseLike(cachedResp)) { - // cached request has already been sent, but there is no response yet - cachedResp.then(resolvePromiseWithResult, resolvePromiseWithResult); - } else { - // serving from cache - if (isArray(cachedResp)) { - resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3]); - } else { - resolvePromise(cachedResp, 200, {}, 'OK'); - } - } - } else { - // put the promise for the non-transformed response into cache as a placeholder - cache.put(url, promise); - } - } - - - // if we won't have the response in cache, set the xsrf headers and - // send the request to the backend - if (isUndefined(cachedResp)) { - var xsrfValue = urlIsSameOrigin(config.url) - ? $$cookieReader()[config.xsrfCookieName || defaults.xsrfCookieName] - : undefined; - if (xsrfValue) { - reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue; - } - - $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout, - config.withCredentials, config.responseType, - createApplyHandlers(config.eventHandlers), - createApplyHandlers(config.uploadEventHandlers)); - } - - return promise; - - function createApplyHandlers(eventHandlers) { - if (eventHandlers) { - var applyHandlers = {}; - forEach(eventHandlers, function(eventHandler, key) { - applyHandlers[key] = function(event) { - if (useApplyAsync) { - $rootScope.$applyAsync(callEventHandler); - } else if ($rootScope.$$phase) { - callEventHandler(); - } else { - $rootScope.$apply(callEventHandler); - } - - function callEventHandler() { - eventHandler(event); - } - }; - }); - return applyHandlers; - } - } - - - /** - * Callback registered to $httpBackend(): - * - caches the response if desired - * - resolves the raw $http promise - * - calls $apply - */ - function done(status, response, headersString, statusText) { - if (cache) { - if (isSuccess(status)) { - cache.put(url, [status, response, parseHeaders(headersString), statusText]); - } else { - // remove promise from the cache - cache.remove(url); - } - } - - function resolveHttpPromise() { - resolvePromise(response, status, headersString, statusText); - } - - if (useApplyAsync) { - $rootScope.$applyAsync(resolveHttpPromise); - } else { - resolveHttpPromise(); - if (!$rootScope.$$phase) $rootScope.$apply(); - } - } - - - /** - * Resolves the raw $http promise. - */ - function resolvePromise(response, status, headers, statusText) { - //status: HTTP response status code, 0, -1 (aborted by timeout / promise) - status = status >= -1 ? status : 0; - - (isSuccess(status) ? deferred.resolve : deferred.reject)({ - data: response, - status: status, - headers: headersGetter(headers), - config: config, - statusText: statusText - }); - } - - function resolvePromiseWithResult(result) { - resolvePromise(result.data, result.status, shallowCopy(result.headers()), result.statusText); - } - - function removePendingReq() { - var idx = $http.pendingRequests.indexOf(config); - if (idx !== -1) $http.pendingRequests.splice(idx, 1); - } - } - - - function buildUrl(url, serializedParams) { - if (serializedParams.length > 0) { - url += ((url.indexOf('?') == -1) ? '?' : '&') + serializedParams; - } - return url; - } - }]; -} - -/** - * @ngdoc service - * @name $xhrFactory - * - * @description - * Factory function used to create XMLHttpRequest objects. - * - * Replace or decorate this service to create your own custom XMLHttpRequest objects. - * - * ``` - * angular.module('myApp', []) - * .factory('$xhrFactory', function() { - * return function createXhr(method, url) { - * return new window.XMLHttpRequest({mozSystem: true}); - * }; - * }); - * ``` - * - * @param {string} method HTTP method of the request (GET, POST, PUT, ..) - * @param {string} url URL of the request. - */ -function $xhrFactoryProvider() { - this.$get = function() { - return function createXhr() { - return new window.XMLHttpRequest(); - }; - }; -} - -/** - * @ngdoc service - * @name $httpBackend - * @requires $window - * @requires $document - * @requires $xhrFactory - * - * @description - * HTTP backend used by the {@link ng.$http service} that delegates to - * XMLHttpRequest object or JSONP and deals with browser incompatibilities. - * - * You should never need to use this service directly, instead use the higher-level abstractions: - * {@link ng.$http $http} or {@link ngResource.$resource $resource}. - * - * During testing this implementation is swapped with {@link ngMock.$httpBackend mock - * $httpBackend} which can be trained with responses. - */ -function $HttpBackendProvider() { - this.$get = ['$browser', '$window', '$document', '$xhrFactory', function($browser, $window, $document, $xhrFactory) { - return createHttpBackend($browser, $xhrFactory, $browser.defer, $window.angular.callbacks, $document[0]); - }]; -} - -function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) { - // TODO(vojta): fix the signature - return function(method, url, post, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers) { - $browser.$$incOutstandingRequestCount(); - url = url || $browser.url(); - - if (lowercase(method) == 'jsonp') { - var callbackId = '_' + (callbacks.counter++).toString(36); - callbacks[callbackId] = function(data) { - callbacks[callbackId].data = data; - callbacks[callbackId].called = true; - }; + xhr.onerror = requestError; + xhr.onabort = requestError; - var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId), - callbackId, function(status, text) { - completeRequest(callback, status, callbacks[callbackId].data, "", text); - callbacks[callbackId] = noop; - }); - } else { - - var xhr = createXhr(method, url); + forEach(eventHandlers, function (value, key) { + xhr.addEventListener(key, value); + }); - xhr.open(method, url, true); - forEach(headers, function(value, key) { - if (isDefined(value)) { - xhr.setRequestHeader(key, value); - } - }); + forEach(uploadEventHandlers, function (value, key) { + xhr.upload.addEventListener(key, value); + }); - xhr.onload = function requestLoaded() { - var statusText = xhr.statusText || ''; + if (withCredentials) { + xhr.withCredentials = true; + } - // responseText is the old-school way of retrieving response (supported by IE9) - // response/responseType properties were introduced in XHR Level2 spec (supported by IE10) - var response = ('response' in xhr) ? xhr.response : xhr.responseText; + if (responseType) { + try { + xhr.responseType = responseType; + } catch (e) { + // WebKit added support for the json responseType value on 09/03/2013 + // https://bugs.webkit.org/show_bug.cgi?id=73648. Versions of Safari prior to 7 are + // known to throw when setting the value "json" as the response type. Other older + // browsers implementing the responseType + // + // The json response type can be ignored if not supported, because JSON payloads are + // parsed on the client-side regardless. + if (responseType !== 'json') { + throw e; + } + } + } - // normalize IE9 bug (http://bugs.jquery.com/ticket/1450) - var status = xhr.status === 1223 ? 204 : xhr.status; + xhr.send(isUndefined(post) ? null : post); + } - // fix status code when it is 0 (0 status is undocumented). - // Occurs when accessing file resources or on Android 4.1 stock browser - // while retrieving files from application cache. - if (status === 0) { - status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0; - } + if (timeout > 0) { + var timeoutId = $browserDefer(timeoutRequest, timeout); + } else if (isPromiseLike(timeout)) { + timeout.then(timeoutRequest); + } - completeRequest(callback, - status, - response, - xhr.getAllResponseHeaders(), - statusText); - }; - var requestError = function() { - // The response is always empty - // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error - completeRequest(callback, -1, null, null, ''); - }; + function timeoutRequest() { + jsonpDone && jsonpDone(); + xhr && xhr.abort(); + } - xhr.onerror = requestError; - xhr.onabort = requestError; + function completeRequest(callback, status, response, headersString, statusText) { + // cancel timeout and subsequent timeout promise resolution + if (isDefined(timeoutId)) { + $browserDefer.cancel(timeoutId); + } + jsonpDone = xhr = null; - forEach(eventHandlers, function(value, key) { - xhr.addEventListener(key, value); - }); + callback(status, response, headersString, statusText); + $browser.$$completeOutstandingRequest(noop); + } + }; - forEach(uploadEventHandlers, function(value, key) { - xhr.upload.addEventListener(key, value); - }); + function jsonpReq(url, callbackId, done) { + // we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.: + // - fetches local scripts via XHR and evals them + // - adds and immediately removes script elements from the document + var script = rawDocument.createElement('script'), callback = null; + script.type = "text/javascript"; + script.src = url; + script.async = true; + + callback = function (event) { + removeEventListenerFn(script, "load", callback); + removeEventListenerFn(script, "error", callback); + rawDocument.body.removeChild(script); + script = null; + var status = -1; + var text = "unknown"; + + if (event) { + if (event.type === "load" && !callbacks[callbackId].called) { + event = {type: "error"}; + } + text = event.type; + status = event.type === "error" ? 404 : 200; + } - if (withCredentials) { - xhr.withCredentials = true; - } + if (done) { + done(status, text); + } + }; - if (responseType) { - try { - xhr.responseType = responseType; - } catch (e) { - // WebKit added support for the json responseType value on 09/03/2013 - // https://bugs.webkit.org/show_bug.cgi?id=73648. Versions of Safari prior to 7 are - // known to throw when setting the value "json" as the response type. Other older - // browsers implementing the responseType - // - // The json response type can be ignored if not supported, because JSON payloads are - // parsed on the client-side regardless. - if (responseType !== 'json') { - throw e; - } + addEventListenerFn(script, "load", callback); + addEventListenerFn(script, "error", callback); + rawDocument.body.appendChild(script); + return callback; } - } - - xhr.send(isUndefined(post) ? null : post); - } - - if (timeout > 0) { - var timeoutId = $browserDefer(timeoutRequest, timeout); - } else if (isPromiseLike(timeout)) { - timeout.then(timeoutRequest); } - - function timeoutRequest() { - jsonpDone && jsonpDone(); - xhr && xhr.abort(); - } - - function completeRequest(callback, status, response, headersString, statusText) { - // cancel timeout and subsequent timeout promise resolution - if (isDefined(timeoutId)) { - $browserDefer.cancel(timeoutId); - } - jsonpDone = xhr = null; - - callback(status, response, headersString, statusText); - $browser.$$completeOutstandingRequest(noop); - } - }; - - function jsonpReq(url, callbackId, done) { - // we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.: - // - fetches local scripts via XHR and evals them - // - adds and immediately removes script elements from the document - var script = rawDocument.createElement('script'), callback = null; - script.type = "text/javascript"; - script.src = url; - script.async = true; - - callback = function(event) { - removeEventListenerFn(script, "load", callback); - removeEventListenerFn(script, "error", callback); - rawDocument.body.removeChild(script); - script = null; - var status = -1; - var text = "unknown"; - - if (event) { - if (event.type === "load" && !callbacks[callbackId].called) { - event = { type: "error" }; - } - text = event.type; - status = event.type === "error" ? 404 : 200; - } - - if (done) { - done(status, text); - } + var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate'); + $interpolateMinErr.throwNoconcat = function (text) { + throw $interpolateMinErr('noconcat', + "Error while interpolating: {0}\nStrict Contextual Escaping disallows " + + "interpolations that concatenate multiple expressions when a trusted value is " + + "required. See http://docs.angularjs.org/api/ng.$sce", text); }; - addEventListenerFn(script, "load", callback); - addEventListenerFn(script, "error", callback); - rawDocument.body.appendChild(script); - return callback; - } -} - -var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate'); -$interpolateMinErr.throwNoconcat = function(text) { - throw $interpolateMinErr('noconcat', - "Error while interpolating: {0}\nStrict Contextual Escaping disallows " + - "interpolations that concatenate multiple expressions when a trusted value is " + - "required. See http://docs.angularjs.org/api/ng.$sce", text); -}; - -$interpolateMinErr.interr = function(text, err) { - return $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text, err.toString()); -}; + $interpolateMinErr.interr = function (text, err) { + return $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text, err.toString()); + }; -/** - * @ngdoc provider - * @name $interpolateProvider - * - * @description - * - * Used for configuring the interpolation markup. Defaults to `{{` and `}}`. - * - *
- * This feature is sometimes used to mix different markup languages, e.g. to wrap an Angular - * template within a Python Jinja template (or any other template language). Mixing templating - * languages is **very dangerous**. The embedding template language will not safely escape Angular - * expressions, so any user-controlled values in the template will cause Cross Site Scripting (XSS) - * security bugs! - *
- * - * @example - - - -
- //demo.label// -
- - - it('should interpolate binding with custom symbols', function() { + +
+ //demo.label// +
+ + + it('should interpolate binding with custom symbols', function() { expect(element(by.binding('demo.label')).getText()).toBe('This binding is brought you by // interpolation symbols.'); }); - - - */ -function $InterpolateProvider() { - var startSymbol = '{{'; - var endSymbol = '}}'; - - /** - * @ngdoc method - * @name $interpolateProvider#startSymbol - * @description - * Symbol to denote start of expression in the interpolated string. Defaults to `{{`. - * - * @param {string=} value new value to set the starting symbol to. - * @returns {string|self} Returns the symbol when used as getter and self if used as setter. - */ - this.startSymbol = function(value) { - if (value) { - startSymbol = value; - return this; - } else { - return startSymbol; - } - }; + + + */ + function $InterpolateProvider() { + var startSymbol = '{{'; + var endSymbol = '}}'; - /** - * @ngdoc method - * @name $interpolateProvider#endSymbol - * @description - * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`. + /** + * @ngdoc method + * @name $interpolateProvider#startSymbol + * @description + * Symbol to denote start of expression in the interpolated string. Defaults to `{{`. * - * @param {string=} value new value to set the ending symbol to. - * @returns {string|self} Returns the symbol when used as getter and self if used as setter. - */ - this.endSymbol = function(value) { - if (value) { - endSymbol = value; - return this; - } else { - return endSymbol; - } - }; - - - this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) { - var startSymbolLength = startSymbol.length, - endSymbolLength = endSymbol.length, - escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'), - escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), 'g'); - - function escape(ch) { - return '\\\\\\' + ch; - } + * @param {string=} value new value to set the starting symbol to. + * @returns {string|self} Returns the symbol when used as getter and self if used as setter. + */ + this.startSymbol = function (value) { + if (value) { + startSymbol = value; + return this; + } else { + return startSymbol; + } + }; - function unescapeText(text) { - return text.replace(escapedStartRegexp, startSymbol). - replace(escapedEndRegexp, endSymbol); - } + /** + * @ngdoc method + * @name $interpolateProvider#endSymbol + * @description + * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`. + * + * @param {string=} value new value to set the ending symbol to. + * @returns {string|self} Returns the symbol when used as getter and self if used as setter. + */ + this.endSymbol = function (value) { + if (value) { + endSymbol = value; + return this; + } else { + return endSymbol; + } + }; - function stringify(value) { - if (value == null) { // null || undefined - return ''; - } - switch (typeof value) { - case 'string': - break; - case 'number': - value = '' + value; - break; - default: - value = toJson(value); - } - return value; - } + this.$get = ['$parse', '$exceptionHandler', '$sce', function ($parse, $exceptionHandler, $sce) { + var startSymbolLength = startSymbol.length, + endSymbolLength = endSymbol.length, + escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'), + escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), 'g'); - //TODO: this is the same as the constantWatchDelegate in parse.js - function constantWatchDelegate(scope, listener, objectEquality, constantInterp) { - var unwatch; - return unwatch = scope.$watch(function constantInterpolateWatch(scope) { - unwatch(); - return constantInterp(scope); - }, listener, objectEquality); - } + function escape(ch) { + return '\\\\\\' + ch; + } - /** - * @ngdoc service - * @name $interpolate - * @kind function - * - * @requires $parse - * @requires $sce - * - * @description - * - * Compiles a string with markup into an interpolation function. This service is used by the - * HTML {@link ng.$compile $compile} service for data binding. See - * {@link ng.$interpolateProvider $interpolateProvider} for configuring the - * interpolation markup. - * - * - * ```js - * var $interpolate = ...; // injected - * var exp = $interpolate('Hello {{name | uppercase}}!'); - * expect(exp({name:'Angular'})).toEqual('Hello ANGULAR!'); - * ``` - * - * `$interpolate` takes an optional fourth argument, `allOrNothing`. If `allOrNothing` is - * `true`, the interpolation function will return `undefined` unless all embedded expressions - * evaluate to a value other than `undefined`. - * - * ```js - * var $interpolate = ...; // injected - * var context = {greeting: 'Hello', name: undefined }; - * - * // default "forgiving" mode - * var exp = $interpolate('{{greeting}} {{name}}!'); - * expect(exp(context)).toEqual('Hello !'); - * - * // "allOrNothing" mode - * exp = $interpolate('{{greeting}} {{name}}!', false, null, true); - * expect(exp(context)).toBeUndefined(); - * context.name = 'Angular'; - * expect(exp(context)).toEqual('Hello Angular!'); - * ``` - * - * `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior. - * - * ####Escaped Interpolation - * $interpolate provides a mechanism for escaping interpolation markers. Start and end markers - * can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash). - * It will be rendered as a regular start/end marker, and will not be interpreted as an expression - * or binding. - * - * This enables web-servers to prevent script injection attacks and defacing attacks, to some - * degree, while also enabling code examples to work without relying on the - * {@link ng.directive:ngNonBindable ngNonBindable} directive. - * - * **For security purposes, it is strongly encouraged that web servers escape user-supplied data, - * replacing angle brackets (<, >) with &lt; and &gt; respectively, and replacing all - * interpolation start/end markers with their escaped counterparts.** - * - * Escaped interpolation markers are only replaced with the actual interpolation markers in rendered - * output when the $interpolate service processes the text. So, for HTML elements interpolated - * by {@link ng.$compile $compile}, or otherwise interpolated with the `mustHaveExpression` parameter - * set to `true`, the interpolated text must contain an unescaped interpolation expression. As such, - * this is typically useful only when user-data is used in rendering a template from the server, or - * when otherwise untrusted data is used by a directive. - * - * - * - *
- *

{{apptitle}}: \{\{ username = "defaced value"; \}\} - *

- *

{{username}} attempts to inject code which will deface the - * application, but fails to accomplish their task, because the server has correctly - * escaped the interpolation start/end markers with REVERSE SOLIDUS U+005C (backslash) - * characters.

- *

Instead, the result of the attempted script injection is visible, and can be removed - * from the database by an administrator.

- *
- * - * - * - * @param {string} text The text with markup to interpolate. - * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have - * embedded expression in order to return an interpolation function. Strings with no - * embedded expression will return null for the interpolation function. - * @param {string=} trustedContext when provided, the returned function passes the interpolated - * result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult, - * trustedContext)} before returning it. Refer to the {@link ng.$sce $sce} service that - * provides Strict Contextual Escaping for details. - * @param {boolean=} allOrNothing if `true`, then the returned function returns undefined - * unless all embedded expressions evaluate to a value other than `undefined`. - * @returns {function(context)} an interpolation function which is used to compute the - * interpolated string. The function has these parameters: - * - * - `context`: evaluation context for all expressions embedded in the interpolated text - */ - function $interpolate(text, mustHaveExpression, trustedContext, allOrNothing) { - // Provide a quick exit and simplified result function for text with no interpolation - if (!text.length || text.indexOf(startSymbol) === -1) { - var constantInterp; - if (!mustHaveExpression) { - var unescapedText = unescapeText(text); - constantInterp = valueFn(unescapedText); - constantInterp.exp = text; - constantInterp.expressions = []; - constantInterp.$$watchDelegate = constantWatchDelegate; - } - return constantInterp; - } + function unescapeText(text) { + return text.replace(escapedStartRegexp, startSymbol).replace(escapedEndRegexp, endSymbol); + } - allOrNothing = !!allOrNothing; - var startIndex, - endIndex, - index = 0, - expressions = [], - parseFns = [], - textLength = text.length, - exp, - concat = [], - expressionPositions = []; - - while (index < textLength) { - if (((startIndex = text.indexOf(startSymbol, index)) != -1) && - ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1)) { - if (index !== startIndex) { - concat.push(unescapeText(text.substring(index, startIndex))); - } - exp = text.substring(startIndex + startSymbolLength, endIndex); - expressions.push(exp); - parseFns.push($parse(exp, parseStringifyInterceptor)); - index = endIndex + endSymbolLength; - expressionPositions.push(concat.length); - concat.push(''); - } else { - // we did not find an interpolation, so we have to add the remainder to the separators array - if (index !== textLength) { - concat.push(unescapeText(text.substring(index))); - } - break; - } - } + function stringify(value) { + if (value == null) { // null || undefined + return ''; + } + switch (typeof value) { + case 'string': + break; + case 'number': + value = '' + value; + break; + default: + value = toJson(value); + } - // Concatenating expressions makes it hard to reason about whether some combination of - // concatenated values are unsafe to use and could easily lead to XSS. By requiring that a - // single expression be used for iframe[src], object[src], etc., we ensure that the value - // that's used is assigned or constructed by some JS code somewhere that is more testable or - // make it obvious that you bound the value to some user controlled value. This helps reduce - // the load when auditing for XSS issues. - if (trustedContext && concat.length > 1) { - $interpolateMinErr.throwNoconcat(text); - } + return value; + } - if (!mustHaveExpression || expressions.length) { - var compute = function(values) { - for (var i = 0, ii = expressions.length; i < ii; i++) { - if (allOrNothing && isUndefined(values[i])) return; - concat[expressionPositions[i]] = values[i]; - } - return concat.join(''); - }; + //TODO: this is the same as the constantWatchDelegate in parse.js + function constantWatchDelegate(scope, listener, objectEquality, constantInterp) { + var unwatch; + return unwatch = scope.$watch(function constantInterpolateWatch(scope) { + unwatch(); + return constantInterp(scope); + }, listener, objectEquality); + } - var getValue = function(value) { - return trustedContext ? - $sce.getTrusted(trustedContext, value) : - $sce.valueOf(value); - }; + /** + * @ngdoc service + * @name $interpolate + * @kind function + * + * @requires $parse + * @requires $sce + * + * @description + * + * Compiles a string with markup into an interpolation function. This service is used by the + * HTML {@link ng.$compile $compile} service for data binding. See + * {@link ng.$interpolateProvider $interpolateProvider} for configuring the + * interpolation markup. + * + * + * ```js + * var $interpolate = ...; // injected + * var exp = $interpolate('Hello {{name | uppercase}}!'); + * expect(exp({name:'Angular'})).toEqual('Hello ANGULAR!'); + * ``` + * + * `$interpolate` takes an optional fourth argument, `allOrNothing`. If `allOrNothing` is + * `true`, the interpolation function will return `undefined` unless all embedded expressions + * evaluate to a value other than `undefined`. + * + * ```js + * var $interpolate = ...; // injected + * var context = {greeting: 'Hello', name: undefined }; + * + * // default "forgiving" mode + * var exp = $interpolate('{{greeting}} {{name}}!'); + * expect(exp(context)).toEqual('Hello !'); + * + * // "allOrNothing" mode + * exp = $interpolate('{{greeting}} {{name}}!', false, null, true); + * expect(exp(context)).toBeUndefined(); + * context.name = 'Angular'; + * expect(exp(context)).toEqual('Hello Angular!'); + * ``` + * + * `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior. + * + * ####Escaped Interpolation + * $interpolate provides a mechanism for escaping interpolation markers. Start and end markers + * can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash). + * It will be rendered as a regular start/end marker, and will not be interpreted as an expression + * or binding. + * + * This enables web-servers to prevent script injection attacks and defacing attacks, to some + * degree, while also enabling code examples to work without relying on the + * {@link ng.directive:ngNonBindable ngNonBindable} directive. + * + * **For security purposes, it is strongly encouraged that web servers escape user-supplied data, + * replacing angle brackets (<, >) with &lt; and &gt; respectively, and replacing all + * interpolation start/end markers with their escaped counterparts.** + * + * Escaped interpolation markers are only replaced with the actual interpolation markers in rendered + * output when the $interpolate service processes the text. So, for HTML elements interpolated + * by {@link ng.$compile $compile}, or otherwise interpolated with the `mustHaveExpression` parameter + * set to `true`, the interpolated text must contain an unescaped interpolation expression. As such, + * this is typically useful only when user-data is used in rendering a template from the server, or + * when otherwise untrusted data is used by a directive. + * + * + * + *
+ *

{{apptitle}}: \{\{ username = "defaced value"; \}\} + *

+ *

{{username}} attempts to inject code which will deface the + * application, but fails to accomplish their task, because the server has correctly + * escaped the interpolation start/end markers with REVERSE SOLIDUS U+005C (backslash) + * characters.

+ *

Instead, the result of the attempted script injection is visible, and can be removed + * from the database by an administrator.

+ *
+ * + * + * + * @param {string} text The text with markup to interpolate. + * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have + * embedded expression in order to return an interpolation function. Strings with no + * embedded expression will return null for the interpolation function. + * @param {string=} trustedContext when provided, the returned function passes the interpolated + * result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult, + * trustedContext)} before returning it. Refer to the {@link ng.$sce $sce} service that + * provides Strict Contextual Escaping for details. + * @param {boolean=} allOrNothing if `true`, then the returned function returns undefined + * unless all embedded expressions evaluate to a value other than `undefined`. + * @returns {function(context)} an interpolation function which is used to compute the + * interpolated string. The function has these parameters: + * + * - `context`: evaluation context for all expressions embedded in the interpolated text + */ + function $interpolate(text, mustHaveExpression, trustedContext, allOrNothing) { + // Provide a quick exit and simplified result function for text with no interpolation + if (!text.length || text.indexOf(startSymbol) === -1) { + var constantInterp; + if (!mustHaveExpression) { + var unescapedText = unescapeText(text); + constantInterp = valueFn(unescapedText); + constantInterp.exp = text; + constantInterp.expressions = []; + constantInterp.$$watchDelegate = constantWatchDelegate; + } + return constantInterp; + } - return extend(function interpolationFn(context) { - var i = 0; - var ii = expressions.length; - var values = new Array(ii); + allOrNothing = !!allOrNothing; + var startIndex, + endIndex, + index = 0, + expressions = [], + parseFns = [], + textLength = text.length, + exp, + concat = [], + expressionPositions = []; + + while (index < textLength) { + if (((startIndex = text.indexOf(startSymbol, index)) != -1) && + ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1)) { + if (index !== startIndex) { + concat.push(unescapeText(text.substring(index, startIndex))); + } + exp = text.substring(startIndex + startSymbolLength, endIndex); + expressions.push(exp); + parseFns.push($parse(exp, parseStringifyInterceptor)); + index = endIndex + endSymbolLength; + expressionPositions.push(concat.length); + concat.push(''); + } else { + // we did not find an interpolation, so we have to add the remainder to the separators array + if (index !== textLength) { + concat.push(unescapeText(text.substring(index))); + } + break; + } + } - try { - for (; i < ii; i++) { - values[i] = parseFns[i](context); - } + // Concatenating expressions makes it hard to reason about whether some combination of + // concatenated values are unsafe to use and could easily lead to XSS. By requiring that a + // single expression be used for iframe[src], object[src], etc., we ensure that the value + // that's used is assigned or constructed by some JS code somewhere that is more testable or + // make it obvious that you bound the value to some user controlled value. This helps reduce + // the load when auditing for XSS issues. + if (trustedContext && concat.length > 1) { + $interpolateMinErr.throwNoconcat(text); + } - return compute(values); - } catch (err) { - $exceptionHandler($interpolateMinErr.interr(text, err)); - } - - }, { - // all of these properties are undocumented for now - exp: text, //just for compatibility with regular watchers created via $watch - expressions: expressions, - $$watchDelegate: function(scope, listener) { - var lastValue; - return scope.$watchGroup(parseFns, function interpolateFnWatcher(values, oldValues) { - var currValue = compute(values); - if (isFunction(listener)) { - listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope); - } - lastValue = currValue; - }); - } - }); - } + if (!mustHaveExpression || expressions.length) { + var compute = function (values) { + for (var i = 0, ii = expressions.length; i < ii; i++) { + if (allOrNothing && isUndefined(values[i])) return; + concat[expressionPositions[i]] = values[i]; + } + return concat.join(''); + }; + + var getValue = function (value) { + return trustedContext ? + $sce.getTrusted(trustedContext, value) : + $sce.valueOf(value); + }; + + return extend(function interpolationFn(context) { + var i = 0; + var ii = expressions.length; + var values = new Array(ii); + + try { + for (; i < ii; i++) { + values[i] = parseFns[i](context); + } + + return compute(values); + } catch (err) { + $exceptionHandler($interpolateMinErr.interr(text, err)); + } + + }, { + // all of these properties are undocumented for now + exp: text, //just for compatibility with regular watchers created via $watch + expressions: expressions, + $$watchDelegate: function (scope, listener) { + var lastValue; + return scope.$watchGroup(parseFns, function interpolateFnWatcher(values, oldValues) { + var currValue = compute(values); + if (isFunction(listener)) { + listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope); + } + lastValue = currValue; + }); + } + }); + } - function parseStringifyInterceptor(value) { - try { - value = getValue(value); - return allOrNothing && !isDefined(value) ? value : stringify(value); - } catch (err) { - $exceptionHandler($interpolateMinErr.interr(text, err)); - } - } - } + function parseStringifyInterceptor(value) { + try { + value = getValue(value); + return allOrNothing && !isDefined(value) ? value : stringify(value); + } catch (err) { + $exceptionHandler($interpolateMinErr.interr(text, err)); + } + } + } - /** - * @ngdoc method - * @name $interpolate#startSymbol - * @description - * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`. + /** + * @ngdoc method + * @name $interpolate#startSymbol + * @description + * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`. * * Use {@link ng.$interpolateProvider#startSymbol `$interpolateProvider.startSymbol`} to change * the symbol. * - * @returns {string} start symbol. - */ - $interpolate.startSymbol = function() { - return startSymbol; - }; - - - /** - * @ngdoc method - * @name $interpolate#endSymbol - * @description - * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`. - * - * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change - * the symbol. - * - * @returns {string} end symbol. - */ - $interpolate.endSymbol = function() { - return endSymbol; - }; - - return $interpolate; - }]; -} + * @returns {string} start symbol. + */ + $interpolate.startSymbol = function () { + return startSymbol; + }; -function $IntervalProvider() { - this.$get = ['$rootScope', '$window', '$q', '$$q', '$browser', - function($rootScope, $window, $q, $$q, $browser) { - var intervals = {}; + /** + * @ngdoc method + * @name $interpolate#endSymbol + * @description + * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`. + * + * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change + * the symbol. + * + * @returns {string} end symbol. + */ + $interpolate.endSymbol = function () { + return endSymbol; + }; - /** - * @ngdoc service - * @name $interval - * - * @description - * Angular's wrapper for `window.setInterval`. The `fn` function is executed every `delay` - * milliseconds. - * - * The return value of registering an interval function is a promise. This promise will be - * notified upon each tick of the interval, and will be resolved after `count` iterations, or - * run indefinitely if `count` is not defined. The value of the notification will be the - * number of iterations that have run. - * To cancel an interval, call `$interval.cancel(promise)`. - * - * In tests you can use {@link ngMock.$interval#flush `$interval.flush(millis)`} to - * move forward by `millis` milliseconds and trigger any functions scheduled to run in that - * time. - * - *
- * **Note**: Intervals created by this service must be explicitly destroyed when you are finished - * with them. In particular they are not automatically destroyed when a controller's scope or a - * directive's element are destroyed. - * You should take this into consideration and make sure to always cancel the interval at the - * appropriate moment. See the example below for more details on how and when to do this. - *
- * - * @param {function()} fn A function that should be called repeatedly. - * @param {number} delay Number of milliseconds between each function call. - * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat - * indefinitely. - * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise - * will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block. - * @param {...*=} Pass additional parameters to the executed function. - * @returns {promise} A promise which will be notified on each iteration. - * - * @example - * - * - * - * - *
- *
- *
- * Current time is: - *
- * Blood 1 : {{blood_1}} - * Blood 2 : {{blood_2}} - * - * - * - *
- *
- * - * - * - */ - function interval(fn, delay, count, invokeApply) { - var hasParams = arguments.length > 4, - args = hasParams ? sliceArgs(arguments, 4) : [], - setInterval = $window.setInterval, - clearInterval = $window.clearInterval, - iteration = 0, - skipApply = (isDefined(invokeApply) && !invokeApply), - deferred = (skipApply ? $$q : $q).defer(), - promise = deferred.promise; - - count = isDefined(count) ? count : 0; - - promise.$$intervalId = setInterval(function tick() { - if (skipApply) { - $browser.defer(callback); - } else { - $rootScope.$evalAsync(callback); - } - deferred.notify(iteration++); - - if (count > 0 && iteration >= count) { - deferred.resolve(iteration); - clearInterval(promise.$$intervalId); - delete intervals[promise.$$intervalId]; - } - - if (!skipApply) $rootScope.$apply(); - - }, delay); + * + * + *
+ *
+ *
+ * Current time is: + *
+ * Blood 1 : {{blood_1}} + * Blood 2 : {{blood_2}} + * + * + * + *
+ *
+ * + * + * + */ + function interval(fn, delay, count, invokeApply) { + var hasParams = arguments.length > 4, + args = hasParams ? sliceArgs(arguments, 4) : [], + setInterval = $window.setInterval, + clearInterval = $window.clearInterval, + iteration = 0, + skipApply = (isDefined(invokeApply) && !invokeApply), + deferred = (skipApply ? $$q : $q).defer(), + promise = deferred.promise; + + count = isDefined(count) ? count : 0; + + promise.$$intervalId = setInterval(function tick() { + if (skipApply) { + $browser.defer(callback); + } else { + $rootScope.$evalAsync(callback); + } + deferred.notify(iteration++); + + if (count > 0 && iteration >= count) { + deferred.resolve(iteration); + clearInterval(promise.$$intervalId); + delete intervals[promise.$$intervalId]; + } + + if (!skipApply) $rootScope.$apply(); + + }, delay); + + intervals[promise.$$intervalId] = deferred; + + return promise; + + function callback() { + if (!hasParams) { + fn(iteration); + } else { + fn.apply(null, args); + } + } + } - intervals[promise.$$intervalId] = deferred; - return promise; + /** + * @ngdoc method + * @name $interval#cancel + * + * @description + * Cancels a task associated with the `promise`. + * + * @param {Promise=} promise returned by the `$interval` function. + * @returns {boolean} Returns `true` if the task was successfully canceled. + */ + interval.cancel = function (promise) { + if (promise && promise.$$intervalId in intervals) { + intervals[promise.$$intervalId].reject('canceled'); + $window.clearInterval(promise.$$intervalId); + delete intervals[promise.$$intervalId]; + return true; + } + return false; + }; - function callback() { - if (!hasParams) { - fn(iteration); - } else { - fn.apply(null, args); - } - } + return interval; + }]; } + /** + * @ngdoc service + * @name $locale + * + * @description + * $locale service provides localization rules for various Angular components. As of right now the + * only public api is: + * + * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`) + */ - /** - * @ngdoc method - * @name $interval#cancel - * - * @description - * Cancels a task associated with the `promise`. - * - * @param {Promise=} promise returned by the `$interval` function. - * @returns {boolean} Returns `true` if the task was successfully canceled. - */ - interval.cancel = function(promise) { - if (promise && promise.$$intervalId in intervals) { - intervals[promise.$$intervalId].reject('canceled'); - $window.clearInterval(promise.$$intervalId); - delete intervals[promise.$$intervalId]; - return true; - } - return false; - }; + var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/, + DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21}; + var $locationMinErr = minErr('$location'); - return interval; - }]; -} -/** - * @ngdoc service - * @name $locale - * - * @description - * $locale service provides localization rules for various Angular components. As of right now the - * only public api is: - * - * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`) - */ + /** + * Encode path using encodeUriSegment, ignoring forward slashes + * + * @param {string} path Path to encode + * @returns {string} + */ + function encodePath(path) { + var segments = path.split('/'), + i = segments.length; -var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/, - DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21}; -var $locationMinErr = minErr('$location'); + while (i--) { + segments[i] = encodeUriSegment(segments[i]); + } + return segments.join('/'); + } -/** - * Encode path using encodeUriSegment, ignoring forward slashes - * - * @param {string} path Path to encode - * @returns {string} - */ -function encodePath(path) { - var segments = path.split('/'), - i = segments.length; + function parseAbsoluteUrl(absoluteUrl, locationObj) { + var parsedUrl = urlResolve(absoluteUrl); - while (i--) { - segments[i] = encodeUriSegment(segments[i]); - } + locationObj.$$protocol = parsedUrl.protocol; + locationObj.$$host = parsedUrl.hostname; + locationObj.$$port = toInt(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null; + } - return segments.join('/'); -} -function parseAbsoluteUrl(absoluteUrl, locationObj) { - var parsedUrl = urlResolve(absoluteUrl); + function parseAppUrl(relativeUrl, locationObj) { + var prefixed = (relativeUrl.charAt(0) !== '/'); + if (prefixed) { + relativeUrl = '/' + relativeUrl; + } + var match = urlResolve(relativeUrl); + locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ? + match.pathname.substring(1) : match.pathname); + locationObj.$$search = parseKeyValue(match.search); + locationObj.$$hash = decodeURIComponent(match.hash); - locationObj.$$protocol = parsedUrl.protocol; - locationObj.$$host = parsedUrl.hostname; - locationObj.$$port = toInt(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null; -} + // make sure path starts with '/'; + if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') { + locationObj.$$path = '/' + locationObj.$$path; + } + } -function parseAppUrl(relativeUrl, locationObj) { - var prefixed = (relativeUrl.charAt(0) !== '/'); - if (prefixed) { - relativeUrl = '/' + relativeUrl; - } - var match = urlResolve(relativeUrl); - locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ? - match.pathname.substring(1) : match.pathname); - locationObj.$$search = parseKeyValue(match.search); - locationObj.$$hash = decodeURIComponent(match.hash); + /** + * + * @param {string} begin + * @param {string} whole + * @returns {string} returns text from whole after begin or undefined if it does not begin with + * expected string. + */ + function beginsWith(begin, whole) { + if (whole.indexOf(begin) === 0) { + return whole.substr(begin.length); + } + } - // make sure path starts with '/'; - if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') { - locationObj.$$path = '/' + locationObj.$$path; - } -} + function stripHash(url) { + var index = url.indexOf('#'); + return index == -1 ? url : url.substr(0, index); + } -/** - * - * @param {string} begin - * @param {string} whole - * @returns {string} returns text from whole after begin or undefined if it does not begin with - * expected string. - */ -function beginsWith(begin, whole) { - if (whole.indexOf(begin) === 0) { - return whole.substr(begin.length); - } -} + function trimEmptyHash(url) { + return url.replace(/(#.+)|#$/, '$1'); + } -function stripHash(url) { - var index = url.indexOf('#'); - return index == -1 ? url : url.substr(0, index); -} + function stripFile(url) { + return url.substr(0, stripHash(url).lastIndexOf('/') + 1); + } -function trimEmptyHash(url) { - return url.replace(/(#.+)|#$/, '$1'); -} + /* return the server only (scheme://host:port) */ + function serverBase(url) { + return url.substring(0, url.indexOf('/', url.indexOf('//') + 2)); + } -function stripFile(url) { - return url.substr(0, stripHash(url).lastIndexOf('/') + 1); -} + /** + * LocationHtml5Url represents an url + * This object is exposed as $location service when HTML5 mode is enabled and supported + * + * @constructor + * @param {string} appBase application base URL + * @param {string} appBaseNoFile application base URL stripped of any filename + * @param {string} basePrefix url path prefix + */ + function LocationHtml5Url(appBase, appBaseNoFile, basePrefix) { + this.$$html5 = true; + basePrefix = basePrefix || ''; + parseAbsoluteUrl(appBase, this); -/* return the server only (scheme://host:port) */ -function serverBase(url) { - return url.substring(0, url.indexOf('/', url.indexOf('//') + 2)); -} + /** + * Parse given html5 (regular) url string into properties + * @param {string} url HTML5 url + * @private + */ + this.$$parse = function (url) { + var pathUrl = beginsWith(appBaseNoFile, url); + if (!isString(pathUrl)) { + throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url, + appBaseNoFile); + } -/** - * LocationHtml5Url represents an url - * This object is exposed as $location service when HTML5 mode is enabled and supported - * - * @constructor - * @param {string} appBase application base URL - * @param {string} appBaseNoFile application base URL stripped of any filename - * @param {string} basePrefix url path prefix - */ -function LocationHtml5Url(appBase, appBaseNoFile, basePrefix) { - this.$$html5 = true; - basePrefix = basePrefix || ''; - parseAbsoluteUrl(appBase, this); + parseAppUrl(pathUrl, this); + if (!this.$$path) { + this.$$path = '/'; + } - /** - * Parse given html5 (regular) url string into properties - * @param {string} url HTML5 url - * @private - */ - this.$$parse = function(url) { - var pathUrl = beginsWith(appBaseNoFile, url); - if (!isString(pathUrl)) { - throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url, - appBaseNoFile); - } + this.$$compose(); + }; - parseAppUrl(pathUrl, this); + /** + * Compose url and update `absUrl` property + * @private + */ + this.$$compose = function () { + var search = toKeyValue(this.$$search), + hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; - if (!this.$$path) { - this.$$path = '/'; - } + this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; + this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/' + }; - this.$$compose(); - }; + this.$$parseLinkUrl = function (url, relHref) { + if (relHref && relHref[0] === '#') { + // special case for links to hash fragments: + // keep the old url and only replace the hash fragment + this.hash(relHref.slice(1)); + return true; + } + var appUrl, prevAppUrl; + var rewrittenUrl; - /** - * Compose url and update `absUrl` property - * @private - */ - this.$$compose = function() { - var search = toKeyValue(this.$$search), - hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; - - this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; - this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/' - }; - - this.$$parseLinkUrl = function(url, relHref) { - if (relHref && relHref[0] === '#') { - // special case for links to hash fragments: - // keep the old url and only replace the hash fragment - this.hash(relHref.slice(1)); - return true; - } - var appUrl, prevAppUrl; - var rewrittenUrl; - - if (isDefined(appUrl = beginsWith(appBase, url))) { - prevAppUrl = appUrl; - if (isDefined(appUrl = beginsWith(basePrefix, appUrl))) { - rewrittenUrl = appBaseNoFile + (beginsWith('/', appUrl) || appUrl); - } else { - rewrittenUrl = appBase + prevAppUrl; - } - } else if (isDefined(appUrl = beginsWith(appBaseNoFile, url))) { - rewrittenUrl = appBaseNoFile + appUrl; - } else if (appBaseNoFile == url + '/') { - rewrittenUrl = appBaseNoFile; - } - if (rewrittenUrl) { - this.$$parse(rewrittenUrl); + if (isDefined(appUrl = beginsWith(appBase, url))) { + prevAppUrl = appUrl; + if (isDefined(appUrl = beginsWith(basePrefix, appUrl))) { + rewrittenUrl = appBaseNoFile + (beginsWith('/', appUrl) || appUrl); + } else { + rewrittenUrl = appBase + prevAppUrl; + } + } else if (isDefined(appUrl = beginsWith(appBaseNoFile, url))) { + rewrittenUrl = appBaseNoFile + appUrl; + } else if (appBaseNoFile == url + '/') { + rewrittenUrl = appBaseNoFile; + } + if (rewrittenUrl) { + this.$$parse(rewrittenUrl); + } + return !!rewrittenUrl; + }; } - return !!rewrittenUrl; - }; -} -/** - * LocationHashbangUrl represents url - * This object is exposed as $location service when developer doesn't opt into html5 mode. - * It also serves as the base class for html5 mode fallback on legacy browsers. - * - * @constructor - * @param {string} appBase application base URL - * @param {string} appBaseNoFile application base URL stripped of any filename - * @param {string} hashPrefix hashbang prefix - */ -function LocationHashbangUrl(appBase, appBaseNoFile, hashPrefix) { + /** + * LocationHashbangUrl represents url + * This object is exposed as $location service when developer doesn't opt into html5 mode. + * It also serves as the base class for html5 mode fallback on legacy browsers. + * + * @constructor + * @param {string} appBase application base URL + * @param {string} appBaseNoFile application base URL stripped of any filename + * @param {string} hashPrefix hashbang prefix + */ + function LocationHashbangUrl(appBase, appBaseNoFile, hashPrefix) { - parseAbsoluteUrl(appBase, this); + parseAbsoluteUrl(appBase, this); - /** - * Parse given hashbang url into properties - * @param {string} url Hashbang url - * @private - */ - this.$$parse = function(url) { - var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url); - var withoutHashUrl; - - if (!isUndefined(withoutBaseUrl) && withoutBaseUrl.charAt(0) === '#') { - - // The rest of the url starts with a hash so we have - // got either a hashbang path or a plain hash fragment - withoutHashUrl = beginsWith(hashPrefix, withoutBaseUrl); - if (isUndefined(withoutHashUrl)) { - // There was no hashbang prefix so we just have a hash fragment - withoutHashUrl = withoutBaseUrl; - } + /** + * Parse given hashbang url into properties + * @param {string} url Hashbang url + * @private + */ + this.$$parse = function (url) { + var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url); + var withoutHashUrl; + + if (!isUndefined(withoutBaseUrl) && withoutBaseUrl.charAt(0) === '#') { + + // The rest of the url starts with a hash so we have + // got either a hashbang path or a plain hash fragment + withoutHashUrl = beginsWith(hashPrefix, withoutBaseUrl); + if (isUndefined(withoutHashUrl)) { + // There was no hashbang prefix so we just have a hash fragment + withoutHashUrl = withoutBaseUrl; + } - } else { - // There was no hashbang path nor hash fragment: - // If we are in HTML5 mode we use what is left as the path; - // Otherwise we ignore what is left - if (this.$$html5) { - withoutHashUrl = withoutBaseUrl; - } else { - withoutHashUrl = ''; - if (isUndefined(withoutBaseUrl)) { - appBase = url; - this.replace(); - } - } - } + } else { + // There was no hashbang path nor hash fragment: + // If we are in HTML5 mode we use what is left as the path; + // Otherwise we ignore what is left + if (this.$$html5) { + withoutHashUrl = withoutBaseUrl; + } else { + withoutHashUrl = ''; + if (isUndefined(withoutBaseUrl)) { + appBase = url; + this.replace(); + } + } + } - parseAppUrl(withoutHashUrl, this); + parseAppUrl(withoutHashUrl, this); - this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase); + this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase); - this.$$compose(); + this.$$compose(); - /* + /* * In Windows, on an anchor node on documents loaded from * the filesystem, the browser will return a pathname * prefixed with the drive name ('/C:/path') when a @@ -12634,933 +12682,934 @@ function LocationHashbangUrl(appBase, appBaseNoFile, hashPrefix) { * Inside of Angular, we're always using pathnames that * do not include drive names for routing. */ - function removeWindowsDriveName(path, url, base) { - /* + function removeWindowsDriveName(path, url, base) { + /* Matches paths for file protocol on windows, such as /C:/foo/bar, and captures only /foo/bar. */ - var windowsFilePathExp = /^\/[A-Z]:(\/.*)/; + var windowsFilePathExp = /^\/[A-Z]:(\/.*)/; - var firstPathSegmentMatch; + var firstPathSegmentMatch; - //Get the relative path from the input URL. - if (url.indexOf(base) === 0) { - url = url.replace(base, ''); - } + //Get the relative path from the input URL. + if (url.indexOf(base) === 0) { + url = url.replace(base, ''); + } - // The input URL intentionally contains a first path segment that ends with a colon. - if (windowsFilePathExp.exec(url)) { - return path; - } + // The input URL intentionally contains a first path segment that ends with a colon. + if (windowsFilePathExp.exec(url)) { + return path; + } - firstPathSegmentMatch = windowsFilePathExp.exec(path); - return firstPathSegmentMatch ? firstPathSegmentMatch[1] : path; - } - }; + firstPathSegmentMatch = windowsFilePathExp.exec(path); + return firstPathSegmentMatch ? firstPathSegmentMatch[1] : path; + } + }; - /** - * Compose hashbang url and update `absUrl` property - * @private - */ - this.$$compose = function() { - var search = toKeyValue(this.$$search), - hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; - - this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; - this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : ''); - }; - - this.$$parseLinkUrl = function(url, relHref) { - if (stripHash(appBase) == stripHash(url)) { - this.$$parse(url); - return true; - } - return false; - }; -} + /** + * Compose hashbang url and update `absUrl` property + * @private + */ + this.$$compose = function () { + var search = toKeyValue(this.$$search), + hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; + this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; + this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : ''); + }; -/** - * LocationHashbangUrl represents url - * This object is exposed as $location service when html5 history api is enabled but the browser - * does not support it. - * - * @constructor - * @param {string} appBase application base URL - * @param {string} appBaseNoFile application base URL stripped of any filename - * @param {string} hashPrefix hashbang prefix - */ -function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) { - this.$$html5 = true; - LocationHashbangUrl.apply(this, arguments); - - this.$$parseLinkUrl = function(url, relHref) { - if (relHref && relHref[0] === '#') { - // special case for links to hash fragments: - // keep the old url and only replace the hash fragment - this.hash(relHref.slice(1)); - return true; + this.$$parseLinkUrl = function (url, relHref) { + if (stripHash(appBase) == stripHash(url)) { + this.$$parse(url); + return true; + } + return false; + }; } - var rewrittenUrl; - var appUrl; - if (appBase == stripHash(url)) { - rewrittenUrl = url; - } else if ((appUrl = beginsWith(appBaseNoFile, url))) { - rewrittenUrl = appBase + hashPrefix + appUrl; - } else if (appBaseNoFile === url + '/') { - rewrittenUrl = appBaseNoFile; - } - if (rewrittenUrl) { - this.$$parse(rewrittenUrl); + /** + * LocationHashbangUrl represents url + * This object is exposed as $location service when html5 history api is enabled but the browser + * does not support it. + * + * @constructor + * @param {string} appBase application base URL + * @param {string} appBaseNoFile application base URL stripped of any filename + * @param {string} hashPrefix hashbang prefix + */ + function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) { + this.$$html5 = true; + LocationHashbangUrl.apply(this, arguments); + + this.$$parseLinkUrl = function (url, relHref) { + if (relHref && relHref[0] === '#') { + // special case for links to hash fragments: + // keep the old url and only replace the hash fragment + this.hash(relHref.slice(1)); + return true; + } + + var rewrittenUrl; + var appUrl; + + if (appBase == stripHash(url)) { + rewrittenUrl = url; + } else if ((appUrl = beginsWith(appBaseNoFile, url))) { + rewrittenUrl = appBase + hashPrefix + appUrl; + } else if (appBaseNoFile === url + '/') { + rewrittenUrl = appBaseNoFile; + } + if (rewrittenUrl) { + this.$$parse(rewrittenUrl); + } + return !!rewrittenUrl; + }; + + this.$$compose = function () { + var search = toKeyValue(this.$$search), + hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; + + this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; + // include hashPrefix in $$absUrl when $$url is empty so IE9 does not reload page because of removal of '#' + this.$$absUrl = appBase + hashPrefix + this.$$url; + }; + } - return !!rewrittenUrl; - }; - this.$$compose = function() { - var search = toKeyValue(this.$$search), - hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; - this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; - // include hashPrefix in $$absUrl when $$url is empty so IE9 does not reload page because of removal of '#' - this.$$absUrl = appBase + hashPrefix + this.$$url; - }; + var locationPrototype = { -} + /** + * Are we in html5 mode? + * @private + */ + $$html5: false, + /** + * Has any change been replacing? + * @private + */ + $$replace: false, -var locationPrototype = { + /** + * @ngdoc method + * @name $location#absUrl + * + * @description + * This method is getter only. + * + * Return full url representation with all segments encoded according to rules specified in + * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt). + * + * + * ```js + * // given url http://example.com/#/some/path?foo=bar&baz=xoxo + * var absUrl = $location.absUrl(); + * // => "http://example.com/#/some/path?foo=bar&baz=xoxo" + * ``` + * + * @return {string} full url + */ + absUrl: locationGetter('$$absUrl'), - /** - * Are we in html5 mode? - * @private - */ - $$html5: false, + /** + * @ngdoc method + * @name $location#url + * + * @description + * This method is getter / setter. + * + * Return url (e.g. `/path?a=b#hash`) when called without any parameter. + * + * Change path, search and hash, when called with parameter and return `$location`. + * + * + * ```js + * // given url http://example.com/#/some/path?foo=bar&baz=xoxo + * var url = $location.url(); + * // => "/some/path?foo=bar&baz=xoxo" + * ``` + * + * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`) + * @return {string} url + */ + url: function (url) { + if (isUndefined(url)) { + return this.$$url; + } - /** - * Has any change been replacing? - * @private - */ - $$replace: false, + var match = PATH_MATCH.exec(url); + if (match[1] || url === '') this.path(decodeURIComponent(match[1])); + if (match[2] || match[1] || url === '') this.search(match[3] || ''); + this.hash(match[5] || ''); - /** - * @ngdoc method - * @name $location#absUrl - * - * @description - * This method is getter only. - * - * Return full url representation with all segments encoded according to rules specified in - * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt). - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var absUrl = $location.absUrl(); - * // => "http://example.com/#/some/path?foo=bar&baz=xoxo" - * ``` - * - * @return {string} full url - */ - absUrl: locationGetter('$$absUrl'), + return this; + }, - /** - * @ngdoc method - * @name $location#url - * - * @description - * This method is getter / setter. - * - * Return url (e.g. `/path?a=b#hash`) when called without any parameter. - * - * Change path, search and hash, when called with parameter and return `$location`. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var url = $location.url(); - * // => "/some/path?foo=bar&baz=xoxo" - * ``` - * - * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`) - * @return {string} url - */ - url: function(url) { - if (isUndefined(url)) { - return this.$$url; - } + /** + * @ngdoc method + * @name $location#protocol + * + * @description + * This method is getter only. + * + * Return protocol of current url. + * + * + * ```js + * // given url http://example.com/#/some/path?foo=bar&baz=xoxo + * var protocol = $location.protocol(); + * // => "http" + * ``` + * + * @return {string} protocol of current url + */ + protocol: locationGetter('$$protocol'), + + /** + * @ngdoc method + * @name $location#host + * + * @description + * This method is getter only. + * + * Return host of current url. + * + * Note: compared to the non-angular version `location.host` which returns `hostname:port`, this returns the `hostname` portion only. + * + * + * ```js + * // given url http://example.com/#/some/path?foo=bar&baz=xoxo + * var host = $location.host(); + * // => "example.com" + * + * // given url http://user:password@example.com:8080/#/some/path?foo=bar&baz=xoxo + * host = $location.host(); + * // => "example.com" + * host = location.host; + * // => "example.com:8080" + * ``` + * + * @return {string} host of current url. + */ + host: locationGetter('$$host'), - var match = PATH_MATCH.exec(url); - if (match[1] || url === '') this.path(decodeURIComponent(match[1])); - if (match[2] || match[1] || url === '') this.search(match[3] || ''); - this.hash(match[5] || ''); + /** + * @ngdoc method + * @name $location#port + * + * @description + * This method is getter only. + * + * Return port of current url. + * + * + * ```js + * // given url http://example.com/#/some/path?foo=bar&baz=xoxo + * var port = $location.port(); + * // => 80 + * ``` + * + * @return {Number} port + */ + port: locationGetter('$$port'), - return this; - }, + /** + * @ngdoc method + * @name $location#path + * + * @description + * This method is getter / setter. + * + * Return path of current url when called without any parameter. + * + * Change path when called with parameter and return `$location`. + * + * Note: Path should always begin with forward slash (/), this method will add the forward slash + * if it is missing. + * + * + * ```js + * // given url http://example.com/#/some/path?foo=bar&baz=xoxo + * var path = $location.path(); + * // => "/some/path" + * ``` + * + * @param {(string|number)=} path New path + * @return {string} path + */ + path: locationGetterSetter('$$path', function (path) { + path = path !== null ? path.toString() : ''; + return path.charAt(0) == '/' ? path : '/' + path; + }), - /** - * @ngdoc method - * @name $location#protocol - * - * @description - * This method is getter only. - * - * Return protocol of current url. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var protocol = $location.protocol(); - * // => "http" - * ``` - * - * @return {string} protocol of current url - */ - protocol: locationGetter('$$protocol'), + /** + * @ngdoc method + * @name $location#search + * + * @description + * This method is getter / setter. + * + * Return search part (as object) of current url when called without any parameter. + * + * Change search part when called with parameter and return `$location`. + * + * + * ```js + * // given url http://example.com/#/some/path?foo=bar&baz=xoxo + * var searchObject = $location.search(); + * // => {foo: 'bar', baz: 'xoxo'} + * + * // set foo to 'yipee' + * $location.search('foo', 'yipee'); + * // $location.search() => {foo: 'yipee', baz: 'xoxo'} + * ``` + * + * @param {string|Object.|Object.>} search New search params - string or + * hash object. + * + * When called with a single argument the method acts as a setter, setting the `search` component + * of `$location` to the specified value. + * + * If the argument is a hash object containing an array of values, these values will be encoded + * as duplicate search parameters in the url. + * + * @param {(string|Number|Array|boolean)=} paramValue If `search` is a string or number, then `paramValue` + * will override only a single search property. + * + * If `paramValue` is an array, it will override the property of the `search` component of + * `$location` specified via the first argument. + * + * If `paramValue` is `null`, the property specified via the first argument will be deleted. + * + * If `paramValue` is `true`, the property specified via the first argument will be added with no + * value nor trailing equal sign. + * + * @return {Object} If called with no arguments returns the parsed `search` object. If called with + * one or more arguments returns `$location` object itself. + */ + search: function (search, paramValue) { + switch (arguments.length) { + case 0: + return this.$$search; + case 1: + if (isString(search) || isNumber(search)) { + search = search.toString(); + this.$$search = parseKeyValue(search); + } else if (isObject(search)) { + search = copy(search, {}); + // remove object undefined or null properties + forEach(search, function (value, key) { + if (value == null) delete search[key]; + }); - /** - * @ngdoc method - * @name $location#host - * - * @description - * This method is getter only. - * - * Return host of current url. - * - * Note: compared to the non-angular version `location.host` which returns `hostname:port`, this returns the `hostname` portion only. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var host = $location.host(); - * // => "example.com" - * - * // given url http://user:password@example.com:8080/#/some/path?foo=bar&baz=xoxo - * host = $location.host(); - * // => "example.com" - * host = location.host; - * // => "example.com:8080" - * ``` - * - * @return {string} host of current url. - */ - host: locationGetter('$$host'), + this.$$search = search; + } else { + throw $locationMinErr('isrcharg', + 'The first argument of the `$location#search()` call must be a string or an object.'); + } + break; + default: + if (isUndefined(paramValue) || paramValue === null) { + delete this.$$search[search]; + } else { + this.$$search[search] = paramValue; + } + } - /** - * @ngdoc method - * @name $location#port - * - * @description - * This method is getter only. - * - * Return port of current url. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var port = $location.port(); - * // => 80 - * ``` - * - * @return {Number} port - */ - port: locationGetter('$$port'), + this.$$compose(); + return this; + }, - /** - * @ngdoc method - * @name $location#path - * - * @description - * This method is getter / setter. - * - * Return path of current url when called without any parameter. - * - * Change path when called with parameter and return `$location`. - * - * Note: Path should always begin with forward slash (/), this method will add the forward slash - * if it is missing. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var path = $location.path(); - * // => "/some/path" - * ``` - * - * @param {(string|number)=} path New path - * @return {string} path - */ - path: locationGetterSetter('$$path', function(path) { - path = path !== null ? path.toString() : ''; - return path.charAt(0) == '/' ? path : '/' + path; - }), - - /** - * @ngdoc method - * @name $location#search - * - * @description - * This method is getter / setter. - * - * Return search part (as object) of current url when called without any parameter. - * - * Change search part when called with parameter and return `$location`. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var searchObject = $location.search(); - * // => {foo: 'bar', baz: 'xoxo'} - * - * // set foo to 'yipee' - * $location.search('foo', 'yipee'); - * // $location.search() => {foo: 'yipee', baz: 'xoxo'} - * ``` - * - * @param {string|Object.|Object.>} search New search params - string or - * hash object. - * - * When called with a single argument the method acts as a setter, setting the `search` component - * of `$location` to the specified value. - * - * If the argument is a hash object containing an array of values, these values will be encoded - * as duplicate search parameters in the url. - * - * @param {(string|Number|Array|boolean)=} paramValue If `search` is a string or number, then `paramValue` - * will override only a single search property. - * - * If `paramValue` is an array, it will override the property of the `search` component of - * `$location` specified via the first argument. - * - * If `paramValue` is `null`, the property specified via the first argument will be deleted. - * - * If `paramValue` is `true`, the property specified via the first argument will be added with no - * value nor trailing equal sign. - * - * @return {Object} If called with no arguments returns the parsed `search` object. If called with - * one or more arguments returns `$location` object itself. - */ - search: function(search, paramValue) { - switch (arguments.length) { - case 0: - return this.$$search; - case 1: - if (isString(search) || isNumber(search)) { - search = search.toString(); - this.$$search = parseKeyValue(search); - } else if (isObject(search)) { - search = copy(search, {}); - // remove object undefined or null properties - forEach(search, function(value, key) { - if (value == null) delete search[key]; - }); + /** + * @ngdoc method + * @name $location#hash + * + * @description + * This method is getter / setter. + * + * Returns the hash fragment when called without any parameters. + * + * Changes the hash fragment when called with a parameter and returns `$location`. + * + * + * ```js + * // given url http://example.com/#/some/path?foo=bar&baz=xoxo#hashValue + * var hash = $location.hash(); + * // => "hashValue" + * ``` + * + * @param {(string|number)=} hash New hash fragment + * @return {string} hash + */ + hash: locationGetterSetter('$$hash', function (hash) { + return hash !== null ? hash.toString() : ''; + }), - this.$$search = search; - } else { - throw $locationMinErr('isrcharg', - 'The first argument of the `$location#search()` call must be a string or an object.'); - } - break; - default: - if (isUndefined(paramValue) || paramValue === null) { - delete this.$$search[search]; - } else { - this.$$search[search] = paramValue; + /** + * @ngdoc method + * @name $location#replace + * + * @description + * If called, all changes to $location during the current `$digest` will replace the current history + * record, instead of adding a new one. + */ + replace: function () { + this.$$replace = true; + return this; } - } + }; + + forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], function (Location) { + Location.prototype = Object.create(locationPrototype); + + /** + * @ngdoc method + * @name $location#state + * + * @description + * This method is getter / setter. + * + * Return the history state object when called without any parameter. + * + * Change the history state object when called with one parameter and return `$location`. + * The state object is later passed to `pushState` or `replaceState`. + * + * NOTE: This method is supported only in HTML5 mode and only in browsers supporting + * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support + * older browsers (like IE9 or Android < 4.0), don't use this method. + * + * @param {object=} state State object for pushState or replaceState + * @return {object} state + */ + Location.prototype.state = function (state) { + if (!arguments.length) { + return this.$$state; + } - this.$$compose(); - return this; - }, + if (Location !== LocationHtml5Url || !this.$$html5) { + throw $locationMinErr('nostate', 'History API state support is available only ' + + 'in HTML5 mode and only in browsers supporting HTML5 History API'); + } + // The user might modify `stateObject` after invoking `$location.state(stateObject)` + // but we're changing the $$state reference to $browser.state() during the $digest + // so the modification window is narrow. + this.$$state = isUndefined(state) ? null : state; - /** - * @ngdoc method - * @name $location#hash - * - * @description - * This method is getter / setter. - * - * Returns the hash fragment when called without any parameters. - * - * Changes the hash fragment when called with a parameter and returns `$location`. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo#hashValue - * var hash = $location.hash(); - * // => "hashValue" - * ``` - * - * @param {(string|number)=} hash New hash fragment - * @return {string} hash - */ - hash: locationGetterSetter('$$hash', function(hash) { - return hash !== null ? hash.toString() : ''; - }), + return this; + }; + }); - /** - * @ngdoc method - * @name $location#replace - * - * @description - * If called, all changes to $location during the current `$digest` will replace the current history - * record, instead of adding a new one. - */ - replace: function() { - this.$$replace = true; - return this; - } -}; - -forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], function(Location) { - Location.prototype = Object.create(locationPrototype); - - /** - * @ngdoc method - * @name $location#state - * - * @description - * This method is getter / setter. - * - * Return the history state object when called without any parameter. - * - * Change the history state object when called with one parameter and return `$location`. - * The state object is later passed to `pushState` or `replaceState`. - * - * NOTE: This method is supported only in HTML5 mode and only in browsers supporting - * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support - * older browsers (like IE9 or Android < 4.0), don't use this method. - * - * @param {object=} state State object for pushState or replaceState - * @return {object} state - */ - Location.prototype.state = function(state) { - if (!arguments.length) { - return this.$$state; - } - if (Location !== LocationHtml5Url || !this.$$html5) { - throw $locationMinErr('nostate', 'History API state support is available only ' + - 'in HTML5 mode and only in browsers supporting HTML5 History API'); + function locationGetter(property) { + return function () { + return this[property]; + }; } - // The user might modify `stateObject` after invoking `$location.state(stateObject)` - // but we're changing the $$state reference to $browser.state() during the $digest - // so the modification window is narrow. - this.$$state = isUndefined(state) ? null : state; - - return this; - }; -}); -function locationGetter(property) { - return function() { - return this[property]; - }; -} + function locationGetterSetter(property, preprocess) { + return function (value) { + if (isUndefined(value)) { + return this[property]; + } + this[property] = preprocess(value); + this.$$compose(); -function locationGetterSetter(property, preprocess) { - return function(value) { - if (isUndefined(value)) { - return this[property]; + return this; + }; } - this[property] = preprocess(value); - this.$$compose(); - return this; - }; -} + /** + * @ngdoc service + * @name $location + * + * @requires $rootElement + * + * @description + * The $location service parses the URL in the browser address bar (based on the + * [window.location](https://developer.mozilla.org/en/window.location)) and makes the URL + * available to your application. Changes to the URL in the address bar are reflected into + * $location service and changes to $location are reflected into the browser address bar. + * + * **The $location service:** + * + * - Exposes the current URL in the browser address bar, so you can + * - Watch and observe the URL. + * - Change the URL. + * - Synchronizes the URL with the browser when the user + * - Changes the address bar. + * - Clicks the back or forward button (or clicks a History link). + * - Clicks on a link. + * - Represents the URL object as a set of methods (protocol, host, port, path, search, hash). + * + * For more information see {@link guide/$location Developer Guide: Using $location} + */ + /** + * @ngdoc provider + * @name $locationProvider + * @description + * Use the `$locationProvider` to configure how the application deep linking paths are stored. + */ + function $LocationProvider() { + var hashPrefix = '', + html5Mode = { + enabled: false, + requireBase: true, + rewriteLinks: true + }; -/** - * @ngdoc service - * @name $location - * - * @requires $rootElement - * - * @description - * The $location service parses the URL in the browser address bar (based on the - * [window.location](https://developer.mozilla.org/en/window.location)) and makes the URL - * available to your application. Changes to the URL in the address bar are reflected into - * $location service and changes to $location are reflected into the browser address bar. - * - * **The $location service:** - * - * - Exposes the current URL in the browser address bar, so you can - * - Watch and observe the URL. - * - Change the URL. - * - Synchronizes the URL with the browser when the user - * - Changes the address bar. - * - Clicks the back or forward button (or clicks a History link). - * - Clicks on a link. - * - Represents the URL object as a set of methods (protocol, host, port, path, search, hash). - * - * For more information see {@link guide/$location Developer Guide: Using $location} - */ + /** + * @ngdoc method + * @name $locationProvider#hashPrefix + * @description + * @param {string=} prefix Prefix for hash part (containing path and search) + * @returns {*} current value if used as getter or itself (chaining) if used as setter + */ + this.hashPrefix = function (prefix) { + if (isDefined(prefix)) { + hashPrefix = prefix; + return this; + } else { + return hashPrefix; + } + }; -/** - * @ngdoc provider - * @name $locationProvider - * @description - * Use the `$locationProvider` to configure how the application deep linking paths are stored. - */ -function $LocationProvider() { - var hashPrefix = '', - html5Mode = { - enabled: false, - requireBase: true, - rewriteLinks: true - }; + /** + * @ngdoc method + * @name $locationProvider#html5Mode + * @description + * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value. + * If object, sets `enabled`, `requireBase` and `rewriteLinks` to respective values. Supported + * properties: + * - **enabled** – `{boolean}` – (default: false) If true, will rely on `history.pushState` to + * change urls where supported. Will fall back to hash-prefixed paths in browsers that do not + * support `pushState`. + * - **requireBase** - `{boolean}` - (default: `true`) When html5Mode is enabled, specifies + * whether or not a tag is required to be present. If `enabled` and `requireBase` are + * true, and a base tag is not present, an error will be thrown when `$location` is injected. + * See the {@link guide/$location $location guide for more information} + * - **rewriteLinks** - `{boolean}` - (default: `true`) When html5Mode is enabled, + * enables/disables url rewriting for relative links. + * + * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter + */ + this.html5Mode = function (mode) { + if (isBoolean(mode)) { + html5Mode.enabled = mode; + return this; + } else if (isObject(mode)) { + + if (isBoolean(mode.enabled)) { + html5Mode.enabled = mode.enabled; + } - /** - * @ngdoc method - * @name $locationProvider#hashPrefix - * @description - * @param {string=} prefix Prefix for hash part (containing path and search) - * @returns {*} current value if used as getter or itself (chaining) if used as setter - */ - this.hashPrefix = function(prefix) { - if (isDefined(prefix)) { - hashPrefix = prefix; - return this; - } else { - return hashPrefix; - } - }; - - /** - * @ngdoc method - * @name $locationProvider#html5Mode - * @description - * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value. - * If object, sets `enabled`, `requireBase` and `rewriteLinks` to respective values. Supported - * properties: - * - **enabled** – `{boolean}` – (default: false) If true, will rely on `history.pushState` to - * change urls where supported. Will fall back to hash-prefixed paths in browsers that do not - * support `pushState`. - * - **requireBase** - `{boolean}` - (default: `true`) When html5Mode is enabled, specifies - * whether or not a tag is required to be present. If `enabled` and `requireBase` are - * true, and a base tag is not present, an error will be thrown when `$location` is injected. - * See the {@link guide/$location $location guide for more information} - * - **rewriteLinks** - `{boolean}` - (default: `true`) When html5Mode is enabled, - * enables/disables url rewriting for relative links. - * - * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter - */ - this.html5Mode = function(mode) { - if (isBoolean(mode)) { - html5Mode.enabled = mode; - return this; - } else if (isObject(mode)) { - - if (isBoolean(mode.enabled)) { - html5Mode.enabled = mode.enabled; - } + if (isBoolean(mode.requireBase)) { + html5Mode.requireBase = mode.requireBase; + } - if (isBoolean(mode.requireBase)) { - html5Mode.requireBase = mode.requireBase; - } + if (isBoolean(mode.rewriteLinks)) { + html5Mode.rewriteLinks = mode.rewriteLinks; + } - if (isBoolean(mode.rewriteLinks)) { - html5Mode.rewriteLinks = mode.rewriteLinks; - } + return this; + } else { + return html5Mode; + } + }; - return this; - } else { - return html5Mode; - } - }; - - /** - * @ngdoc event - * @name $location#$locationChangeStart - * @eventType broadcast on root scope - * @description - * Broadcasted before a URL will change. - * - * This change can be prevented by calling - * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more - * details about event object. Upon successful change - * {@link ng.$location#$locationChangeSuccess $locationChangeSuccess} is fired. - * - * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when - * the browser supports the HTML5 History API. - * - * @param {Object} angularEvent Synthetic event object. - * @param {string} newUrl New URL - * @param {string=} oldUrl URL that was before it was changed. - * @param {string=} newState New history state object - * @param {string=} oldState History state object that was before it was changed. - */ + /** + * @ngdoc event + * @name $location#$locationChangeStart + * @eventType broadcast on root scope + * @description + * Broadcasted before a URL will change. + * + * This change can be prevented by calling + * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more + * details about event object. Upon successful change + * {@link ng.$location#$locationChangeSuccess $locationChangeSuccess} is fired. + * + * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when + * the browser supports the HTML5 History API. + * + * @param {Object} angularEvent Synthetic event object. + * @param {string} newUrl New URL + * @param {string=} oldUrl URL that was before it was changed. + * @param {string=} newState New history state object + * @param {string=} oldState History state object that was before it was changed. + */ - /** - * @ngdoc event - * @name $location#$locationChangeSuccess - * @eventType broadcast on root scope - * @description - * Broadcasted after a URL was changed. - * - * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when - * the browser supports the HTML5 History API. - * - * @param {Object} angularEvent Synthetic event object. - * @param {string} newUrl New URL - * @param {string=} oldUrl URL that was before it was changed. - * @param {string=} newState New history state object - * @param {string=} oldState History state object that was before it was changed. - */ + /** + * @ngdoc event + * @name $location#$locationChangeSuccess + * @eventType broadcast on root scope + * @description + * Broadcasted after a URL was changed. + * + * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when + * the browser supports the HTML5 History API. + * + * @param {Object} angularEvent Synthetic event object. + * @param {string} newUrl New URL + * @param {string=} oldUrl URL that was before it was changed. + * @param {string=} newState New history state object + * @param {string=} oldState History state object that was before it was changed. + */ - this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', '$window', - function($rootScope, $browser, $sniffer, $rootElement, $window) { - var $location, - LocationMode, - baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to '' - initialUrl = $browser.url(), - appBase; - - if (html5Mode.enabled) { - if (!baseHref && html5Mode.requireBase) { - throw $locationMinErr('nobase', - "$location in HTML5 mode requires a tag to be present!"); - } - appBase = serverBase(initialUrl) + (baseHref || '/'); - LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url; - } else { - appBase = stripHash(initialUrl); - LocationMode = LocationHashbangUrl; - } - var appBaseNoFile = stripFile(appBase); + this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', '$window', + function ($rootScope, $browser, $sniffer, $rootElement, $window) { + var $location, + LocationMode, + baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to '' + initialUrl = $browser.url(), + appBase; + + if (html5Mode.enabled) { + if (!baseHref && html5Mode.requireBase) { + throw $locationMinErr('nobase', + "$location in HTML5 mode requires a tag to be present!"); + } + appBase = serverBase(initialUrl) + (baseHref || '/'); + LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url; + } else { + appBase = stripHash(initialUrl); + LocationMode = LocationHashbangUrl; + } + var appBaseNoFile = stripFile(appBase); - $location = new LocationMode(appBase, appBaseNoFile, '#' + hashPrefix); - $location.$$parseLinkUrl(initialUrl, initialUrl); + $location = new LocationMode(appBase, appBaseNoFile, '#' + hashPrefix); + $location.$$parseLinkUrl(initialUrl, initialUrl); - $location.$$state = $browser.state(); + $location.$$state = $browser.state(); - var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i; + var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i; - function setBrowserUrlWithFallback(url, replace, state) { - var oldUrl = $location.url(); - var oldState = $location.$$state; - try { - $browser.url(url, replace, state); + function setBrowserUrlWithFallback(url, replace, state) { + var oldUrl = $location.url(); + var oldState = $location.$$state; + try { + $browser.url(url, replace, state); - // Make sure $location.state() returns referentially identical (not just deeply equal) - // state object; this makes possible quick checking if the state changed in the digest - // loop. Checking deep equality would be too expensive. - $location.$$state = $browser.state(); - } catch (e) { - // Restore old values if pushState fails - $location.url(oldUrl); - $location.$$state = oldState; + // Make sure $location.state() returns referentially identical (not just deeply equal) + // state object; this makes possible quick checking if the state changed in the digest + // loop. Checking deep equality would be too expensive. + $location.$$state = $browser.state(); + } catch (e) { + // Restore old values if pushState fails + $location.url(oldUrl); + $location.$$state = oldState; - throw e; - } - } + throw e; + } + } - $rootElement.on('click', function(event) { - // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser) - // currently we open nice url link and redirect then + $rootElement.on('click', function (event) { + // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser) + // currently we open nice url link and redirect then - if (!html5Mode.rewriteLinks || event.ctrlKey || event.metaKey || event.shiftKey || event.which == 2 || event.button == 2) return; + if (!html5Mode.rewriteLinks || event.ctrlKey || event.metaKey || event.shiftKey || event.which == 2 || event.button == 2) return; - var elm = jqLite(event.target); + var elm = jqLite(event.target); - // traverse the DOM up to find first A tag - while (nodeName_(elm[0]) !== 'a') { - // ignore rewriting if no A tag (reached root element, or no parent - removed from document) - if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return; - } + // traverse the DOM up to find first A tag + while (nodeName_(elm[0]) !== 'a') { + // ignore rewriting if no A tag (reached root element, or no parent - removed from document) + if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return; + } - var absHref = elm.prop('href'); - // get the actual href attribute - see - // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx - var relHref = elm.attr('href') || elm.attr('xlink:href'); + var absHref = elm.prop('href'); + // get the actual href attribute - see + // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx + var relHref = elm.attr('href') || elm.attr('xlink:href'); - if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') { - // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during - // an animation. - absHref = urlResolve(absHref.animVal).href; - } + if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') { + // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during + // an animation. + absHref = urlResolve(absHref.animVal).href; + } - // Ignore when url is started with javascript: or mailto: - if (IGNORE_URI_REGEXP.test(absHref)) return; - - if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) { - if ($location.$$parseLinkUrl(absHref, relHref)) { - // We do a preventDefault for all urls that are part of the angular application, - // in html5mode and also without, so that we are able to abort navigation without - // getting double entries in the location history. - event.preventDefault(); - // update location manually - if ($location.absUrl() != $browser.url()) { - $rootScope.$apply(); - // hack to work around FF6 bug 684208 when scenario runner clicks on links - $window.angular['ff-684208-preventDefault'] = true; - } - } - } - }); + // Ignore when url is started with javascript: or mailto: + if (IGNORE_URI_REGEXP.test(absHref)) return; + + if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) { + if ($location.$$parseLinkUrl(absHref, relHref)) { + // We do a preventDefault for all urls that are part of the angular application, + // in html5mode and also without, so that we are able to abort navigation without + // getting double entries in the location history. + event.preventDefault(); + // update location manually + if ($location.absUrl() != $browser.url()) { + $rootScope.$apply(); + // hack to work around FF6 bug 684208 when scenario runner clicks on links + $window.angular['ff-684208-preventDefault'] = true; + } + } + } + }); - // rewrite hashbang url <> html5 url - if (trimEmptyHash($location.absUrl()) != trimEmptyHash(initialUrl)) { - $browser.url($location.absUrl(), true); - } + // rewrite hashbang url <> html5 url + if (trimEmptyHash($location.absUrl()) != trimEmptyHash(initialUrl)) { + $browser.url($location.absUrl(), true); + } - var initializing = true; + var initializing = true; - // update $location when $browser url changes - $browser.onUrlChange(function(newUrl, newState) { + // update $location when $browser url changes + $browser.onUrlChange(function (newUrl, newState) { - if (isUndefined(beginsWith(appBaseNoFile, newUrl))) { - // If we are navigating outside of the app then force a reload - $window.location.href = newUrl; - return; - } + if (isUndefined(beginsWith(appBaseNoFile, newUrl))) { + // If we are navigating outside of the app then force a reload + $window.location.href = newUrl; + return; + } - $rootScope.$evalAsync(function() { - var oldUrl = $location.absUrl(); - var oldState = $location.$$state; - var defaultPrevented; - newUrl = trimEmptyHash(newUrl); - $location.$$parse(newUrl); - $location.$$state = newState; - - defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl, - newState, oldState).defaultPrevented; - - // if the location was changed by a `$locationChangeStart` handler then stop - // processing this location change - if ($location.absUrl() !== newUrl) return; - - if (defaultPrevented) { - $location.$$parse(oldUrl); - $location.$$state = oldState; - setBrowserUrlWithFallback(oldUrl, false, oldState); - } else { - initializing = false; - afterLocationChange(oldUrl, oldState); - } - }); - if (!$rootScope.$$phase) $rootScope.$digest(); - }); + $rootScope.$evalAsync(function () { + var oldUrl = $location.absUrl(); + var oldState = $location.$$state; + var defaultPrevented; + newUrl = trimEmptyHash(newUrl); + $location.$$parse(newUrl); + $location.$$state = newState; + + defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl, + newState, oldState).defaultPrevented; + + // if the location was changed by a `$locationChangeStart` handler then stop + // processing this location change + if ($location.absUrl() !== newUrl) return; + + if (defaultPrevented) { + $location.$$parse(oldUrl); + $location.$$state = oldState; + setBrowserUrlWithFallback(oldUrl, false, oldState); + } else { + initializing = false; + afterLocationChange(oldUrl, oldState); + } + }); + if (!$rootScope.$$phase) $rootScope.$digest(); + }); - // update browser - $rootScope.$watch(function $locationWatch() { - var oldUrl = trimEmptyHash($browser.url()); - var newUrl = trimEmptyHash($location.absUrl()); - var oldState = $browser.state(); - var currentReplace = $location.$$replace; - var urlOrStateChanged = oldUrl !== newUrl || - ($location.$$html5 && $sniffer.history && oldState !== $location.$$state); - - if (initializing || urlOrStateChanged) { - initializing = false; - - $rootScope.$evalAsync(function() { - var newUrl = $location.absUrl(); - var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl, - $location.$$state, oldState).defaultPrevented; - - // if the location was changed by a `$locationChangeStart` handler then stop - // processing this location change - if ($location.absUrl() !== newUrl) return; - - if (defaultPrevented) { - $location.$$parse(oldUrl); - $location.$$state = oldState; - } else { - if (urlOrStateChanged) { - setBrowserUrlWithFallback(newUrl, currentReplace, + // update browser + $rootScope.$watch(function $locationWatch() { + var oldUrl = trimEmptyHash($browser.url()); + var newUrl = trimEmptyHash($location.absUrl()); + var oldState = $browser.state(); + var currentReplace = $location.$$replace; + var urlOrStateChanged = oldUrl !== newUrl || + ($location.$$html5 && $sniffer.history && oldState !== $location.$$state); + + if (initializing || urlOrStateChanged) { + initializing = false; + + $rootScope.$evalAsync(function () { + var newUrl = $location.absUrl(); + var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl, + $location.$$state, oldState).defaultPrevented; + + // if the location was changed by a `$locationChangeStart` handler then stop + // processing this location change + if ($location.absUrl() !== newUrl) return; + + if (defaultPrevented) { + $location.$$parse(oldUrl); + $location.$$state = oldState; + } else { + if (urlOrStateChanged) { + setBrowserUrlWithFallback(newUrl, currentReplace, oldState === $location.$$state ? null : $location.$$state); - } - afterLocationChange(oldUrl, oldState); - } - }); - } + } + afterLocationChange(oldUrl, oldState); + } + }); + } - $location.$$replace = false; + $location.$$replace = false; - // we don't need to return anything because $evalAsync will make the digest loop dirty when - // there is a change - }); + // we don't need to return anything because $evalAsync will make the digest loop dirty when + // there is a change + }); - return $location; + return $location; - function afterLocationChange(oldUrl, oldState) { - $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl, - $location.$$state, oldState); + function afterLocationChange(oldUrl, oldState) { + $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl, + $location.$$state, oldState); + } + }]; } -}]; -} -/** - * @ngdoc service - * @name $log - * @requires $window - * - * @description - * Simple service for logging. Default implementation safely writes the message - * into the browser's console (if present). - * - * The main purpose of this service is to simplify debugging and troubleshooting. - * - * The default is to log `debug` messages. You can use - * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this. - * - * @example - + /** + * @ngdoc service + * @name $log + * @requires $window + * + * @description + * Simple service for logging. Default implementation safely writes the message + * into the browser's console (if present). + * + * The main purpose of this service is to simplify debugging and troubleshooting. + * + * The default is to log `debug` messages. You can use + * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this. + * + * @example + - angular.module('logExample', []) - .controller('LogController', ['$scope', '$log', function($scope, $log) { + angular.module('logExample', []) + .controller('LogController', ['$scope', '$log', function($scope, $log) { $scope.$log = $log; $scope.message = 'Hello World!'; }]); -
-

Reload this page with open console, enter text and hit the log button...

- - - - - - -
+
+

Reload this page with open console, enter text and hit the log button...

+ + + + + + +
- - */ + + */ -/** - * @ngdoc provider - * @name $logProvider - * @description - * Use the `$logProvider` to configure how the application logs messages - */ -function $LogProvider() { - var debug = true, - self = this; - - /** - * @ngdoc method - * @name $logProvider#debugEnabled - * @description - * @param {boolean=} flag enable or disable debug level messages - * @returns {*} current value if used as getter or itself (chaining) if used as setter - */ - this.debugEnabled = function(flag) { - if (isDefined(flag)) { - debug = flag; - return this; - } else { - return debug; - } - }; + /** + * @ngdoc provider + * @name $logProvider + * @description + * Use the `$logProvider` to configure how the application logs messages + */ + function $LogProvider() { + var debug = true, + self = this; - this.$get = ['$window', function($window) { - return { - /** - * @ngdoc method - * @name $log#log - * - * @description - * Write a log message - */ - log: consoleLog('log'), - - /** - * @ngdoc method - * @name $log#info - * - * @description - * Write an information message - */ - info: consoleLog('info'), - - /** - * @ngdoc method - * @name $log#warn - * - * @description - * Write a warning message - */ - warn: consoleLog('warn'), - - /** - * @ngdoc method - * @name $log#error - * - * @description - * Write an error message - */ - error: consoleLog('error'), - - /** - * @ngdoc method - * @name $log#debug - * - * @description - * Write a debug message - */ - debug: (function() { - var fn = consoleLog('debug'); - - return function() { - if (debug) { - fn.apply(self, arguments); - } + /** + * @ngdoc method + * @name $logProvider#debugEnabled + * @description + * @param {boolean=} flag enable or disable debug level messages + * @returns {*} current value if used as getter or itself (chaining) if used as setter + */ + this.debugEnabled = function (flag) { + if (isDefined(flag)) { + debug = flag; + return this; + } else { + return debug; + } }; - }()) - }; - function formatError(arg) { - if (arg instanceof Error) { - if (arg.stack) { - arg = (arg.message && arg.stack.indexOf(arg.message) === -1) - ? 'Error: ' + arg.message + '\n' + arg.stack - : arg.stack; - } else if (arg.sourceURL) { - arg = arg.message + '\n' + arg.sourceURL + ':' + arg.line; - } - } - return arg; - } + this.$get = ['$window', function ($window) { + return { + /** + * @ngdoc method + * @name $log#log + * + * @description + * Write a log message + */ + log: consoleLog('log'), + + /** + * @ngdoc method + * @name $log#info + * + * @description + * Write an information message + */ + info: consoleLog('info'), + + /** + * @ngdoc method + * @name $log#warn + * + * @description + * Write a warning message + */ + warn: consoleLog('warn'), + + /** + * @ngdoc method + * @name $log#error + * + * @description + * Write an error message + */ + error: consoleLog('error'), + + /** + * @ngdoc method + * @name $log#debug + * + * @description + * Write a debug message + */ + debug: (function () { + var fn = consoleLog('debug'); + + return function () { + if (debug) { + fn.apply(self, arguments); + } + }; + }()) + }; - function consoleLog(type) { - var console = $window.console || {}, - logFn = console[type] || console.log || noop, - hasApply = false; - - // Note: reading logFn.apply throws an error in IE11 in IE8 document mode. - // The reason behind this is that console.log has type "object" in IE8... - try { - hasApply = !!logFn.apply; - } catch (e) {} - - if (hasApply) { - return function() { - var args = []; - forEach(arguments, function(arg) { - args.push(formatError(arg)); - }); - return logFn.apply(console, args); - }; - } + function formatError(arg) { + if (arg instanceof Error) { + if (arg.stack) { + arg = (arg.message && arg.stack.indexOf(arg.message) === -1) + ? 'Error: ' + arg.message + '\n' + arg.stack + : arg.stack; + } else if (arg.sourceURL) { + arg = arg.message + '\n' + arg.sourceURL + ':' + arg.line; + } + } + return arg; + } - // we are IE which either doesn't have window.console => this is noop and we do nothing, - // or we are IE where console.log doesn't have apply so we log at least first 2 args - return function(arg1, arg2) { - logFn(arg1, arg2 == null ? '' : arg2); - }; + function consoleLog(type) { + var console = $window.console || {}, + logFn = console[type] || console.log || noop, + hasApply = false; + + // Note: reading logFn.apply throws an error in IE11 in IE8 document mode. + // The reason behind this is that console.log has type "object" in IE8... + try { + hasApply = !!logFn.apply; + } catch (e) { + } + + if (hasApply) { + return function () { + var args = []; + forEach(arguments, function (arg) { + args.push(formatError(arg)); + }); + return logFn.apply(console, args); + }; + } + + // we are IE which either doesn't have window.console => this is noop and we do nothing, + // or we are IE where console.log doesn't have apply so we log at least first 2 args + return function (arg1, arg2) { + logFn(arg1, arg2 == null ? '' : arg2); + }; + } + }]; } - }]; -} -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Any commits to this file should be reviewed with security in mind. * * Changes to this file can potentially create security vulnerabilities. * * An approval from 2 Core members with history of modifying * @@ -13571,7 +13620,7 @@ function $LogProvider() { * Or gives undesired access to variables likes document or window? * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -var $parseMinErr = minErr('$parse'); + var $parseMinErr = minErr('$parse'); // Sandboxing Angular Expressions // ------------------------------ @@ -13593,5610 +13642,5649 @@ var $parseMinErr = minErr('$parse'); // window or some DOM object that has a reference to window is published onto a Scope. // Similarly we prevent invocations of function known to be dangerous, as well as assignments to // native objects. -// -// See https://docs.angularjs.org/guide/security - - -function ensureSafeMemberName(name, fullExpression) { - if (name === "__defineGetter__" || name === "__defineSetter__" - || name === "__lookupGetter__" || name === "__lookupSetter__" - || name === "__proto__") { - throw $parseMinErr('isecfld', - 'Attempting to access a disallowed field in Angular expressions! ' - + 'Expression: {0}', fullExpression); - } - return name; -} - -function getStringValue(name) { - // Property names must be strings. This means that non-string objects cannot be used - // as keys in an object. Any non-string object, including a number, is typecasted - // into a string via the toString method. - // -- MDN, https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Operators/Property_accessors#Property_names - // - // So, to ensure that we are checking the same `name` that JavaScript would use, we cast it - // to a string. It's not always possible. If `name` is an object and its `toString` method is - // 'broken' (doesn't return a string, isn't a function, etc.), an error will be thrown: - // - // TypeError: Cannot convert object to primitive value - // - // For performance reasons, we don't catch this error here and allow it to propagate up the call - // stack. Note that you'll get the same error in JavaScript if you try to access a property using - // such a 'broken' object as a key. - return name + ''; -} - -function ensureSafeObject(obj, fullExpression) { - // nifty check if obj is Function that is fast and works across iframes and other contexts - if (obj) { - if (obj.constructor === obj) { - throw $parseMinErr('isecfn', - 'Referencing Function in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } else if (// isWindow(obj) - obj.window === obj) { - throw $parseMinErr('isecwindow', - 'Referencing the Window in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } else if (// isElement(obj) - obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) { - throw $parseMinErr('isecdom', - 'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } else if (// block Object so that we can't get hold of dangerous Object.* methods - obj === Object) { - throw $parseMinErr('isecobj', - 'Referencing Object in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } - } - return obj; -} - -var CALL = Function.prototype.call; -var APPLY = Function.prototype.apply; -var BIND = Function.prototype.bind; - -function ensureSafeFunction(obj, fullExpression) { - if (obj) { - if (obj.constructor === obj) { - throw $parseMinErr('isecfn', - 'Referencing Function in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } else if (obj === CALL || obj === APPLY || obj === BIND) { - throw $parseMinErr('isecff', - 'Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } - } -} - -function ensureSafeAssignContext(obj, fullExpression) { - if (obj) { - if (obj === (0).constructor || obj === (false).constructor || obj === ''.constructor || - obj === {}.constructor || obj === [].constructor || obj === Function.constructor) { - throw $parseMinErr('isecaf', - 'Assigning to a constructor is disallowed! Expression: {0}', fullExpression); - } - } -} - -var OPERATORS = createMap(); -forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function(operator) { OPERATORS[operator] = true; }); -var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'}; - - -///////////////////////////////////////// - - -/** - * @constructor - */ -var Lexer = function(options) { - this.options = options; -}; - -Lexer.prototype = { - constructor: Lexer, - - lex: function(text) { - this.text = text; - this.index = 0; - this.tokens = []; - - while (this.index < this.text.length) { - var ch = this.text.charAt(this.index); - if (ch === '"' || ch === "'") { - this.readString(ch); - } else if (this.isNumber(ch) || ch === '.' && this.isNumber(this.peek())) { - this.readNumber(); - } else if (this.isIdentifierStart(this.peekMultichar())) { - this.readIdent(); - } else if (this.is(ch, '(){}[].,;:?')) { - this.tokens.push({index: this.index, text: ch}); - this.index++; - } else if (this.isWhitespace(ch)) { - this.index++; - } else { - var ch2 = ch + this.peek(); - var ch3 = ch2 + this.peek(2); - var op1 = OPERATORS[ch]; - var op2 = OPERATORS[ch2]; - var op3 = OPERATORS[ch3]; - if (op1 || op2 || op3) { - var token = op3 ? ch3 : (op2 ? ch2 : ch); - this.tokens.push({index: this.index, text: token, operator: true}); - this.index += token.length; - } else { - this.throwError('Unexpected next character ', this.index, this.index + 1); - } - } - } - return this.tokens; - }, - - is: function(ch, chars) { - return chars.indexOf(ch) !== -1; - }, - - peek: function(i) { - var num = i || 1; - return (this.index + num < this.text.length) ? this.text.charAt(this.index + num) : false; - }, - - isNumber: function(ch) { - return ('0' <= ch && ch <= '9') && typeof ch === "string"; - }, - - isWhitespace: function(ch) { - // IE treats non-breaking space as \u00A0 - return (ch === ' ' || ch === '\r' || ch === '\t' || - ch === '\n' || ch === '\v' || ch === '\u00A0'); - }, - - isIdentifierStart: function(ch) { - return this.options.isIdentifierStart ? - this.options.isIdentifierStart(ch, this.codePointAt(ch)) : - this.isValidIdentifierStart(ch); - }, - - isValidIdentifierStart: function(ch) { - return ('a' <= ch && ch <= 'z' || - 'A' <= ch && ch <= 'Z' || - '_' === ch || ch === '$'); - }, - - isIdentifierContinue: function(ch) { - return this.options.isIdentifierContinue ? - this.options.isIdentifierContinue(ch, this.codePointAt(ch)) : - this.isValidIdentifierContinue(ch); - }, - - isValidIdentifierContinue: function(ch, cp) { - return this.isValidIdentifierStart(ch, cp) || this.isNumber(ch); - }, - - codePointAt: function(ch) { - if (ch.length === 1) return ch.charCodeAt(0); - /*jshint bitwise: false*/ - return (ch.charCodeAt(0) << 10) + ch.charCodeAt(1) - 0x35FDC00; - /*jshint bitwise: true*/ - }, - - peekMultichar: function() { - var ch = this.text.charAt(this.index); - var peek = this.peek(); - if (!peek) { - return ch; - } - var cp1 = ch.charCodeAt(0); - var cp2 = peek.charCodeAt(0); - if (cp1 >= 0xD800 && cp1 <= 0xDBFF && cp2 >= 0xDC00 && cp2 <= 0xDFFF) { - return ch + peek; - } - return ch; - }, - - isExpOperator: function(ch) { - return (ch === '-' || ch === '+' || this.isNumber(ch)); - }, - - throwError: function(error, start, end) { - end = end || this.index; - var colStr = (isDefined(start) - ? 's ' + start + '-' + this.index + ' [' + this.text.substring(start, end) + ']' - : ' ' + end); - throw $parseMinErr('lexerr', 'Lexer Error: {0} at column{1} in expression [{2}].', - error, colStr, this.text); - }, - - readNumber: function() { - var number = ''; - var start = this.index; - while (this.index < this.text.length) { - var ch = lowercase(this.text.charAt(this.index)); - if (ch == '.' || this.isNumber(ch)) { - number += ch; - } else { - var peekCh = this.peek(); - if (ch == 'e' && this.isExpOperator(peekCh)) { - number += ch; - } else if (this.isExpOperator(ch) && - peekCh && this.isNumber(peekCh) && - number.charAt(number.length - 1) == 'e') { - number += ch; - } else if (this.isExpOperator(ch) && - (!peekCh || !this.isNumber(peekCh)) && - number.charAt(number.length - 1) == 'e') { - this.throwError('Invalid exponent'); - } else { - break; - } - } - this.index++; - } - this.tokens.push({ - index: start, - text: number, - constant: true, - value: Number(number) - }); - }, - - readIdent: function() { - var start = this.index; - this.index += this.peekMultichar().length; - while (this.index < this.text.length) { - var ch = this.peekMultichar(); - if (!this.isIdentifierContinue(ch)) { - break; - } - this.index += ch.length; - } - this.tokens.push({ - index: start, - text: this.text.slice(start, this.index), - identifier: true - }); - }, - - readString: function(quote) { - var start = this.index; - this.index++; - var string = ''; - var rawString = quote; - var escape = false; - while (this.index < this.text.length) { - var ch = this.text.charAt(this.index); - rawString += ch; - if (escape) { - if (ch === 'u') { - var hex = this.text.substring(this.index + 1, this.index + 5); - if (!hex.match(/[\da-f]{4}/i)) { - this.throwError('Invalid unicode escape [\\u' + hex + ']'); - } - this.index += 4; - string += String.fromCharCode(parseInt(hex, 16)); - } else { - var rep = ESCAPE[ch]; - string = string + (rep || ch); - } - escape = false; - } else if (ch === '\\') { - escape = true; - } else if (ch === quote) { - this.index++; - this.tokens.push({ - index: start, - text: rawString, - constant: true, - value: string - }); - return; - } else { - string += ch; - } - this.index++; - } - this.throwError('Unterminated quote', start); - } -}; - -var AST = function(lexer, options) { - this.lexer = lexer; - this.options = options; -}; - -AST.Program = 'Program'; -AST.ExpressionStatement = 'ExpressionStatement'; -AST.AssignmentExpression = 'AssignmentExpression'; -AST.ConditionalExpression = 'ConditionalExpression'; -AST.LogicalExpression = 'LogicalExpression'; -AST.BinaryExpression = 'BinaryExpression'; -AST.UnaryExpression = 'UnaryExpression'; -AST.CallExpression = 'CallExpression'; -AST.MemberExpression = 'MemberExpression'; -AST.Identifier = 'Identifier'; -AST.Literal = 'Literal'; -AST.ArrayExpression = 'ArrayExpression'; -AST.Property = 'Property'; -AST.ObjectExpression = 'ObjectExpression'; -AST.ThisExpression = 'ThisExpression'; -AST.LocalsExpression = 'LocalsExpression'; - -// Internal use only -AST.NGValueParameter = 'NGValueParameter'; - -AST.prototype = { - ast: function(text) { - this.text = text; - this.tokens = this.lexer.lex(text); - - var value = this.program(); - - if (this.tokens.length !== 0) { - this.throwError('is an unexpected token', this.tokens[0]); - } - - return value; - }, - - program: function() { - var body = []; - while (true) { - if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']')) - body.push(this.expressionStatement()); - if (!this.expect(';')) { - return { type: AST.Program, body: body}; - } - } - }, - - expressionStatement: function() { - return { type: AST.ExpressionStatement, expression: this.filterChain() }; - }, - - filterChain: function() { - var left = this.expression(); - var token; - while ((token = this.expect('|'))) { - left = this.filter(left); - } - return left; - }, - - expression: function() { - return this.assignment(); - }, - - assignment: function() { - var result = this.ternary(); - if (this.expect('=')) { - result = { type: AST.AssignmentExpression, left: result, right: this.assignment(), operator: '='}; - } - return result; - }, - - ternary: function() { - var test = this.logicalOR(); - var alternate; - var consequent; - if (this.expect('?')) { - alternate = this.expression(); - if (this.consume(':')) { - consequent = this.expression(); - return { type: AST.ConditionalExpression, test: test, alternate: alternate, consequent: consequent}; - } - } - return test; - }, - - logicalOR: function() { - var left = this.logicalAND(); - while (this.expect('||')) { - left = { type: AST.LogicalExpression, operator: '||', left: left, right: this.logicalAND() }; - } - return left; - }, - - logicalAND: function() { - var left = this.equality(); - while (this.expect('&&')) { - left = { type: AST.LogicalExpression, operator: '&&', left: left, right: this.equality()}; - } - return left; - }, - - equality: function() { - var left = this.relational(); - var token; - while ((token = this.expect('==','!=','===','!=='))) { - left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.relational() }; - } - return left; - }, - - relational: function() { - var left = this.additive(); - var token; - while ((token = this.expect('<', '>', '<=', '>='))) { - left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.additive() }; - } - return left; - }, - - additive: function() { - var left = this.multiplicative(); - var token; - while ((token = this.expect('+','-'))) { - left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.multiplicative() }; - } - return left; - }, - - multiplicative: function() { - var left = this.unary(); - var token; - while ((token = this.expect('*','/','%'))) { - left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.unary() }; - } - return left; - }, - - unary: function() { - var token; - if ((token = this.expect('+', '-', '!'))) { - return { type: AST.UnaryExpression, operator: token.text, prefix: true, argument: this.unary() }; - } else { - return this.primary(); - } - }, - - primary: function() { - var primary; - if (this.expect('(')) { - primary = this.filterChain(); - this.consume(')'); - } else if (this.expect('[')) { - primary = this.arrayDeclaration(); - } else if (this.expect('{')) { - primary = this.object(); - } else if (this.selfReferential.hasOwnProperty(this.peek().text)) { - primary = copy(this.selfReferential[this.consume().text]); - } else if (this.options.literals.hasOwnProperty(this.peek().text)) { - primary = { type: AST.Literal, value: this.options.literals[this.consume().text]}; - } else if (this.peek().identifier) { - primary = this.identifier(); - } else if (this.peek().constant) { - primary = this.constant(); - } else { - this.throwError('not a primary expression', this.peek()); - } - - var next; - while ((next = this.expect('(', '[', '.'))) { - if (next.text === '(') { - primary = {type: AST.CallExpression, callee: primary, arguments: this.parseArguments() }; - this.consume(')'); - } else if (next.text === '[') { - primary = { type: AST.MemberExpression, object: primary, property: this.expression(), computed: true }; - this.consume(']'); - } else if (next.text === '.') { - primary = { type: AST.MemberExpression, object: primary, property: this.identifier(), computed: false }; - } else { - this.throwError('IMPOSSIBLE'); - } - } - return primary; - }, +// +// See https://docs.angularjs.org/guide/security - filter: function(baseExpression) { - var args = [baseExpression]; - var result = {type: AST.CallExpression, callee: this.identifier(), arguments: args, filter: true}; - while (this.expect(':')) { - args.push(this.expression()); + function ensureSafeMemberName(name, fullExpression) { + if (name === "__defineGetter__" || name === "__defineSetter__" + || name === "__lookupGetter__" || name === "__lookupSetter__" + || name === "__proto__") { + throw $parseMinErr('isecfld', + 'Attempting to access a disallowed field in Angular expressions! ' + + 'Expression: {0}', fullExpression); + } + return name; } - return result; - }, - - parseArguments: function() { - var args = []; - if (this.peekToken().text !== ')') { - do { - args.push(this.expression()); - } while (this.expect(',')); + function getStringValue(name) { + // Property names must be strings. This means that non-string objects cannot be used + // as keys in an object. Any non-string object, including a number, is typecasted + // into a string via the toString method. + // -- MDN, https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Operators/Property_accessors#Property_names + // + // So, to ensure that we are checking the same `name` that JavaScript would use, we cast it + // to a string. It's not always possible. If `name` is an object and its `toString` method is + // 'broken' (doesn't return a string, isn't a function, etc.), an error will be thrown: + // + // TypeError: Cannot convert object to primitive value + // + // For performance reasons, we don't catch this error here and allow it to propagate up the call + // stack. Note that you'll get the same error in JavaScript if you try to access a property using + // such a 'broken' object as a key. + return name + ''; + } + + function ensureSafeObject(obj, fullExpression) { + // nifty check if obj is Function that is fast and works across iframes and other contexts + if (obj) { + if (obj.constructor === obj) { + throw $parseMinErr('isecfn', + 'Referencing Function in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } else if (// isWindow(obj) + obj.window === obj) { + throw $parseMinErr('isecwindow', + 'Referencing the Window in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } else if (// isElement(obj) + obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) { + throw $parseMinErr('isecdom', + 'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } else if (// block Object so that we can't get hold of dangerous Object.* methods + obj === Object) { + throw $parseMinErr('isecobj', + 'Referencing Object in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } + } + return obj; } - return args; - }, - identifier: function() { - var token = this.consume(); - if (!token.identifier) { - this.throwError('is not a valid identifier', token); - } - return { type: AST.Identifier, name: token.text }; - }, - - constant: function() { - // TODO check that it is a constant - return { type: AST.Literal, value: this.consume().value }; - }, - - arrayDeclaration: function() { - var elements = []; - if (this.peekToken().text !== ']') { - do { - if (this.peek(']')) { - // Support trailing commas per ES5.1. - break; + var CALL = Function.prototype.call; + var APPLY = Function.prototype.apply; + var BIND = Function.prototype.bind; + + function ensureSafeFunction(obj, fullExpression) { + if (obj) { + if (obj.constructor === obj) { + throw $parseMinErr('isecfn', + 'Referencing Function in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } else if (obj === CALL || obj === APPLY || obj === BIND) { + throw $parseMinErr('isecff', + 'Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } } - elements.push(this.expression()); - } while (this.expect(',')); } - this.consume(']'); - - return { type: AST.ArrayExpression, elements: elements }; - }, - - object: function() { - var properties = [], property; - if (this.peekToken().text !== '}') { - do { - if (this.peek('}')) { - // Support trailing commas per ES5.1. - break; - } - property = {type: AST.Property, kind: 'init'}; - if (this.peek().constant) { - property.key = this.constant(); - } else if (this.peek().identifier) { - property.key = this.identifier(); - } else { - this.throwError("invalid key", this.peek()); + + function ensureSafeAssignContext(obj, fullExpression) { + if (obj) { + if (obj === (0).constructor || obj === (false).constructor || obj === ''.constructor || + obj === {}.constructor || obj === [].constructor || obj === Function.constructor) { + throw $parseMinErr('isecaf', + 'Assigning to a constructor is disallowed! Expression: {0}', fullExpression); + } } - this.consume(':'); - property.value = this.expression(); - properties.push(property); - } while (this.expect(',')); } - this.consume('}'); - return {type: AST.ObjectExpression, properties: properties }; - }, + var OPERATORS = createMap(); + forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function (operator) { + OPERATORS[operator] = true; + }); + var ESCAPE = {"n": "\n", "f": "\f", "r": "\r", "t": "\t", "v": "\v", "'": "'", '"': '"'}; - throwError: function(msg, token) { - throw $parseMinErr('syntax', - 'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].', - token.text, msg, (token.index + 1), this.text, this.text.substring(token.index)); - }, - consume: function(e1) { - if (this.tokens.length === 0) { - throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text); - } +///////////////////////////////////////// - var token = this.expect(e1); - if (!token) { - this.throwError('is unexpected, expecting [' + e1 + ']', this.peek()); - } - return token; - }, - peekToken: function() { - if (this.tokens.length === 0) { - throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text); - } - return this.tokens[0]; - }, - - peek: function(e1, e2, e3, e4) { - return this.peekAhead(0, e1, e2, e3, e4); - }, - - peekAhead: function(i, e1, e2, e3, e4) { - if (this.tokens.length > i) { - var token = this.tokens[i]; - var t = token.text; - if (t === e1 || t === e2 || t === e3 || t === e4 || - (!e1 && !e2 && !e3 && !e4)) { - return token; - } - } - return false; - }, - - expect: function(e1, e2, e3, e4) { - var token = this.peek(e1, e2, e3, e4); - if (token) { - this.tokens.shift(); - return token; - } - return false; - }, - - selfReferential: { - 'this': {type: AST.ThisExpression }, - '$locals': {type: AST.LocalsExpression } - } -}; - -function ifDefined(v, d) { - return typeof v !== 'undefined' ? v : d; -} - -function plusFn(l, r) { - if (typeof l === 'undefined') return r; - if (typeof r === 'undefined') return l; - return l + r; -} - -function isStateless($filter, filterName) { - var fn = $filter(filterName); - return !fn.$stateful; -} - -function findConstantAndWatchExpressions(ast, $filter) { - var allConstants; - var argsToWatch; - switch (ast.type) { - case AST.Program: - allConstants = true; - forEach(ast.body, function(expr) { - findConstantAndWatchExpressions(expr.expression, $filter); - allConstants = allConstants && expr.expression.constant; - }); - ast.constant = allConstants; - break; - case AST.Literal: - ast.constant = true; - ast.toWatch = []; - break; - case AST.UnaryExpression: - findConstantAndWatchExpressions(ast.argument, $filter); - ast.constant = ast.argument.constant; - ast.toWatch = ast.argument.toWatch; - break; - case AST.BinaryExpression: - findConstantAndWatchExpressions(ast.left, $filter); - findConstantAndWatchExpressions(ast.right, $filter); - ast.constant = ast.left.constant && ast.right.constant; - ast.toWatch = ast.left.toWatch.concat(ast.right.toWatch); - break; - case AST.LogicalExpression: - findConstantAndWatchExpressions(ast.left, $filter); - findConstantAndWatchExpressions(ast.right, $filter); - ast.constant = ast.left.constant && ast.right.constant; - ast.toWatch = ast.constant ? [] : [ast]; - break; - case AST.ConditionalExpression: - findConstantAndWatchExpressions(ast.test, $filter); - findConstantAndWatchExpressions(ast.alternate, $filter); - findConstantAndWatchExpressions(ast.consequent, $filter); - ast.constant = ast.test.constant && ast.alternate.constant && ast.consequent.constant; - ast.toWatch = ast.constant ? [] : [ast]; - break; - case AST.Identifier: - ast.constant = false; - ast.toWatch = [ast]; - break; - case AST.MemberExpression: - findConstantAndWatchExpressions(ast.object, $filter); - if (ast.computed) { - findConstantAndWatchExpressions(ast.property, $filter); - } - ast.constant = ast.object.constant && (!ast.computed || ast.property.constant); - ast.toWatch = [ast]; - break; - case AST.CallExpression: - allConstants = ast.filter ? isStateless($filter, ast.callee.name) : false; - argsToWatch = []; - forEach(ast.arguments, function(expr) { - findConstantAndWatchExpressions(expr, $filter); - allConstants = allConstants && expr.constant; - if (!expr.constant) { - argsToWatch.push.apply(argsToWatch, expr.toWatch); - } - }); - ast.constant = allConstants; - ast.toWatch = ast.filter && isStateless($filter, ast.callee.name) ? argsToWatch : [ast]; - break; - case AST.AssignmentExpression: - findConstantAndWatchExpressions(ast.left, $filter); - findConstantAndWatchExpressions(ast.right, $filter); - ast.constant = ast.left.constant && ast.right.constant; - ast.toWatch = [ast]; - break; - case AST.ArrayExpression: - allConstants = true; - argsToWatch = []; - forEach(ast.elements, function(expr) { - findConstantAndWatchExpressions(expr, $filter); - allConstants = allConstants && expr.constant; - if (!expr.constant) { - argsToWatch.push.apply(argsToWatch, expr.toWatch); - } - }); - ast.constant = allConstants; - ast.toWatch = argsToWatch; - break; - case AST.ObjectExpression: - allConstants = true; - argsToWatch = []; - forEach(ast.properties, function(property) { - findConstantAndWatchExpressions(property.value, $filter); - allConstants = allConstants && property.value.constant; - if (!property.value.constant) { - argsToWatch.push.apply(argsToWatch, property.value.toWatch); - } - }); - ast.constant = allConstants; - ast.toWatch = argsToWatch; - break; - case AST.ThisExpression: - ast.constant = false; - ast.toWatch = []; - break; - case AST.LocalsExpression: - ast.constant = false; - ast.toWatch = []; - break; - } -} - -function getInputs(body) { - if (body.length != 1) return; - var lastExpression = body[0].expression; - var candidate = lastExpression.toWatch; - if (candidate.length !== 1) return candidate; - return candidate[0] !== lastExpression ? candidate : undefined; -} - -function isAssignable(ast) { - return ast.type === AST.Identifier || ast.type === AST.MemberExpression; -} - -function assignableAST(ast) { - if (ast.body.length === 1 && isAssignable(ast.body[0].expression)) { - return {type: AST.AssignmentExpression, left: ast.body[0].expression, right: {type: AST.NGValueParameter}, operator: '='}; - } -} - -function isLiteral(ast) { - return ast.body.length === 0 || - ast.body.length === 1 && ( - ast.body[0].expression.type === AST.Literal || - ast.body[0].expression.type === AST.ArrayExpression || - ast.body[0].expression.type === AST.ObjectExpression); -} - -function isConstant(ast) { - return ast.constant; -} - -function ASTCompiler(astBuilder, $filter) { - this.astBuilder = astBuilder; - this.$filter = $filter; -} - -ASTCompiler.prototype = { - compile: function(expression, expensiveChecks) { - var self = this; - var ast = this.astBuilder.ast(expression); - this.state = { - nextId: 0, - filters: {}, - expensiveChecks: expensiveChecks, - fn: {vars: [], body: [], own: {}}, - assign: {vars: [], body: [], own: {}}, - inputs: [] + /** + * @constructor + */ + var Lexer = function (options) { + this.options = options; }; - findConstantAndWatchExpressions(ast, self.$filter); - var extra = ''; - var assignable; - this.stage = 'assign'; - if ((assignable = assignableAST(ast))) { - this.state.computing = 'assign'; - var result = this.nextId(); - this.recurse(assignable, result); - this.return_(result); - extra = 'fn.assign=' + this.generateFunction('assign', 's,v,l'); - } - var toWatch = getInputs(ast.body); - self.stage = 'inputs'; - forEach(toWatch, function(watch, key) { - var fnKey = 'fn' + key; - self.state[fnKey] = {vars: [], body: [], own: {}}; - self.state.computing = fnKey; - var intoId = self.nextId(); - self.recurse(watch, intoId); - self.return_(intoId); - self.state.inputs.push(fnKey); - watch.watchId = key; - }); - this.state.computing = 'fn'; - this.stage = 'main'; - this.recurse(ast); - var fnString = - // The build and minification steps remove the string "use strict" from the code, but this is done using a regex. - // This is a workaround for this until we do a better job at only removing the prefix only when we should. - '"' + this.USE + ' ' + this.STRICT + '";\n' + - this.filterPrefix() + - 'var fn=' + this.generateFunction('fn', 's,l,a,i') + - extra + - this.watchFns() + - 'return fn;'; - - /* jshint -W054 */ - var fn = (new Function('$filter', - 'ensureSafeMemberName', - 'ensureSafeObject', - 'ensureSafeFunction', - 'getStringValue', - 'ensureSafeAssignContext', - 'ifDefined', - 'plus', - 'text', - fnString))( - this.$filter, - ensureSafeMemberName, - ensureSafeObject, - ensureSafeFunction, - getStringValue, - ensureSafeAssignContext, - ifDefined, - plusFn, - expression); - /* jshint +W054 */ - this.state = this.stage = undefined; - fn.literal = isLiteral(ast); - fn.constant = isConstant(ast); - return fn; - }, - - USE: 'use', - - STRICT: 'strict', - - watchFns: function() { - var result = []; - var fns = this.state.inputs; - var self = this; - forEach(fns, function(name) { - result.push('var ' + name + '=' + self.generateFunction(name, 's')); - }); - if (fns.length) { - result.push('fn.inputs=[' + fns.join(',') + '];'); - } - return result.join(''); - }, - - generateFunction: function(name, params) { - return 'function(' + params + '){' + - this.varsPrefix(name) + - this.body(name) + - '};'; - }, - - filterPrefix: function() { - var parts = []; - var self = this; - forEach(this.state.filters, function(id, filter) { - parts.push(id + '=$filter(' + self.escape(filter) + ')'); - }); - if (parts.length) return 'var ' + parts.join(',') + ';'; - return ''; - }, - - varsPrefix: function(section) { - return this.state[section].vars.length ? 'var ' + this.state[section].vars.join(',') + ';' : ''; - }, - - body: function(section) { - return this.state[section].body.join(''); - }, - - recurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) { - var left, right, self = this, args, expression; - recursionFn = recursionFn || noop; - if (!skipWatchIdCheck && isDefined(ast.watchId)) { - intoId = intoId || this.nextId(); - this.if_('i', - this.lazyAssign(intoId, this.computedMember('i', ast.watchId)), - this.lazyRecurse(ast, intoId, nameId, recursionFn, create, true) - ); - return; - } - switch (ast.type) { - case AST.Program: - forEach(ast.body, function(expression, pos) { - self.recurse(expression.expression, undefined, undefined, function(expr) { right = expr; }); - if (pos !== ast.body.length - 1) { - self.current().body.push(right, ';'); - } else { - self.return_(right); - } - }); - break; - case AST.Literal: - expression = this.escape(ast.value); - this.assign(intoId, expression); - recursionFn(expression); - break; - case AST.UnaryExpression: - this.recurse(ast.argument, undefined, undefined, function(expr) { right = expr; }); - expression = ast.operator + '(' + this.ifDefined(right, 0) + ')'; - this.assign(intoId, expression); - recursionFn(expression); - break; - case AST.BinaryExpression: - this.recurse(ast.left, undefined, undefined, function(expr) { left = expr; }); - this.recurse(ast.right, undefined, undefined, function(expr) { right = expr; }); - if (ast.operator === '+') { - expression = this.plus(left, right); - } else if (ast.operator === '-') { - expression = this.ifDefined(left, 0) + ast.operator + this.ifDefined(right, 0); - } else { - expression = '(' + left + ')' + ast.operator + '(' + right + ')'; - } - this.assign(intoId, expression); - recursionFn(expression); - break; - case AST.LogicalExpression: - intoId = intoId || this.nextId(); - self.recurse(ast.left, intoId); - self.if_(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId)); - recursionFn(intoId); - break; - case AST.ConditionalExpression: - intoId = intoId || this.nextId(); - self.recurse(ast.test, intoId); - self.if_(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId)); - recursionFn(intoId); - break; - case AST.Identifier: - intoId = intoId || this.nextId(); - if (nameId) { - nameId.context = self.stage === 'inputs' ? 's' : this.assign(this.nextId(), this.getHasOwnProperty('l', ast.name) + '?l:s'); - nameId.computed = false; - nameId.name = ast.name; - } - ensureSafeMemberName(ast.name); - self.if_(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)), - function() { - self.if_(self.stage === 'inputs' || 's', function() { - if (create && create !== 1) { - self.if_( - self.not(self.nonComputedMember('s', ast.name)), - self.lazyAssign(self.nonComputedMember('s', ast.name), '{}')); - } - self.assign(intoId, self.nonComputedMember('s', ast.name)); - }); - }, intoId && self.lazyAssign(intoId, self.nonComputedMember('l', ast.name)) - ); - if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.name)) { - self.addEnsureSafeObject(intoId); - } - recursionFn(intoId); - break; - case AST.MemberExpression: - left = nameId && (nameId.context = this.nextId()) || this.nextId(); - intoId = intoId || this.nextId(); - self.recurse(ast.object, left, undefined, function() { - self.if_(self.notNull(left), function() { - if (create && create !== 1) { - self.addEnsureSafeAssignContext(left); - } - if (ast.computed) { - right = self.nextId(); - self.recurse(ast.property, right); - self.getStringValue(right); - self.addEnsureSafeMemberName(right); - if (create && create !== 1) { - self.if_(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}')); - } - expression = self.ensureSafeObject(self.computedMember(left, right)); - self.assign(intoId, expression); - if (nameId) { - nameId.computed = true; - nameId.name = right; - } - } else { - ensureSafeMemberName(ast.property.name); - if (create && create !== 1) { - self.if_(self.not(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}')); - } - expression = self.nonComputedMember(left, ast.property.name); - if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.property.name)) { - expression = self.ensureSafeObject(expression); - } - self.assign(intoId, expression); - if (nameId) { - nameId.computed = false; - nameId.name = ast.property.name; - } - } - }, function() { - self.assign(intoId, 'undefined'); - }); - recursionFn(intoId); - }, !!create); - break; - case AST.CallExpression: - intoId = intoId || this.nextId(); - if (ast.filter) { - right = self.filter(ast.callee.name); - args = []; - forEach(ast.arguments, function(expr) { - var argument = self.nextId(); - self.recurse(expr, argument); - args.push(argument); - }); - expression = right + '(' + args.join(',') + ')'; - self.assign(intoId, expression); - recursionFn(intoId); - } else { - right = self.nextId(); - left = {}; - args = []; - self.recurse(ast.callee, right, left, function() { - self.if_(self.notNull(right), function() { - self.addEnsureSafeFunction(right); - forEach(ast.arguments, function(expr) { - self.recurse(expr, self.nextId(), undefined, function(argument) { - args.push(self.ensureSafeObject(argument)); - }); - }); - if (left.name) { - if (!self.state.expensiveChecks) { - self.addEnsureSafeObject(left.context); - } - expression = self.member(left.context, left.name, left.computed) + '(' + args.join(',') + ')'; - } else { - expression = right + '(' + args.join(',') + ')'; + + Lexer.prototype = { + constructor: Lexer, + + lex: function (text) { + this.text = text; + this.index = 0; + this.tokens = []; + + while (this.index < this.text.length) { + var ch = this.text.charAt(this.index); + if (ch === '"' || ch === "'") { + this.readString(ch); + } else if (this.isNumber(ch) || ch === '.' && this.isNumber(this.peek())) { + this.readNumber(); + } else if (this.isIdentifierStart(this.peekMultichar())) { + this.readIdent(); + } else if (this.is(ch, '(){}[].,;:?')) { + this.tokens.push({index: this.index, text: ch}); + this.index++; + } else if (this.isWhitespace(ch)) { + this.index++; + } else { + var ch2 = ch + this.peek(); + var ch3 = ch2 + this.peek(2); + var op1 = OPERATORS[ch]; + var op2 = OPERATORS[ch2]; + var op3 = OPERATORS[ch3]; + if (op1 || op2 || op3) { + var token = op3 ? ch3 : (op2 ? ch2 : ch); + this.tokens.push({index: this.index, text: token, operator: true}); + this.index += token.length; + } else { + this.throwError('Unexpected next character ', this.index, this.index + 1); + } + } } - expression = self.ensureSafeObject(expression); - self.assign(intoId, expression); - }, function() { - self.assign(intoId, 'undefined'); - }); - recursionFn(intoId); - }); - } - break; - case AST.AssignmentExpression: - right = this.nextId(); - left = {}; - if (!isAssignable(ast.left)) { - throw $parseMinErr('lval', 'Trying to assign a value to a non l-value'); - } - this.recurse(ast.left, undefined, left, function() { - self.if_(self.notNull(left.context), function() { - self.recurse(ast.right, right); - self.addEnsureSafeObject(self.member(left.context, left.name, left.computed)); - self.addEnsureSafeAssignContext(left.context); - expression = self.member(left.context, left.name, left.computed) + ast.operator + right; - self.assign(intoId, expression); - recursionFn(intoId || expression); - }); - }, 1); - break; - case AST.ArrayExpression: - args = []; - forEach(ast.elements, function(expr) { - self.recurse(expr, self.nextId(), undefined, function(argument) { - args.push(argument); - }); - }); - expression = '[' + args.join(',') + ']'; - this.assign(intoId, expression); - recursionFn(expression); - break; - case AST.ObjectExpression: - args = []; - forEach(ast.properties, function(property) { - self.recurse(property.value, self.nextId(), undefined, function(expr) { - args.push(self.escape( - property.key.type === AST.Identifier ? property.key.name : - ('' + property.key.value)) + - ':' + expr); - }); - }); - expression = '{' + args.join(',') + '}'; - this.assign(intoId, expression); - recursionFn(expression); - break; - case AST.ThisExpression: - this.assign(intoId, 's'); - recursionFn('s'); - break; - case AST.LocalsExpression: - this.assign(intoId, 'l'); - recursionFn('l'); - break; - case AST.NGValueParameter: - this.assign(intoId, 'v'); - recursionFn('v'); - break; - } - }, + return this.tokens; + }, - getHasOwnProperty: function(element, property) { - var key = element + '.' + property; - var own = this.current().own; - if (!own.hasOwnProperty(key)) { - own[key] = this.nextId(false, element + '&&(' + this.escape(property) + ' in ' + element + ')'); - } - return own[key]; - }, - - assign: function(id, value) { - if (!id) return; - this.current().body.push(id, '=', value, ';'); - return id; - }, - - filter: function(filterName) { - if (!this.state.filters.hasOwnProperty(filterName)) { - this.state.filters[filterName] = this.nextId(true); - } - return this.state.filters[filterName]; - }, - - ifDefined: function(id, defaultValue) { - return 'ifDefined(' + id + ',' + this.escape(defaultValue) + ')'; - }, - - plus: function(left, right) { - return 'plus(' + left + ',' + right + ')'; - }, - - return_: function(id) { - this.current().body.push('return ', id, ';'); - }, - - if_: function(test, alternate, consequent) { - if (test === true) { - alternate(); - } else { - var body = this.current().body; - body.push('if(', test, '){'); - alternate(); - body.push('}'); - if (consequent) { - body.push('else{'); - consequent(); - body.push('}'); - } - } - }, - - not: function(expression) { - return '!(' + expression + ')'; - }, - - notNull: function(expression) { - return expression + '!=null'; - }, - - nonComputedMember: function(left, right) { - var SAFE_IDENTIFIER = /[$_a-zA-Z][$_a-zA-Z0-9]*/; - var UNSAFE_CHARACTERS = /[^$_a-zA-Z0-9]/g; - if (SAFE_IDENTIFIER.test(right)) { - return left + '.' + right; - } else { - return left + '["' + right.replace(UNSAFE_CHARACTERS, this.stringEscapeFn) + '"]'; - } - }, + is: function (ch, chars) { + return chars.indexOf(ch) !== -1; + }, + + peek: function (i) { + var num = i || 1; + return (this.index + num < this.text.length) ? this.text.charAt(this.index + num) : false; + }, - computedMember: function(left, right) { - return left + '[' + right + ']'; - }, + isNumber: function (ch) { + return ('0' <= ch && ch <= '9') && typeof ch === "string"; + }, + + isWhitespace: function (ch) { + // IE treats non-breaking space as \u00A0 + return (ch === ' ' || ch === '\r' || ch === '\t' || + ch === '\n' || ch === '\v' || ch === '\u00A0'); + }, - member: function(left, right, computed) { - if (computed) return this.computedMember(left, right); - return this.nonComputedMember(left, right); - }, + isIdentifierStart: function (ch) { + return this.options.isIdentifierStart ? + this.options.isIdentifierStart(ch, this.codePointAt(ch)) : + this.isValidIdentifierStart(ch); + }, - addEnsureSafeObject: function(item) { - this.current().body.push(this.ensureSafeObject(item), ';'); - }, + isValidIdentifierStart: function (ch) { + return ('a' <= ch && ch <= 'z' || + 'A' <= ch && ch <= 'Z' || + '_' === ch || ch === '$'); + }, - addEnsureSafeMemberName: function(item) { - this.current().body.push(this.ensureSafeMemberName(item), ';'); - }, + isIdentifierContinue: function (ch) { + return this.options.isIdentifierContinue ? + this.options.isIdentifierContinue(ch, this.codePointAt(ch)) : + this.isValidIdentifierContinue(ch); + }, - addEnsureSafeFunction: function(item) { - this.current().body.push(this.ensureSafeFunction(item), ';'); - }, + isValidIdentifierContinue: function (ch, cp) { + return this.isValidIdentifierStart(ch, cp) || this.isNumber(ch); + }, - addEnsureSafeAssignContext: function(item) { - this.current().body.push(this.ensureSafeAssignContext(item), ';'); - }, + codePointAt: function (ch) { + if (ch.length === 1) return ch.charCodeAt(0); + /*jshint bitwise: false*/ + return (ch.charCodeAt(0) << 10) + ch.charCodeAt(1) - 0x35FDC00; + /*jshint bitwise: true*/ + }, - ensureSafeObject: function(item) { - return 'ensureSafeObject(' + item + ',text)'; - }, + peekMultichar: function () { + var ch = this.text.charAt(this.index); + var peek = this.peek(); + if (!peek) { + return ch; + } + var cp1 = ch.charCodeAt(0); + var cp2 = peek.charCodeAt(0); + if (cp1 >= 0xD800 && cp1 <= 0xDBFF && cp2 >= 0xDC00 && cp2 <= 0xDFFF) { + return ch + peek; + } + return ch; + }, - ensureSafeMemberName: function(item) { - return 'ensureSafeMemberName(' + item + ',text)'; - }, + isExpOperator: function (ch) { + return (ch === '-' || ch === '+' || this.isNumber(ch)); + }, - ensureSafeFunction: function(item) { - return 'ensureSafeFunction(' + item + ',text)'; - }, + throwError: function (error, start, end) { + end = end || this.index; + var colStr = (isDefined(start) + ? 's ' + start + '-' + this.index + ' [' + this.text.substring(start, end) + ']' + : ' ' + end); + throw $parseMinErr('lexerr', 'Lexer Error: {0} at column{1} in expression [{2}].', + error, colStr, this.text); + }, - getStringValue: function(item) { - this.assign(item, 'getStringValue(' + item + ')'); - }, + readNumber: function () { + var number = ''; + var start = this.index; + while (this.index < this.text.length) { + var ch = lowercase(this.text.charAt(this.index)); + if (ch == '.' || this.isNumber(ch)) { + number += ch; + } else { + var peekCh = this.peek(); + if (ch == 'e' && this.isExpOperator(peekCh)) { + number += ch; + } else if (this.isExpOperator(ch) && + peekCh && this.isNumber(peekCh) && + number.charAt(number.length - 1) == 'e') { + number += ch; + } else if (this.isExpOperator(ch) && + (!peekCh || !this.isNumber(peekCh)) && + number.charAt(number.length - 1) == 'e') { + this.throwError('Invalid exponent'); + } else { + break; + } + } + this.index++; + } + this.tokens.push({ + index: start, + text: number, + constant: true, + value: Number(number) + }); + }, - ensureSafeAssignContext: function(item) { - return 'ensureSafeAssignContext(' + item + ',text)'; - }, + readIdent: function () { + var start = this.index; + this.index += this.peekMultichar().length; + while (this.index < this.text.length) { + var ch = this.peekMultichar(); + if (!this.isIdentifierContinue(ch)) { + break; + } + this.index += ch.length; + } + this.tokens.push({ + index: start, + text: this.text.slice(start, this.index), + identifier: true + }); + }, - lazyRecurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) { - var self = this; - return function() { - self.recurse(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck); + readString: function (quote) { + var start = this.index; + this.index++; + var string = ''; + var rawString = quote; + var escape = false; + while (this.index < this.text.length) { + var ch = this.text.charAt(this.index); + rawString += ch; + if (escape) { + if (ch === 'u') { + var hex = this.text.substring(this.index + 1, this.index + 5); + if (!hex.match(/[\da-f]{4}/i)) { + this.throwError('Invalid unicode escape [\\u' + hex + ']'); + } + this.index += 4; + string += String.fromCharCode(parseInt(hex, 16)); + } else { + var rep = ESCAPE[ch]; + string = string + (rep || ch); + } + escape = false; + } else if (ch === '\\') { + escape = true; + } else if (ch === quote) { + this.index++; + this.tokens.push({ + index: start, + text: rawString, + constant: true, + value: string + }); + return; + } else { + string += ch; + } + this.index++; + } + this.throwError('Unterminated quote', start); + } }; - }, - lazyAssign: function(id, value) { - var self = this; - return function() { - self.assign(id, value); + var AST = function (lexer, options) { + this.lexer = lexer; + this.options = options; }; - }, - stringEscapeRegex: /[^ a-zA-Z0-9]/g, + AST.Program = 'Program'; + AST.ExpressionStatement = 'ExpressionStatement'; + AST.AssignmentExpression = 'AssignmentExpression'; + AST.ConditionalExpression = 'ConditionalExpression'; + AST.LogicalExpression = 'LogicalExpression'; + AST.BinaryExpression = 'BinaryExpression'; + AST.UnaryExpression = 'UnaryExpression'; + AST.CallExpression = 'CallExpression'; + AST.MemberExpression = 'MemberExpression'; + AST.Identifier = 'Identifier'; + AST.Literal = 'Literal'; + AST.ArrayExpression = 'ArrayExpression'; + AST.Property = 'Property'; + AST.ObjectExpression = 'ObjectExpression'; + AST.ThisExpression = 'ThisExpression'; + AST.LocalsExpression = 'LocalsExpression'; - stringEscapeFn: function(c) { - return '\\u' + ('0000' + c.charCodeAt(0).toString(16)).slice(-4); - }, +// Internal use only + AST.NGValueParameter = 'NGValueParameter'; - escape: function(value) { - if (isString(value)) return "'" + value.replace(this.stringEscapeRegex, this.stringEscapeFn) + "'"; - if (isNumber(value)) return value.toString(); - if (value === true) return 'true'; - if (value === false) return 'false'; - if (value === null) return 'null'; - if (typeof value === 'undefined') return 'undefined'; + AST.prototype = { + ast: function (text) { + this.text = text; + this.tokens = this.lexer.lex(text); - throw $parseMinErr('esc', 'IMPOSSIBLE'); - }, + var value = this.program(); - nextId: function(skip, init) { - var id = 'v' + (this.state.nextId++); - if (!skip) { - this.current().vars.push(id + (init ? '=' + init : '')); - } - return id; - }, - - current: function() { - return this.state[this.state.computing]; - } -}; - - -function ASTInterpreter(astBuilder, $filter) { - this.astBuilder = astBuilder; - this.$filter = $filter; -} - -ASTInterpreter.prototype = { - compile: function(expression, expensiveChecks) { - var self = this; - var ast = this.astBuilder.ast(expression); - this.expression = expression; - this.expensiveChecks = expensiveChecks; - findConstantAndWatchExpressions(ast, self.$filter); - var assignable; - var assign; - if ((assignable = assignableAST(ast))) { - assign = this.recurse(assignable); - } - var toWatch = getInputs(ast.body); - var inputs; - if (toWatch) { - inputs = []; - forEach(toWatch, function(watch, key) { - var input = self.recurse(watch); - watch.input = input; - inputs.push(input); - watch.watchId = key; - }); - } - var expressions = []; - forEach(ast.body, function(expression) { - expressions.push(self.recurse(expression.expression)); - }); - var fn = ast.body.length === 0 ? noop : - ast.body.length === 1 ? expressions[0] : - function(scope, locals) { - var lastValue; - forEach(expressions, function(exp) { - lastValue = exp(scope, locals); - }); - return lastValue; - }; - if (assign) { - fn.assign = function(scope, value, locals) { - return assign(scope, locals, value); - }; - } - if (inputs) { - fn.inputs = inputs; - } - fn.literal = isLiteral(ast); - fn.constant = isConstant(ast); - return fn; - }, - - recurse: function(ast, context, create) { - var left, right, self = this, args, expression; - if (ast.input) { - return this.inputs(ast.input, ast.watchId); - } - switch (ast.type) { - case AST.Literal: - return this.value(ast.value, context); - case AST.UnaryExpression: - right = this.recurse(ast.argument); - return this['unary' + ast.operator](right, context); - case AST.BinaryExpression: - left = this.recurse(ast.left); - right = this.recurse(ast.right); - return this['binary' + ast.operator](left, right, context); - case AST.LogicalExpression: - left = this.recurse(ast.left); - right = this.recurse(ast.right); - return this['binary' + ast.operator](left, right, context); - case AST.ConditionalExpression: - return this['ternary?:']( - this.recurse(ast.test), - this.recurse(ast.alternate), - this.recurse(ast.consequent), - context - ); - case AST.Identifier: - ensureSafeMemberName(ast.name, self.expression); - return self.identifier(ast.name, - self.expensiveChecks || isPossiblyDangerousMemberName(ast.name), - context, create, self.expression); - case AST.MemberExpression: - left = this.recurse(ast.object, false, !!create); - if (!ast.computed) { - ensureSafeMemberName(ast.property.name, self.expression); - right = ast.property.name; - } - if (ast.computed) right = this.recurse(ast.property); - return ast.computed ? - this.computedMember(left, right, context, create, self.expression) : - this.nonComputedMember(left, right, self.expensiveChecks, context, create, self.expression); - case AST.CallExpression: - args = []; - forEach(ast.arguments, function(expr) { - args.push(self.recurse(expr)); - }); - if (ast.filter) right = this.$filter(ast.callee.name); - if (!ast.filter) right = this.recurse(ast.callee, true); - return ast.filter ? - function(scope, locals, assign, inputs) { - var values = []; - for (var i = 0; i < args.length; ++i) { - values.push(args[i](scope, locals, assign, inputs)); - } - var value = right.apply(undefined, values, inputs); - return context ? {context: undefined, name: undefined, value: value} : value; - } : - function(scope, locals, assign, inputs) { - var rhs = right(scope, locals, assign, inputs); - var value; - if (rhs.value != null) { - ensureSafeObject(rhs.context, self.expression); - ensureSafeFunction(rhs.value, self.expression); - var values = []; - for (var i = 0; i < args.length; ++i) { - values.push(ensureSafeObject(args[i](scope, locals, assign, inputs), self.expression)); - } - value = ensureSafeObject(rhs.value.apply(rhs.context, values), self.expression); - } - return context ? {value: value} : value; - }; - case AST.AssignmentExpression: - left = this.recurse(ast.left, true, 1); - right = this.recurse(ast.right); - return function(scope, locals, assign, inputs) { - var lhs = left(scope, locals, assign, inputs); - var rhs = right(scope, locals, assign, inputs); - ensureSafeObject(lhs.value, self.expression); - ensureSafeAssignContext(lhs.context); - lhs.context[lhs.name] = rhs; - return context ? {value: rhs} : rhs; - }; - case AST.ArrayExpression: - args = []; - forEach(ast.elements, function(expr) { - args.push(self.recurse(expr)); - }); - return function(scope, locals, assign, inputs) { - var value = []; - for (var i = 0; i < args.length; ++i) { - value.push(args[i](scope, locals, assign, inputs)); - } - return context ? {value: value} : value; - }; - case AST.ObjectExpression: - args = []; - forEach(ast.properties, function(property) { - args.push({key: property.key.type === AST.Identifier ? - property.key.name : - ('' + property.key.value), - value: self.recurse(property.value) - }); - }); - return function(scope, locals, assign, inputs) { - var value = {}; - for (var i = 0; i < args.length; ++i) { - value[args[i].key] = args[i].value(scope, locals, assign, inputs); - } - return context ? {value: value} : value; - }; - case AST.ThisExpression: - return function(scope) { - return context ? {value: scope} : scope; - }; - case AST.LocalsExpression: - return function(scope, locals) { - return context ? {value: locals} : locals; - }; - case AST.NGValueParameter: - return function(scope, locals, assign) { - return context ? {value: assign} : assign; - }; - } - }, - - 'unary+': function(argument, context) { - return function(scope, locals, assign, inputs) { - var arg = argument(scope, locals, assign, inputs); - if (isDefined(arg)) { - arg = +arg; - } else { - arg = 0; - } - return context ? {value: arg} : arg; - }; - }, - 'unary-': function(argument, context) { - return function(scope, locals, assign, inputs) { - var arg = argument(scope, locals, assign, inputs); - if (isDefined(arg)) { - arg = -arg; - } else { - arg = 0; - } - return context ? {value: arg} : arg; - }; - }, - 'unary!': function(argument, context) { - return function(scope, locals, assign, inputs) { - var arg = !argument(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary+': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var lhs = left(scope, locals, assign, inputs); - var rhs = right(scope, locals, assign, inputs); - var arg = plusFn(lhs, rhs); - return context ? {value: arg} : arg; - }; - }, - 'binary-': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var lhs = left(scope, locals, assign, inputs); - var rhs = right(scope, locals, assign, inputs); - var arg = (isDefined(lhs) ? lhs : 0) - (isDefined(rhs) ? rhs : 0); - return context ? {value: arg} : arg; - }; - }, - 'binary*': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) * right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary/': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) / right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary%': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) % right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary===': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) === right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary!==': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) !== right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary==': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) == right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary!=': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) != right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary<': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) < right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary>': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) > right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary<=': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) <= right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary>=': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) >= right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary&&': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) && right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'binary||': function(left, right, context) { - return function(scope, locals, assign, inputs) { - var arg = left(scope, locals, assign, inputs) || right(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - 'ternary?:': function(test, alternate, consequent, context) { - return function(scope, locals, assign, inputs) { - var arg = test(scope, locals, assign, inputs) ? alternate(scope, locals, assign, inputs) : consequent(scope, locals, assign, inputs); - return context ? {value: arg} : arg; - }; - }, - value: function(value, context) { - return function() { return context ? {context: undefined, name: undefined, value: value} : value; }; - }, - identifier: function(name, expensiveChecks, context, create, expression) { - return function(scope, locals, assign, inputs) { - var base = locals && (name in locals) ? locals : scope; - if (create && create !== 1 && base && !(base[name])) { - base[name] = {}; - } - var value = base ? base[name] : undefined; - if (expensiveChecks) { - ensureSafeObject(value, expression); - } - if (context) { - return {context: base, name: name, value: value}; - } else { - return value; - } - }; - }, - computedMember: function(left, right, context, create, expression) { - return function(scope, locals, assign, inputs) { - var lhs = left(scope, locals, assign, inputs); - var rhs; - var value; - if (lhs != null) { - rhs = right(scope, locals, assign, inputs); - rhs = getStringValue(rhs); - ensureSafeMemberName(rhs, expression); - if (create && create !== 1) { - ensureSafeAssignContext(lhs); - if (lhs && !(lhs[rhs])) { - lhs[rhs] = {}; - } - } - value = lhs[rhs]; - ensureSafeObject(value, expression); - } - if (context) { - return {context: lhs, name: rhs, value: value}; - } else { - return value; - } - }; - }, - nonComputedMember: function(left, right, expensiveChecks, context, create, expression) { - return function(scope, locals, assign, inputs) { - var lhs = left(scope, locals, assign, inputs); - if (create && create !== 1) { - ensureSafeAssignContext(lhs); - if (lhs && !(lhs[right])) { - lhs[right] = {}; - } - } - var value = lhs != null ? lhs[right] : undefined; - if (expensiveChecks || isPossiblyDangerousMemberName(right)) { - ensureSafeObject(value, expression); - } - if (context) { - return {context: lhs, name: right, value: value}; - } else { - return value; - } - }; - }, - inputs: function(input, watchId) { - return function(scope, value, locals, inputs) { - if (inputs) return inputs[watchId]; - return input(scope, value, locals); - }; - } -}; + if (this.tokens.length !== 0) { + this.throwError('is an unexpected token', this.tokens[0]); + } -/** - * @constructor - */ -var Parser = function(lexer, $filter, options) { - this.lexer = lexer; - this.$filter = $filter; - this.options = options; - this.ast = new AST(lexer, options); - this.astCompiler = options.csp ? new ASTInterpreter(this.ast, $filter) : - new ASTCompiler(this.ast, $filter); -}; + return value; + }, -Parser.prototype = { - constructor: Parser, + program: function () { + var body = []; + while (true) { + if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']')) + body.push(this.expressionStatement()); + if (!this.expect(';')) { + return {type: AST.Program, body: body}; + } + } + }, - parse: function(text) { - return this.astCompiler.compile(text, this.options.expensiveChecks); - } -}; + expressionStatement: function () { + return {type: AST.ExpressionStatement, expression: this.filterChain()}; + }, -function isPossiblyDangerousMemberName(name) { - return name == 'constructor'; -} + filterChain: function () { + var left = this.expression(); + var token; + while ((token = this.expect('|'))) { + left = this.filter(left); + } + return left; + }, -var objectValueOf = Object.prototype.valueOf; + expression: function () { + return this.assignment(); + }, -function getValueOf(value) { - return isFunction(value.valueOf) ? value.valueOf() : objectValueOf.call(value); -} + assignment: function () { + var result = this.ternary(); + if (this.expect('=')) { + result = {type: AST.AssignmentExpression, left: result, right: this.assignment(), operator: '='}; + } + return result; + }, -/////////////////////////////////// + ternary: function () { + var test = this.logicalOR(); + var alternate; + var consequent; + if (this.expect('?')) { + alternate = this.expression(); + if (this.consume(':')) { + consequent = this.expression(); + return {type: AST.ConditionalExpression, test: test, alternate: alternate, consequent: consequent}; + } + } + return test; + }, -/** - * @ngdoc service - * @name $parse - * @kind function - * - * @description - * - * Converts Angular {@link guide/expression expression} into a function. - * - * ```js - * var getter = $parse('user.name'); - * var setter = getter.assign; - * var context = {user:{name:'angular'}}; - * var locals = {user:{name:'local'}}; - * - * expect(getter(context)).toEqual('angular'); - * setter(context, 'newValue'); - * expect(context.user.name).toEqual('newValue'); - * expect(getter(context, locals)).toEqual('local'); - * ``` - * - * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: - * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - * - * The returned function also has the following properties: - * * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript - * literal. - * * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript - * constant literals. - * * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be - * set to a function to change its value on the given context. - * - */ + logicalOR: function () { + var left = this.logicalAND(); + while (this.expect('||')) { + left = {type: AST.LogicalExpression, operator: '||', left: left, right: this.logicalAND()}; + } + return left; + }, + logicalAND: function () { + var left = this.equality(); + while (this.expect('&&')) { + left = {type: AST.LogicalExpression, operator: '&&', left: left, right: this.equality()}; + } + return left; + }, -/** - * @ngdoc provider - * @name $parseProvider - * - * @description - * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse} - * service. - */ -function $ParseProvider() { - var cacheDefault = createMap(); - var cacheExpensive = createMap(); - var literals = { - 'true': true, - 'false': false, - 'null': null, - 'undefined': undefined - }; - var identStart, identContinue; - - /** - * @ngdoc method - * @name $parseProvider#addLiteral - * @description - * - * Configure $parse service to add literal values that will be present as literal at expressions. - * - * @param {string} literalName Token for the literal value. The literal name value must be a valid literal name. - * @param {*} literalValue Value for this literal. All literal values must be primitives or `undefined`. - * - **/ - this.addLiteral = function(literalName, literalValue) { - literals[literalName] = literalValue; - }; - - /** - * @ngdoc method - * @name $parseProvider#setIdentifierFns - * @description - * - * Allows defining the set of characters that are allowed in Angular expressions. The function - * `identifierStart` will get called to know if a given character is a valid character to be the - * first character for an identifier. The function `identifierContinue` will get called to know if - * a given character is a valid character to be a follow-up identifier character. The functions - * `identifierStart` and `identifierContinue` will receive as arguments the single character to be - * identifier and the character code point. These arguments will be `string` and `numeric`. Keep in - * mind that the `string` parameter can be two characters long depending on the character - * representation. It is expected for the function to return `true` or `false`, whether that - * character is allowed or not. - * - * Since this function will be called extensivelly, keep the implementation of these functions fast, - * as the performance of these functions have a direct impact on the expressions parsing speed. - * - * @param {function=} identifierStart The function that will decide whether the given character is - * a valid identifier start character. - * @param {function=} identifierContinue The function that will decide whether the given character is - * a valid identifier continue character. - */ - this.setIdentifierFns = function(identifierStart, identifierContinue) { - identStart = identifierStart; - identContinue = identifierContinue; - return this; - }; - - this.$get = ['$filter', function($filter) { - var noUnsafeEval = csp().noUnsafeEval; - var $parseOptions = { - csp: noUnsafeEval, - expensiveChecks: false, - literals: copy(literals), - isIdentifierStart: isFunction(identStart) && identStart, - isIdentifierContinue: isFunction(identContinue) && identContinue + equality: function () { + var left = this.relational(); + var token; + while ((token = this.expect('==', '!=', '===', '!=='))) { + left = {type: AST.BinaryExpression, operator: token.text, left: left, right: this.relational()}; + } + return left; }, - $parseOptionsExpensive = { - csp: noUnsafeEval, - expensiveChecks: true, - literals: copy(literals), - isIdentifierStart: isFunction(identStart) && identStart, - isIdentifierContinue: isFunction(identContinue) && identContinue - }; - var runningChecksEnabled = false; - $parse.$$runningExpensiveChecks = function() { - return runningChecksEnabled; - }; + relational: function () { + var left = this.additive(); + var token; + while ((token = this.expect('<', '>', '<=', '>='))) { + left = {type: AST.BinaryExpression, operator: token.text, left: left, right: this.additive()}; + } + return left; + }, + + additive: function () { + var left = this.multiplicative(); + var token; + while ((token = this.expect('+', '-'))) { + left = {type: AST.BinaryExpression, operator: token.text, left: left, right: this.multiplicative()}; + } + return left; + }, + + multiplicative: function () { + var left = this.unary(); + var token; + while ((token = this.expect('*', '/', '%'))) { + left = {type: AST.BinaryExpression, operator: token.text, left: left, right: this.unary()}; + } + return left; + }, + + unary: function () { + var token; + if ((token = this.expect('+', '-', '!'))) { + return {type: AST.UnaryExpression, operator: token.text, prefix: true, argument: this.unary()}; + } else { + return this.primary(); + } + }, - return $parse; + primary: function () { + var primary; + if (this.expect('(')) { + primary = this.filterChain(); + this.consume(')'); + } else if (this.expect('[')) { + primary = this.arrayDeclaration(); + } else if (this.expect('{')) { + primary = this.object(); + } else if (this.selfReferential.hasOwnProperty(this.peek().text)) { + primary = copy(this.selfReferential[this.consume().text]); + } else if (this.options.literals.hasOwnProperty(this.peek().text)) { + primary = {type: AST.Literal, value: this.options.literals[this.consume().text]}; + } else if (this.peek().identifier) { + primary = this.identifier(); + } else if (this.peek().constant) { + primary = this.constant(); + } else { + this.throwError('not a primary expression', this.peek()); + } - function $parse(exp, interceptorFn, expensiveChecks) { - var parsedExpression, oneTime, cacheKey; + var next; + while ((next = this.expect('(', '[', '.'))) { + if (next.text === '(') { + primary = {type: AST.CallExpression, callee: primary, arguments: this.parseArguments()}; + this.consume(')'); + } else if (next.text === '[') { + primary = { + type: AST.MemberExpression, + object: primary, + property: this.expression(), + computed: true + }; + this.consume(']'); + } else if (next.text === '.') { + primary = { + type: AST.MemberExpression, + object: primary, + property: this.identifier(), + computed: false + }; + } else { + this.throwError('IMPOSSIBLE'); + } + } + return primary; + }, - expensiveChecks = expensiveChecks || runningChecksEnabled; + filter: function (baseExpression) { + var args = [baseExpression]; + var result = {type: AST.CallExpression, callee: this.identifier(), arguments: args, filter: true}; - switch (typeof exp) { - case 'string': - exp = exp.trim(); - cacheKey = exp; + while (this.expect(':')) { + args.push(this.expression()); + } - var cache = (expensiveChecks ? cacheExpensive : cacheDefault); - parsedExpression = cache[cacheKey]; + return result; + }, - if (!parsedExpression) { - if (exp.charAt(0) === ':' && exp.charAt(1) === ':') { - oneTime = true; - exp = exp.substring(2); + parseArguments: function () { + var args = []; + if (this.peekToken().text !== ')') { + do { + args.push(this.expression()); + } while (this.expect(',')); } - var parseOptions = expensiveChecks ? $parseOptionsExpensive : $parseOptions; - var lexer = new Lexer(parseOptions); - var parser = new Parser(lexer, $filter, parseOptions); - parsedExpression = parser.parse(exp); - if (parsedExpression.constant) { - parsedExpression.$$watchDelegate = constantWatchDelegate; - } else if (oneTime) { - parsedExpression.$$watchDelegate = parsedExpression.literal ? - oneTimeLiteralWatchDelegate : oneTimeWatchDelegate; - } else if (parsedExpression.inputs) { - parsedExpression.$$watchDelegate = inputsWatchDelegate; + return args; + }, + + identifier: function () { + var token = this.consume(); + if (!token.identifier) { + this.throwError('is not a valid identifier', token); } - if (expensiveChecks) { - parsedExpression = expensiveChecksInterceptor(parsedExpression); + return {type: AST.Identifier, name: token.text}; + }, + + constant: function () { + // TODO check that it is a constant + return {type: AST.Literal, value: this.consume().value}; + }, + + arrayDeclaration: function () { + var elements = []; + if (this.peekToken().text !== ']') { + do { + if (this.peek(']')) { + // Support trailing commas per ES5.1. + break; + } + elements.push(this.expression()); + } while (this.expect(',')); } - cache[cacheKey] = parsedExpression; - } - return addInterceptor(parsedExpression, interceptorFn); + this.consume(']'); - case 'function': - return addInterceptor(exp, interceptorFn); + return {type: AST.ArrayExpression, elements: elements}; + }, - default: - return addInterceptor(noop, interceptorFn); - } - } + object: function () { + var properties = [], property; + if (this.peekToken().text !== '}') { + do { + if (this.peek('}')) { + // Support trailing commas per ES5.1. + break; + } + property = {type: AST.Property, kind: 'init'}; + if (this.peek().constant) { + property.key = this.constant(); + } else if (this.peek().identifier) { + property.key = this.identifier(); + } else { + this.throwError("invalid key", this.peek()); + } + this.consume(':'); + property.value = this.expression(); + properties.push(property); + } while (this.expect(',')); + } + this.consume('}'); + + return {type: AST.ObjectExpression, properties: properties}; + }, - function expensiveChecksInterceptor(fn) { - if (!fn) return fn; - expensiveCheckFn.$$watchDelegate = fn.$$watchDelegate; - expensiveCheckFn.assign = expensiveChecksInterceptor(fn.assign); - expensiveCheckFn.constant = fn.constant; - expensiveCheckFn.literal = fn.literal; - for (var i = 0; fn.inputs && i < fn.inputs.length; ++i) { - fn.inputs[i] = expensiveChecksInterceptor(fn.inputs[i]); - } - expensiveCheckFn.inputs = fn.inputs; + throwError: function (msg, token) { + throw $parseMinErr('syntax', + 'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].', + token.text, msg, (token.index + 1), this.text, this.text.substring(token.index)); + }, - return expensiveCheckFn; + consume: function (e1) { + if (this.tokens.length === 0) { + throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text); + } - function expensiveCheckFn(scope, locals, assign, inputs) { - var expensiveCheckOldValue = runningChecksEnabled; - runningChecksEnabled = true; - try { - return fn(scope, locals, assign, inputs); - } finally { - runningChecksEnabled = expensiveCheckOldValue; - } - } - } + var token = this.expect(e1); + if (!token) { + this.throwError('is unexpected, expecting [' + e1 + ']', this.peek()); + } + return token; + }, - function expressionInputDirtyCheck(newValue, oldValueOfValue) { + peekToken: function () { + if (this.tokens.length === 0) { + throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text); + } + return this.tokens[0]; + }, - if (newValue == null || oldValueOfValue == null) { // null/undefined - return newValue === oldValueOfValue; - } + peek: function (e1, e2, e3, e4) { + return this.peekAhead(0, e1, e2, e3, e4); + }, - if (typeof newValue === 'object') { + peekAhead: function (i, e1, e2, e3, e4) { + if (this.tokens.length > i) { + var token = this.tokens[i]; + var t = token.text; + if (t === e1 || t === e2 || t === e3 || t === e4 || + (!e1 && !e2 && !e3 && !e4)) { + return token; + } + } + return false; + }, - // attempt to convert the value to a primitive type - // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can - // be cheaply dirty-checked - newValue = getValueOf(newValue); + expect: function (e1, e2, e3, e4) { + var token = this.peek(e1, e2, e3, e4); + if (token) { + this.tokens.shift(); + return token; + } + return false; + }, - if (typeof newValue === 'object') { - // objects/arrays are not supported - deep-watching them would be too expensive - return false; + selfReferential: { + 'this': {type: AST.ThisExpression}, + '$locals': {type: AST.LocalsExpression} } + }; - // fall-through to the primitive equality check - } - - //Primitive or NaN - return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue); + function ifDefined(v, d) { + return typeof v !== 'undefined' ? v : d; } - function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) { - var inputExpressions = parsedExpression.inputs; - var lastResult; - - if (inputExpressions.length === 1) { - var oldInputValueOf = expressionInputDirtyCheck; // init to something unique so that equals check fails - inputExpressions = inputExpressions[0]; - return scope.$watch(function expressionInputWatch(scope) { - var newInputValue = inputExpressions(scope); - if (!expressionInputDirtyCheck(newInputValue, oldInputValueOf)) { - lastResult = parsedExpression(scope, undefined, undefined, [newInputValue]); - oldInputValueOf = newInputValue && getValueOf(newInputValue); - } - return lastResult; - }, listener, objectEquality, prettyPrintExpression); - } - - var oldInputValueOfValues = []; - var oldInputValues = []; - for (var i = 0, ii = inputExpressions.length; i < ii; i++) { - oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails - oldInputValues[i] = null; - } - - return scope.$watch(function expressionInputsWatch(scope) { - var changed = false; + function plusFn(l, r) { + if (typeof l === 'undefined') return r; + if (typeof r === 'undefined') return l; + return l + r; + } - for (var i = 0, ii = inputExpressions.length; i < ii; i++) { - var newInputValue = inputExpressions[i](scope); - if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) { - oldInputValues[i] = newInputValue; - oldInputValueOfValues[i] = newInputValue && getValueOf(newInputValue); - } - } + function isStateless($filter, filterName) { + var fn = $filter(filterName); + return !fn.$stateful; + } - if (changed) { - lastResult = parsedExpression(scope, undefined, undefined, oldInputValues); + function findConstantAndWatchExpressions(ast, $filter) { + var allConstants; + var argsToWatch; + switch (ast.type) { + case AST.Program: + allConstants = true; + forEach(ast.body, function (expr) { + findConstantAndWatchExpressions(expr.expression, $filter); + allConstants = allConstants && expr.expression.constant; + }); + ast.constant = allConstants; + break; + case AST.Literal: + ast.constant = true; + ast.toWatch = []; + break; + case AST.UnaryExpression: + findConstantAndWatchExpressions(ast.argument, $filter); + ast.constant = ast.argument.constant; + ast.toWatch = ast.argument.toWatch; + break; + case AST.BinaryExpression: + findConstantAndWatchExpressions(ast.left, $filter); + findConstantAndWatchExpressions(ast.right, $filter); + ast.constant = ast.left.constant && ast.right.constant; + ast.toWatch = ast.left.toWatch.concat(ast.right.toWatch); + break; + case AST.LogicalExpression: + findConstantAndWatchExpressions(ast.left, $filter); + findConstantAndWatchExpressions(ast.right, $filter); + ast.constant = ast.left.constant && ast.right.constant; + ast.toWatch = ast.constant ? [] : [ast]; + break; + case AST.ConditionalExpression: + findConstantAndWatchExpressions(ast.test, $filter); + findConstantAndWatchExpressions(ast.alternate, $filter); + findConstantAndWatchExpressions(ast.consequent, $filter); + ast.constant = ast.test.constant && ast.alternate.constant && ast.consequent.constant; + ast.toWatch = ast.constant ? [] : [ast]; + break; + case AST.Identifier: + ast.constant = false; + ast.toWatch = [ast]; + break; + case AST.MemberExpression: + findConstantAndWatchExpressions(ast.object, $filter); + if (ast.computed) { + findConstantAndWatchExpressions(ast.property, $filter); + } + ast.constant = ast.object.constant && (!ast.computed || ast.property.constant); + ast.toWatch = [ast]; + break; + case AST.CallExpression: + allConstants = ast.filter ? isStateless($filter, ast.callee.name) : false; + argsToWatch = []; + forEach(ast.arguments, function (expr) { + findConstantAndWatchExpressions(expr, $filter); + allConstants = allConstants && expr.constant; + if (!expr.constant) { + argsToWatch.push.apply(argsToWatch, expr.toWatch); + } + }); + ast.constant = allConstants; + ast.toWatch = ast.filter && isStateless($filter, ast.callee.name) ? argsToWatch : [ast]; + break; + case AST.AssignmentExpression: + findConstantAndWatchExpressions(ast.left, $filter); + findConstantAndWatchExpressions(ast.right, $filter); + ast.constant = ast.left.constant && ast.right.constant; + ast.toWatch = [ast]; + break; + case AST.ArrayExpression: + allConstants = true; + argsToWatch = []; + forEach(ast.elements, function (expr) { + findConstantAndWatchExpressions(expr, $filter); + allConstants = allConstants && expr.constant; + if (!expr.constant) { + argsToWatch.push.apply(argsToWatch, expr.toWatch); + } + }); + ast.constant = allConstants; + ast.toWatch = argsToWatch; + break; + case AST.ObjectExpression: + allConstants = true; + argsToWatch = []; + forEach(ast.properties, function (property) { + findConstantAndWatchExpressions(property.value, $filter); + allConstants = allConstants && property.value.constant; + if (!property.value.constant) { + argsToWatch.push.apply(argsToWatch, property.value.toWatch); + } + }); + ast.constant = allConstants; + ast.toWatch = argsToWatch; + break; + case AST.ThisExpression: + ast.constant = false; + ast.toWatch = []; + break; + case AST.LocalsExpression: + ast.constant = false; + ast.toWatch = []; + break; } + } - return lastResult; - }, listener, objectEquality, prettyPrintExpression); + function getInputs(body) { + if (body.length != 1) return; + var lastExpression = body[0].expression; + var candidate = lastExpression.toWatch; + if (candidate.length !== 1) return candidate; + return candidate[0] !== lastExpression ? candidate : undefined; } - function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) { - var unwatch, lastValue; - return unwatch = scope.$watch(function oneTimeWatch(scope) { - return parsedExpression(scope); - }, function oneTimeListener(value, old, scope) { - lastValue = value; - if (isFunction(listener)) { - listener.apply(this, arguments); - } - if (isDefined(value)) { - scope.$$postDigest(function() { - if (isDefined(lastValue)) { - unwatch(); - } - }); - } - }, objectEquality); + function isAssignable(ast) { + return ast.type === AST.Identifier || ast.type === AST.MemberExpression; } - function oneTimeLiteralWatchDelegate(scope, listener, objectEquality, parsedExpression) { - var unwatch, lastValue; - return unwatch = scope.$watch(function oneTimeWatch(scope) { - return parsedExpression(scope); - }, function oneTimeListener(value, old, scope) { - lastValue = value; - if (isFunction(listener)) { - listener.call(this, value, old, scope); - } - if (isAllDefined(value)) { - scope.$$postDigest(function() { - if (isAllDefined(lastValue)) unwatch(); - }); + function assignableAST(ast) { + if (ast.body.length === 1 && isAssignable(ast.body[0].expression)) { + return { + type: AST.AssignmentExpression, + left: ast.body[0].expression, + right: {type: AST.NGValueParameter}, + operator: '=' + }; } - }, objectEquality); + } - function isAllDefined(value) { - var allDefined = true; - forEach(value, function(val) { - if (!isDefined(val)) allDefined = false; - }); - return allDefined; - } + function isLiteral(ast) { + return ast.body.length === 0 || + ast.body.length === 1 && ( + ast.body[0].expression.type === AST.Literal || + ast.body[0].expression.type === AST.ArrayExpression || + ast.body[0].expression.type === AST.ObjectExpression); } - function constantWatchDelegate(scope, listener, objectEquality, parsedExpression) { - var unwatch; - return unwatch = scope.$watch(function constantWatch(scope) { - unwatch(); - return parsedExpression(scope); - }, listener, objectEquality); + function isConstant(ast) { + return ast.constant; } - function addInterceptor(parsedExpression, interceptorFn) { - if (!interceptorFn) return parsedExpression; - var watchDelegate = parsedExpression.$$watchDelegate; - var useInputs = false; - - var regularWatch = - watchDelegate !== oneTimeLiteralWatchDelegate && - watchDelegate !== oneTimeWatchDelegate; - - var fn = regularWatch ? function regularInterceptedExpression(scope, locals, assign, inputs) { - var value = useInputs && inputs ? inputs[0] : parsedExpression(scope, locals, assign, inputs); - return interceptorFn(value, scope, locals); - } : function oneTimeInterceptedExpression(scope, locals, assign, inputs) { - var value = parsedExpression(scope, locals, assign, inputs); - var result = interceptorFn(value, scope, locals); - // we only return the interceptor's result if the - // initial value is defined (for bind-once) - return isDefined(value) ? result : value; - }; + function ASTCompiler(astBuilder, $filter) { + this.astBuilder = astBuilder; + this.$filter = $filter; + } - // Propagate $$watchDelegates other then inputsWatchDelegate - if (parsedExpression.$$watchDelegate && - parsedExpression.$$watchDelegate !== inputsWatchDelegate) { - fn.$$watchDelegate = parsedExpression.$$watchDelegate; - } else if (!interceptorFn.$stateful) { - // If there is an interceptor, but no watchDelegate then treat the interceptor like - // we treat filters - it is assumed to be a pure function unless flagged with $stateful - fn.$$watchDelegate = inputsWatchDelegate; - useInputs = !parsedExpression.inputs; - fn.inputs = parsedExpression.inputs ? parsedExpression.inputs : [parsedExpression]; - } + ASTCompiler.prototype = { + compile: function (expression, expensiveChecks) { + var self = this; + var ast = this.astBuilder.ast(expression); + this.state = { + nextId: 0, + filters: {}, + expensiveChecks: expensiveChecks, + fn: {vars: [], body: [], own: {}}, + assign: {vars: [], body: [], own: {}}, + inputs: [] + }; + findConstantAndWatchExpressions(ast, self.$filter); + var extra = ''; + var assignable; + this.stage = 'assign'; + if ((assignable = assignableAST(ast))) { + this.state.computing = 'assign'; + var result = this.nextId(); + this.recurse(assignable, result); + this.return_(result); + extra = 'fn.assign=' + this.generateFunction('assign', 's,v,l'); + } + var toWatch = getInputs(ast.body); + self.stage = 'inputs'; + forEach(toWatch, function (watch, key) { + var fnKey = 'fn' + key; + self.state[fnKey] = {vars: [], body: [], own: {}}; + self.state.computing = fnKey; + var intoId = self.nextId(); + self.recurse(watch, intoId); + self.return_(intoId); + self.state.inputs.push(fnKey); + watch.watchId = key; + }); + this.state.computing = 'fn'; + this.stage = 'main'; + this.recurse(ast); + var fnString = + // The build and minification steps remove the string "use strict" from the code, but this is done using a regex. + // This is a workaround for this until we do a better job at only removing the prefix only when we should. + '"' + this.USE + ' ' + this.STRICT + '";\n' + + this.filterPrefix() + + 'var fn=' + this.generateFunction('fn', 's,l,a,i') + + extra + + this.watchFns() + + 'return fn;'; + + /* jshint -W054 */ + var fn = (new Function('$filter', + 'ensureSafeMemberName', + 'ensureSafeObject', + 'ensureSafeFunction', + 'getStringValue', + 'ensureSafeAssignContext', + 'ifDefined', + 'plus', + 'text', + fnString))( + this.$filter, + ensureSafeMemberName, + ensureSafeObject, + ensureSafeFunction, + getStringValue, + ensureSafeAssignContext, + ifDefined, + plusFn, + expression); + /* jshint +W054 */ + this.state = this.stage = undefined; + fn.literal = isLiteral(ast); + fn.constant = isConstant(ast); + return fn; + }, - return fn; - } - }]; -} + USE: 'use', -/** - * @ngdoc service - * @name $q - * @requires $rootScope - * - * @description - * A service that helps you run functions asynchronously, and use their return values (or exceptions) - * when they are done processing. - * - * This is an implementation of promises/deferred objects inspired by - * [Kris Kowal's Q](https://github.com/kriskowal/q). - * - * $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred - * implementations, and the other which resembles ES6 (ES2015) promises to some degree. - * - * # $q constructor - * - * The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver` - * function as the first argument. This is similar to the native Promise implementation from ES6, - * see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise). - * - * While the constructor-style use is supported, not all of the supporting methods from ES6 promises are - * available yet. - * - * It can be used like so: - * - * ```js - * // for the purpose of this example let's assume that variables `$q` and `okToGreet` - * // are available in the current lexical scope (they could have been injected or passed in). - * - * function asyncGreet(name) { - * // perform some asynchronous operation, resolve or reject the promise when appropriate. - * return $q(function(resolve, reject) { - * setTimeout(function() { - * if (okToGreet(name)) { - * resolve('Hello, ' + name + '!'); - * } else { - * reject('Greeting ' + name + ' is not allowed.'); - * } - * }, 1000); - * }); - * } - * - * var promise = asyncGreet('Robin Hood'); - * promise.then(function(greeting) { - * alert('Success: ' + greeting); - * }, function(reason) { - * alert('Failed: ' + reason); - * }); - * ``` - * - * Note: progress/notify callbacks are not currently supported via the ES6-style interface. - * - * Note: unlike ES6 behavior, an exception thrown in the constructor function will NOT implicitly reject the promise. - * - * However, the more traditional CommonJS-style usage is still available, and documented below. - * - * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an - * interface for interacting with an object that represents the result of an action that is - * performed asynchronously, and may or may not be finished at any given point in time. - * - * From the perspective of dealing with error handling, deferred and promise APIs are to - * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming. - * - * ```js - * // for the purpose of this example let's assume that variables `$q` and `okToGreet` - * // are available in the current lexical scope (they could have been injected or passed in). - * - * function asyncGreet(name) { - * var deferred = $q.defer(); - * - * setTimeout(function() { - * deferred.notify('About to greet ' + name + '.'); - * - * if (okToGreet(name)) { - * deferred.resolve('Hello, ' + name + '!'); - * } else { - * deferred.reject('Greeting ' + name + ' is not allowed.'); - * } - * }, 1000); - * - * return deferred.promise; - * } - * - * var promise = asyncGreet('Robin Hood'); - * promise.then(function(greeting) { - * alert('Success: ' + greeting); - * }, function(reason) { - * alert('Failed: ' + reason); - * }, function(update) { - * alert('Got notification: ' + update); - * }); - * ``` - * - * At first it might not be obvious why this extra complexity is worth the trouble. The payoff - * comes in the way of guarantees that promise and deferred APIs make, see - * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md. - * - * Additionally the promise api allows for composition that is very hard to do with the - * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach. - * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the - * section on serial or parallel joining of promises. - * - * # The Deferred API - * - * A new instance of deferred is constructed by calling `$q.defer()`. - * - * The purpose of the deferred object is to expose the associated Promise instance as well as APIs - * that can be used for signaling the successful or unsuccessful completion, as well as the status - * of the task. - * - * **Methods** - * - * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection - * constructed via `$q.reject`, the promise will be rejected instead. - * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to - * resolving it with a rejection constructed via `$q.reject`. - * - `notify(value)` - provides updates on the status of the promise's execution. This may be called - * multiple times before the promise is either resolved or rejected. - * - * **Properties** - * - * - promise – `{Promise}` – promise object associated with this deferred. - * - * - * # The Promise API - * - * A new promise instance is created when a deferred instance is created and can be retrieved by - * calling `deferred.promise`. - * - * The purpose of the promise object is to allow for interested parties to get access to the result - * of the deferred task when it completes. - * - * **Methods** - * - * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or - * will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously - * as soon as the result is available. The callbacks are called with a single argument: the result - * or rejection reason. Additionally, the notify callback may be called zero or more times to - * provide a progress indication, before the promise is resolved or rejected. - * - * This method *returns a new promise* which is resolved or rejected via the return value of the - * `successCallback`, `errorCallback` (unless that value is a promise, in which case it is resolved - * with the value which is resolved in that promise using - * [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)). - * It also notifies via the return value of the `notifyCallback` method. The promise cannot be - * resolved or rejected from the notifyCallback method. - * - * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)` - * - * - `finally(callback, notifyCallback)` – allows you to observe either the fulfillment or rejection of a promise, - * but to do so without modifying the final value. This is useful to release resources or do some - * clean-up that needs to be done whether the promise was rejected or resolved. See the [full - * specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for - * more information. - * - * # Chaining promises - * - * Because calling the `then` method of a promise returns a new derived promise, it is easily - * possible to create a chain of promises: - * - * ```js - * promiseB = promiseA.then(function(result) { - * return result + 1; - * }); - * - * // promiseB will be resolved immediately after promiseA is resolved and its value - * // will be the result of promiseA incremented by 1 - * ``` - * - * It is possible to create chains of any length and since a promise can be resolved with another - * promise (which will defer its resolution further), it is possible to pause/defer resolution of - * the promises at any point in the chain. This makes it possible to implement powerful APIs like - * $http's response interceptors. - * - * - * # Differences between Kris Kowal's Q and $q - * - * There are two main differences: - * - * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation - * mechanism in angular, which means faster propagation of resolution or rejection into your - * models and avoiding unnecessary browser repaints, which would result in flickering UI. - * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains - * all the important functionality needed for common async tasks. - * - * # Testing - * - * ```js - * it('should simulate promise', inject(function($q, $rootScope) { - * var deferred = $q.defer(); - * var promise = deferred.promise; - * var resolvedValue; - * - * promise.then(function(value) { resolvedValue = value; }); - * expect(resolvedValue).toBeUndefined(); - * - * // Simulate resolving of promise - * deferred.resolve(123); - * // Note that the 'then' function does not get called synchronously. - * // This is because we want the promise API to always be async, whether or not - * // it got called synchronously or asynchronously. - * expect(resolvedValue).toBeUndefined(); - * - * // Propagate promise resolution to 'then' functions using $apply(). - * $rootScope.$apply(); - * expect(resolvedValue).toEqual(123); - * })); - * ``` - * - * @param {function(function, function)} resolver Function which is responsible for resolving or - * rejecting the newly created promise. The first parameter is a function which resolves the - * promise, the second parameter is a function which rejects the promise. - * - * @returns {Promise} The newly created promise. - */ -function $QProvider() { - - this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) { - return qFactory(function(callback) { - $rootScope.$evalAsync(callback); - }, $exceptionHandler); - }]; -} - -function $$QProvider() { - this.$get = ['$browser', '$exceptionHandler', function($browser, $exceptionHandler) { - return qFactory(function(callback) { - $browser.defer(callback); - }, $exceptionHandler); - }]; -} + STRICT: 'strict', -/** - * Constructs a promise manager. - * - * @param {function(function)} nextTick Function for executing functions in the next turn. - * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for - * debugging purposes. - * @returns {object} Promise manager. - */ -function qFactory(nextTick, exceptionHandler) { - var $qMinErr = minErr('$q', TypeError); + watchFns: function () { + var result = []; + var fns = this.state.inputs; + var self = this; + forEach(fns, function (name) { + result.push('var ' + name + '=' + self.generateFunction(name, 's')); + }); + if (fns.length) { + result.push('fn.inputs=[' + fns.join(',') + '];'); + } + return result.join(''); + }, - /** - * @ngdoc method - * @name ng.$q#defer - * @kind function - * - * @description - * Creates a `Deferred` object which represents a task which will finish in the future. - * - * @returns {Deferred} Returns a new instance of deferred. - */ - var defer = function() { - var d = new Deferred(); - //Necessary to support unbound execution :/ - d.resolve = simpleBind(d, d.resolve); - d.reject = simpleBind(d, d.reject); - d.notify = simpleBind(d, d.notify); - return d; - }; - - function Promise() { - this.$$state = { status: 0 }; - } - - extend(Promise.prototype, { - then: function(onFulfilled, onRejected, progressBack) { - if (isUndefined(onFulfilled) && isUndefined(onRejected) && isUndefined(progressBack)) { - return this; - } - var result = new Deferred(); + generateFunction: function (name, params) { + return 'function(' + params + '){' + + this.varsPrefix(name) + + this.body(name) + + '};'; + }, - this.$$state.pending = this.$$state.pending || []; - this.$$state.pending.push([result, onFulfilled, onRejected, progressBack]); - if (this.$$state.status > 0) scheduleProcessQueue(this.$$state); + filterPrefix: function () { + var parts = []; + var self = this; + forEach(this.state.filters, function (id, filter) { + parts.push(id + '=$filter(' + self.escape(filter) + ')'); + }); + if (parts.length) return 'var ' + parts.join(',') + ';'; + return ''; + }, - return result.promise; - }, + varsPrefix: function (section) { + return this.state[section].vars.length ? 'var ' + this.state[section].vars.join(',') + ';' : ''; + }, - "catch": function(callback) { - return this.then(null, callback); - }, + body: function (section) { + return this.state[section].body.join(''); + }, - "finally": function(callback, progressBack) { - return this.then(function(value) { - return handleCallback(value, true, callback); - }, function(error) { - return handleCallback(error, false, callback); - }, progressBack); - } - }); + recurse: function (ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) { + var left, right, self = this, args, expression; + recursionFn = recursionFn || noop; + if (!skipWatchIdCheck && isDefined(ast.watchId)) { + intoId = intoId || this.nextId(); + this.if_('i', + this.lazyAssign(intoId, this.computedMember('i', ast.watchId)), + this.lazyRecurse(ast, intoId, nameId, recursionFn, create, true) + ); + return; + } + switch (ast.type) { + case AST.Program: + forEach(ast.body, function (expression, pos) { + self.recurse(expression.expression, undefined, undefined, function (expr) { + right = expr; + }); + if (pos !== ast.body.length - 1) { + self.current().body.push(right, ';'); + } else { + self.return_(right); + } + }); + break; + case AST.Literal: + expression = this.escape(ast.value); + this.assign(intoId, expression); + recursionFn(expression); + break; + case AST.UnaryExpression: + this.recurse(ast.argument, undefined, undefined, function (expr) { + right = expr; + }); + expression = ast.operator + '(' + this.ifDefined(right, 0) + ')'; + this.assign(intoId, expression); + recursionFn(expression); + break; + case AST.BinaryExpression: + this.recurse(ast.left, undefined, undefined, function (expr) { + left = expr; + }); + this.recurse(ast.right, undefined, undefined, function (expr) { + right = expr; + }); + if (ast.operator === '+') { + expression = this.plus(left, right); + } else if (ast.operator === '-') { + expression = this.ifDefined(left, 0) + ast.operator + this.ifDefined(right, 0); + } else { + expression = '(' + left + ')' + ast.operator + '(' + right + ')'; + } + this.assign(intoId, expression); + recursionFn(expression); + break; + case AST.LogicalExpression: + intoId = intoId || this.nextId(); + self.recurse(ast.left, intoId); + self.if_(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId)); + recursionFn(intoId); + break; + case AST.ConditionalExpression: + intoId = intoId || this.nextId(); + self.recurse(ast.test, intoId); + self.if_(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId)); + recursionFn(intoId); + break; + case AST.Identifier: + intoId = intoId || this.nextId(); + if (nameId) { + nameId.context = self.stage === 'inputs' ? 's' : this.assign(this.nextId(), this.getHasOwnProperty('l', ast.name) + '?l:s'); + nameId.computed = false; + nameId.name = ast.name; + } + ensureSafeMemberName(ast.name); + self.if_(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)), + function () { + self.if_(self.stage === 'inputs' || 's', function () { + if (create && create !== 1) { + self.if_( + self.not(self.nonComputedMember('s', ast.name)), + self.lazyAssign(self.nonComputedMember('s', ast.name), '{}')); + } + self.assign(intoId, self.nonComputedMember('s', ast.name)); + }); + }, intoId && self.lazyAssign(intoId, self.nonComputedMember('l', ast.name)) + ); + if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.name)) { + self.addEnsureSafeObject(intoId); + } + recursionFn(intoId); + break; + case AST.MemberExpression: + left = nameId && (nameId.context = this.nextId()) || this.nextId(); + intoId = intoId || this.nextId(); + self.recurse(ast.object, left, undefined, function () { + self.if_(self.notNull(left), function () { + if (create && create !== 1) { + self.addEnsureSafeAssignContext(left); + } + if (ast.computed) { + right = self.nextId(); + self.recurse(ast.property, right); + self.getStringValue(right); + self.addEnsureSafeMemberName(right); + if (create && create !== 1) { + self.if_(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}')); + } + expression = self.ensureSafeObject(self.computedMember(left, right)); + self.assign(intoId, expression); + if (nameId) { + nameId.computed = true; + nameId.name = right; + } + } else { + ensureSafeMemberName(ast.property.name); + if (create && create !== 1) { + self.if_(self.not(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}')); + } + expression = self.nonComputedMember(left, ast.property.name); + if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.property.name)) { + expression = self.ensureSafeObject(expression); + } + self.assign(intoId, expression); + if (nameId) { + nameId.computed = false; + nameId.name = ast.property.name; + } + } + }, function () { + self.assign(intoId, 'undefined'); + }); + recursionFn(intoId); + }, !!create); + break; + case AST.CallExpression: + intoId = intoId || this.nextId(); + if (ast.filter) { + right = self.filter(ast.callee.name); + args = []; + forEach(ast.arguments, function (expr) { + var argument = self.nextId(); + self.recurse(expr, argument); + args.push(argument); + }); + expression = right + '(' + args.join(',') + ')'; + self.assign(intoId, expression); + recursionFn(intoId); + } else { + right = self.nextId(); + left = {}; + args = []; + self.recurse(ast.callee, right, left, function () { + self.if_(self.notNull(right), function () { + self.addEnsureSafeFunction(right); + forEach(ast.arguments, function (expr) { + self.recurse(expr, self.nextId(), undefined, function (argument) { + args.push(self.ensureSafeObject(argument)); + }); + }); + if (left.name) { + if (!self.state.expensiveChecks) { + self.addEnsureSafeObject(left.context); + } + expression = self.member(left.context, left.name, left.computed) + '(' + args.join(',') + ')'; + } else { + expression = right + '(' + args.join(',') + ')'; + } + expression = self.ensureSafeObject(expression); + self.assign(intoId, expression); + }, function () { + self.assign(intoId, 'undefined'); + }); + recursionFn(intoId); + }); + } + break; + case AST.AssignmentExpression: + right = this.nextId(); + left = {}; + if (!isAssignable(ast.left)) { + throw $parseMinErr('lval', 'Trying to assign a value to a non l-value'); + } + this.recurse(ast.left, undefined, left, function () { + self.if_(self.notNull(left.context), function () { + self.recurse(ast.right, right); + self.addEnsureSafeObject(self.member(left.context, left.name, left.computed)); + self.addEnsureSafeAssignContext(left.context); + expression = self.member(left.context, left.name, left.computed) + ast.operator + right; + self.assign(intoId, expression); + recursionFn(intoId || expression); + }); + }, 1); + break; + case AST.ArrayExpression: + args = []; + forEach(ast.elements, function (expr) { + self.recurse(expr, self.nextId(), undefined, function (argument) { + args.push(argument); + }); + }); + expression = '[' + args.join(',') + ']'; + this.assign(intoId, expression); + recursionFn(expression); + break; + case AST.ObjectExpression: + args = []; + forEach(ast.properties, function (property) { + self.recurse(property.value, self.nextId(), undefined, function (expr) { + args.push(self.escape( + property.key.type === AST.Identifier ? property.key.name : + ('' + property.key.value)) + + ':' + expr); + }); + }); + expression = '{' + args.join(',') + '}'; + this.assign(intoId, expression); + recursionFn(expression); + break; + case AST.ThisExpression: + this.assign(intoId, 's'); + recursionFn('s'); + break; + case AST.LocalsExpression: + this.assign(intoId, 'l'); + recursionFn('l'); + break; + case AST.NGValueParameter: + this.assign(intoId, 'v'); + recursionFn('v'); + break; + } + }, - //Faster, more basic than angular.bind http://jsperf.com/angular-bind-vs-custom-vs-native - function simpleBind(context, fn) { - return function(value) { - fn.call(context, value); - }; - } - - function processQueue(state) { - var fn, deferred, pending; - - pending = state.pending; - state.processScheduled = false; - state.pending = undefined; - for (var i = 0, ii = pending.length; i < ii; ++i) { - deferred = pending[i][0]; - fn = pending[i][state.status]; - try { - if (isFunction(fn)) { - deferred.resolve(fn(state.value)); - } else if (state.status === 1) { - deferred.resolve(state.value); - } else { - deferred.reject(state.value); - } - } catch (e) { - deferred.reject(e); - exceptionHandler(e); - } - } - } - - function scheduleProcessQueue(state) { - if (state.processScheduled || !state.pending) return; - state.processScheduled = true; - nextTick(function() { processQueue(state); }); - } - - function Deferred() { - this.promise = new Promise(); - } - - extend(Deferred.prototype, { - resolve: function(val) { - if (this.promise.$$state.status) return; - if (val === this.promise) { - this.$$reject($qMinErr( - 'qcycle', - "Expected promise to be resolved with value other than itself '{0}'", - val)); - } else { - this.$$resolve(val); - } + getHasOwnProperty: function (element, property) { + var key = element + '.' + property; + var own = this.current().own; + if (!own.hasOwnProperty(key)) { + own[key] = this.nextId(false, element + '&&(' + this.escape(property) + ' in ' + element + ')'); + } + return own[key]; + }, - }, - - $$resolve: function(val) { - var then; - var that = this; - var done = false; - try { - if ((isObject(val) || isFunction(val))) then = val && val.then; - if (isFunction(then)) { - this.promise.$$state.status = -1; - then.call(val, resolvePromise, rejectPromise, simpleBind(this, this.notify)); - } else { - this.promise.$$state.value = val; - this.promise.$$state.status = 1; - scheduleProcessQueue(this.promise.$$state); - } - } catch (e) { - rejectPromise(e); - exceptionHandler(e); - } + assign: function (id, value) { + if (!id) return; + this.current().body.push(id, '=', value, ';'); + return id; + }, - function resolvePromise(val) { - if (done) return; - done = true; - that.$$resolve(val); - } - function rejectPromise(val) { - if (done) return; - done = true; - that.$$reject(val); - } - }, - - reject: function(reason) { - if (this.promise.$$state.status) return; - this.$$reject(reason); - }, - - $$reject: function(reason) { - this.promise.$$state.value = reason; - this.promise.$$state.status = 2; - scheduleProcessQueue(this.promise.$$state); - }, - - notify: function(progress) { - var callbacks = this.promise.$$state.pending; - - if ((this.promise.$$state.status <= 0) && callbacks && callbacks.length) { - nextTick(function() { - var callback, result; - for (var i = 0, ii = callbacks.length; i < ii; i++) { - result = callbacks[i][0]; - callback = callbacks[i][3]; - try { - result.notify(isFunction(callback) ? callback(progress) : progress); - } catch (e) { - exceptionHandler(e); + filter: function (filterName) { + if (!this.state.filters.hasOwnProperty(filterName)) { + this.state.filters[filterName] = this.nextId(true); } - } - }); - } - } - }); + return this.state.filters[filterName]; + }, - /** - * @ngdoc method - * @name $q#reject - * @kind function - * - * @description - * Creates a promise that is resolved as rejected with the specified `reason`. This api should be - * used to forward rejection in a chain of promises. If you are dealing with the last promise in - * a promise chain, you don't need to worry about it. - * - * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of - * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via - * a promise error callback and you want to forward the error to the promise derived from the - * current promise, you have to "rethrow" the error by returning a rejection constructed via - * `reject`. - * - * ```js - * promiseB = promiseA.then(function(result) { - * // success: do something and resolve promiseB - * // with the old or a new result - * return result; - * }, function(reason) { - * // error: handle the error if possible and - * // resolve promiseB with newPromiseOrValue, - * // otherwise forward the rejection to promiseB - * if (canHandle(reason)) { - * // handle the error and recover - * return newPromiseOrValue; - * } - * return $q.reject(reason); - * }); - * ``` - * - * @param {*} reason Constant, message, exception or an object representing the rejection reason. - * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`. - */ - var reject = function(reason) { - var result = new Deferred(); - result.reject(reason); - return result.promise; - }; - - var makePromise = function makePromise(value, resolved) { - var result = new Deferred(); - if (resolved) { - result.resolve(value); - } else { - result.reject(value); - } - return result.promise; - }; - - var handleCallback = function handleCallback(value, isResolved, callback) { - var callbackOutput = null; - try { - if (isFunction(callback)) callbackOutput = callback(); - } catch (e) { - return makePromise(e, false); - } - if (isPromiseLike(callbackOutput)) { - return callbackOutput.then(function() { - return makePromise(value, isResolved); - }, function(error) { - return makePromise(error, false); - }); - } else { - return makePromise(value, isResolved); - } - }; + ifDefined: function (id, defaultValue) { + return 'ifDefined(' + id + ',' + this.escape(defaultValue) + ')'; + }, - /** - * @ngdoc method - * @name $q#when - * @kind function - * - * @description - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. - * This is useful when you are dealing with an object that might or might not be a promise, or if - * the promise comes from a source that can't be trusted. - * - * @param {*} value Value or a promise - * @param {Function=} successCallback - * @param {Function=} errorCallback - * @param {Function=} progressCallback - * @returns {Promise} Returns a promise of the passed value or promise - */ + plus: function (left, right) { + return 'plus(' + left + ',' + right + ')'; + }, + + return_: function (id) { + this.current().body.push('return ', id, ';'); + }, + + if_: function (test, alternate, consequent) { + if (test === true) { + alternate(); + } else { + var body = this.current().body; + body.push('if(', test, '){'); + alternate(); + body.push('}'); + if (consequent) { + body.push('else{'); + consequent(); + body.push('}'); + } + } + }, + not: function (expression) { + return '!(' + expression + ')'; + }, - var when = function(value, callback, errback, progressBack) { - var result = new Deferred(); - result.resolve(value); - return result.promise.then(callback, errback, progressBack); - }; + notNull: function (expression) { + return expression + '!=null'; + }, - /** - * @ngdoc method - * @name $q#resolve - * @kind function - * - * @description - * Alias of {@link ng.$q#when when} to maintain naming consistency with ES6. - * - * @param {*} value Value or a promise - * @param {Function=} successCallback - * @param {Function=} errorCallback - * @param {Function=} progressCallback - * @returns {Promise} Returns a promise of the passed value or promise - */ - var resolve = when; + nonComputedMember: function (left, right) { + var SAFE_IDENTIFIER = /[$_a-zA-Z][$_a-zA-Z0-9]*/; + var UNSAFE_CHARACTERS = /[^$_a-zA-Z0-9]/g; + if (SAFE_IDENTIFIER.test(right)) { + return left + '.' + right; + } else { + return left + '["' + right.replace(UNSAFE_CHARACTERS, this.stringEscapeFn) + '"]'; + } + }, - /** - * @ngdoc method - * @name $q#all - * @kind function - * - * @description - * Combines multiple promises into a single promise that is resolved when all of the input - * promises are resolved. - * - * @param {Array.|Object.} promises An array or hash of promises. - * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values, - * each value corresponding to the promise at the same index/key in the `promises` array/hash. - * If any of the promises is resolved with a rejection, this resulting promise will be rejected - * with the same rejection value. - */ + computedMember: function (left, right) { + return left + '[' + right + ']'; + }, - function all(promises) { - var deferred = new Deferred(), - counter = 0, - results = isArray(promises) ? [] : {}; - - forEach(promises, function(promise, key) { - counter++; - when(promise).then(function(value) { - if (results.hasOwnProperty(key)) return; - results[key] = value; - if (!(--counter)) deferred.resolve(results); - }, function(reason) { - if (results.hasOwnProperty(key)) return; - deferred.reject(reason); - }); - }); + member: function (left, right, computed) { + if (computed) return this.computedMember(left, right); + return this.nonComputedMember(left, right); + }, - if (counter === 0) { - deferred.resolve(results); - } + addEnsureSafeObject: function (item) { + this.current().body.push(this.ensureSafeObject(item), ';'); + }, - return deferred.promise; - } + addEnsureSafeMemberName: function (item) { + this.current().body.push(this.ensureSafeMemberName(item), ';'); + }, - var $Q = function Q(resolver) { - if (!isFunction(resolver)) { - throw $qMinErr('norslvr', "Expected resolverFn, got '{0}'", resolver); - } + addEnsureSafeFunction: function (item) { + this.current().body.push(this.ensureSafeFunction(item), ';'); + }, - var deferred = new Deferred(); + addEnsureSafeAssignContext: function (item) { + this.current().body.push(this.ensureSafeAssignContext(item), ';'); + }, - function resolveFn(value) { - deferred.resolve(value); - } + ensureSafeObject: function (item) { + return 'ensureSafeObject(' + item + ',text)'; + }, - function rejectFn(reason) { - deferred.reject(reason); - } + ensureSafeMemberName: function (item) { + return 'ensureSafeMemberName(' + item + ',text)'; + }, - resolver(resolveFn, rejectFn); + ensureSafeFunction: function (item) { + return 'ensureSafeFunction(' + item + ',text)'; + }, - return deferred.promise; - }; + getStringValue: function (item) { + this.assign(item, 'getStringValue(' + item + ')'); + }, - // Let's make the instanceof operator work for promises, so that - // `new $q(fn) instanceof $q` would evaluate to true. - $Q.prototype = Promise.prototype; + ensureSafeAssignContext: function (item) { + return 'ensureSafeAssignContext(' + item + ',text)'; + }, - $Q.defer = defer; - $Q.reject = reject; - $Q.when = when; - $Q.resolve = resolve; - $Q.all = all; + lazyRecurse: function (ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) { + var self = this; + return function () { + self.recurse(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck); + }; + }, - return $Q; -} + lazyAssign: function (id, value) { + var self = this; + return function () { + self.assign(id, value); + }; + }, -function $$RAFProvider() { //rAF - this.$get = ['$window', '$timeout', function($window, $timeout) { - var requestAnimationFrame = $window.requestAnimationFrame || - $window.webkitRequestAnimationFrame; + stringEscapeRegex: /[^ a-zA-Z0-9]/g, - var cancelAnimationFrame = $window.cancelAnimationFrame || - $window.webkitCancelAnimationFrame || - $window.webkitCancelRequestAnimationFrame; + stringEscapeFn: function (c) { + return '\\u' + ('0000' + c.charCodeAt(0).toString(16)).slice(-4); + }, - var rafSupported = !!requestAnimationFrame; - var raf = rafSupported - ? function(fn) { - var id = requestAnimationFrame(fn); - return function() { - cancelAnimationFrame(id); - }; - } - : function(fn) { - var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666 - return function() { - $timeout.cancel(timer); - }; - }; + escape: function (value) { + if (isString(value)) return "'" + value.replace(this.stringEscapeRegex, this.stringEscapeFn) + "'"; + if (isNumber(value)) return value.toString(); + if (value === true) return 'true'; + if (value === false) return 'false'; + if (value === null) return 'null'; + if (typeof value === 'undefined') return 'undefined'; - raf.supported = rafSupported; + throw $parseMinErr('esc', 'IMPOSSIBLE'); + }, - return raf; - }]; -} + nextId: function (skip, init) { + var id = 'v' + (this.state.nextId++); + if (!skip) { + this.current().vars.push(id + (init ? '=' + init : '')); + } + return id; + }, -/** - * DESIGN NOTES - * - * The design decisions behind the scope are heavily favored for speed and memory consumption. - * - * The typical use of scope is to watch the expressions, which most of the time return the same - * value as last time so we optimize the operation. - * - * Closures construction is expensive in terms of speed as well as memory: - * - No closures, instead use prototypical inheritance for API - * - Internal state needs to be stored on scope directly, which means that private state is - * exposed as $$____ properties - * - * Loop operations are optimized by using while(count--) { ... } - * - This means that in order to keep the same order of execution as addition we have to add - * items to the array at the beginning (unshift) instead of at the end (push) - * - * Child scopes are created and removed often - * - Using an array would be slow since inserts in the middle are expensive; so we use linked lists - * - * There are fewer watches than observers. This is why you don't want the observer to be implemented - * in the same way as watch. Watch requires return of the initialization function which is expensive - * to construct. - */ + current: function () { + return this.state[this.state.computing]; + } + }; -/** - * @ngdoc provider - * @name $rootScopeProvider - * @description - * - * Provider for the $rootScope service. - */ + function ASTInterpreter(astBuilder, $filter) { + this.astBuilder = astBuilder; + this.$filter = $filter; + } -/** - * @ngdoc method - * @name $rootScopeProvider#digestTtl - * @description - * - * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and - * assuming that the model is unstable. - * - * The current default is 10 iterations. - * - * In complex applications it's possible that the dependencies between `$watch`s will result in - * several digest iterations. However if an application needs more than the default 10 digest - * iterations for its model to stabilize then you should investigate what is causing the model to - * continuously change during the digest. - * - * Increasing the TTL could have performance implications, so you should not change it without - * proper justification. - * - * @param {number} limit The number of digest iterations. - */ + ASTInterpreter.prototype = { + compile: function (expression, expensiveChecks) { + var self = this; + var ast = this.astBuilder.ast(expression); + this.expression = expression; + this.expensiveChecks = expensiveChecks; + findConstantAndWatchExpressions(ast, self.$filter); + var assignable; + var assign; + if ((assignable = assignableAST(ast))) { + assign = this.recurse(assignable); + } + var toWatch = getInputs(ast.body); + var inputs; + if (toWatch) { + inputs = []; + forEach(toWatch, function (watch, key) { + var input = self.recurse(watch); + watch.input = input; + inputs.push(input); + watch.watchId = key; + }); + } + var expressions = []; + forEach(ast.body, function (expression) { + expressions.push(self.recurse(expression.expression)); + }); + var fn = ast.body.length === 0 ? noop : + ast.body.length === 1 ? expressions[0] : + function (scope, locals) { + var lastValue; + forEach(expressions, function (exp) { + lastValue = exp(scope, locals); + }); + return lastValue; + }; + if (assign) { + fn.assign = function (scope, value, locals) { + return assign(scope, locals, value); + }; + } + if (inputs) { + fn.inputs = inputs; + } + fn.literal = isLiteral(ast); + fn.constant = isConstant(ast); + return fn; + }, + recurse: function (ast, context, create) { + var left, right, self = this, args, expression; + if (ast.input) { + return this.inputs(ast.input, ast.watchId); + } + switch (ast.type) { + case AST.Literal: + return this.value(ast.value, context); + case AST.UnaryExpression: + right = this.recurse(ast.argument); + return this['unary' + ast.operator](right, context); + case AST.BinaryExpression: + left = this.recurse(ast.left); + right = this.recurse(ast.right); + return this['binary' + ast.operator](left, right, context); + case AST.LogicalExpression: + left = this.recurse(ast.left); + right = this.recurse(ast.right); + return this['binary' + ast.operator](left, right, context); + case AST.ConditionalExpression: + return this['ternary?:']( + this.recurse(ast.test), + this.recurse(ast.alternate), + this.recurse(ast.consequent), + context + ); + case AST.Identifier: + ensureSafeMemberName(ast.name, self.expression); + return self.identifier(ast.name, + self.expensiveChecks || isPossiblyDangerousMemberName(ast.name), + context, create, self.expression); + case AST.MemberExpression: + left = this.recurse(ast.object, false, !!create); + if (!ast.computed) { + ensureSafeMemberName(ast.property.name, self.expression); + right = ast.property.name; + } + if (ast.computed) right = this.recurse(ast.property); + return ast.computed ? + this.computedMember(left, right, context, create, self.expression) : + this.nonComputedMember(left, right, self.expensiveChecks, context, create, self.expression); + case AST.CallExpression: + args = []; + forEach(ast.arguments, function (expr) { + args.push(self.recurse(expr)); + }); + if (ast.filter) right = this.$filter(ast.callee.name); + if (!ast.filter) right = this.recurse(ast.callee, true); + return ast.filter ? + function (scope, locals, assign, inputs) { + var values = []; + for (var i = 0; i < args.length; ++i) { + values.push(args[i](scope, locals, assign, inputs)); + } + var value = right.apply(undefined, values, inputs); + return context ? {context: undefined, name: undefined, value: value} : value; + } : + function (scope, locals, assign, inputs) { + var rhs = right(scope, locals, assign, inputs); + var value; + if (rhs.value != null) { + ensureSafeObject(rhs.context, self.expression); + ensureSafeFunction(rhs.value, self.expression); + var values = []; + for (var i = 0; i < args.length; ++i) { + values.push(ensureSafeObject(args[i](scope, locals, assign, inputs), self.expression)); + } + value = ensureSafeObject(rhs.value.apply(rhs.context, values), self.expression); + } + return context ? {value: value} : value; + }; + case AST.AssignmentExpression: + left = this.recurse(ast.left, true, 1); + right = this.recurse(ast.right); + return function (scope, locals, assign, inputs) { + var lhs = left(scope, locals, assign, inputs); + var rhs = right(scope, locals, assign, inputs); + ensureSafeObject(lhs.value, self.expression); + ensureSafeAssignContext(lhs.context); + lhs.context[lhs.name] = rhs; + return context ? {value: rhs} : rhs; + }; + case AST.ArrayExpression: + args = []; + forEach(ast.elements, function (expr) { + args.push(self.recurse(expr)); + }); + return function (scope, locals, assign, inputs) { + var value = []; + for (var i = 0; i < args.length; ++i) { + value.push(args[i](scope, locals, assign, inputs)); + } + return context ? {value: value} : value; + }; + case AST.ObjectExpression: + args = []; + forEach(ast.properties, function (property) { + args.push({ + key: property.key.type === AST.Identifier ? + property.key.name : + ('' + property.key.value), + value: self.recurse(property.value) + }); + }); + return function (scope, locals, assign, inputs) { + var value = {}; + for (var i = 0; i < args.length; ++i) { + value[args[i].key] = args[i].value(scope, locals, assign, inputs); + } + return context ? {value: value} : value; + }; + case AST.ThisExpression: + return function (scope) { + return context ? {value: scope} : scope; + }; + case AST.LocalsExpression: + return function (scope, locals) { + return context ? {value: locals} : locals; + }; + case AST.NGValueParameter: + return function (scope, locals, assign) { + return context ? {value: assign} : assign; + }; + } + }, -/** - * @ngdoc service - * @name $rootScope - * @description - * - * Every application has a single root {@link ng.$rootScope.Scope scope}. - * All other scopes are descendant scopes of the root scope. Scopes provide separation - * between the model and the view, via a mechanism for watching the model for changes. - * They also provide event emission/broadcast and subscription facility. See the - * {@link guide/scope developer guide on scopes}. - */ -function $RootScopeProvider() { - var TTL = 10; - var $rootScopeMinErr = minErr('$rootScope'); - var lastDirtyWatch = null; - var applyAsyncId = null; - - this.digestTtl = function(value) { - if (arguments.length) { - TTL = value; - } - return TTL; - }; - - function createChildScopeClass(parent) { - function ChildScope() { - this.$$watchers = this.$$nextSibling = - this.$$childHead = this.$$childTail = null; - this.$$listeners = {}; - this.$$listenerCount = {}; - this.$$watchersCount = 0; - this.$id = nextUid(); - this.$$ChildScope = null; - } - ChildScope.prototype = parent; - return ChildScope; - } + 'unary+': function (argument, context) { + return function (scope, locals, assign, inputs) { + var arg = argument(scope, locals, assign, inputs); + if (isDefined(arg)) { + arg = +arg; + } else { + arg = 0; + } + return context ? {value: arg} : arg; + }; + }, + 'unary-': function (argument, context) { + return function (scope, locals, assign, inputs) { + var arg = argument(scope, locals, assign, inputs); + if (isDefined(arg)) { + arg = -arg; + } else { + arg = 0; + } + return context ? {value: arg} : arg; + }; + }, + 'unary!': function (argument, context) { + return function (scope, locals, assign, inputs) { + var arg = !argument(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary+': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var lhs = left(scope, locals, assign, inputs); + var rhs = right(scope, locals, assign, inputs); + var arg = plusFn(lhs, rhs); + return context ? {value: arg} : arg; + }; + }, + 'binary-': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var lhs = left(scope, locals, assign, inputs); + var rhs = right(scope, locals, assign, inputs); + var arg = (isDefined(lhs) ? lhs : 0) - (isDefined(rhs) ? rhs : 0); + return context ? {value: arg} : arg; + }; + }, + 'binary*': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) * right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary/': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) / right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary%': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) % right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary===': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) === right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary!==': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) !== right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary==': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) == right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary!=': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) != right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary<': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) < right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary>': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) > right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary<=': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) <= right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary>=': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) >= right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary&&': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) && right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'binary||': function (left, right, context) { + return function (scope, locals, assign, inputs) { + var arg = left(scope, locals, assign, inputs) || right(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + 'ternary?:': function (test, alternate, consequent, context) { + return function (scope, locals, assign, inputs) { + var arg = test(scope, locals, assign, inputs) ? alternate(scope, locals, assign, inputs) : consequent(scope, locals, assign, inputs); + return context ? {value: arg} : arg; + }; + }, + value: function (value, context) { + return function () { + return context ? {context: undefined, name: undefined, value: value} : value; + }; + }, + identifier: function (name, expensiveChecks, context, create, expression) { + return function (scope, locals, assign, inputs) { + var base = locals && (name in locals) ? locals : scope; + if (create && create !== 1 && base && !(base[name])) { + base[name] = {}; + } + var value = base ? base[name] : undefined; + if (expensiveChecks) { + ensureSafeObject(value, expression); + } + if (context) { + return {context: base, name: name, value: value}; + } else { + return value; + } + }; + }, + computedMember: function (left, right, context, create, expression) { + return function (scope, locals, assign, inputs) { + var lhs = left(scope, locals, assign, inputs); + var rhs; + var value; + if (lhs != null) { + rhs = right(scope, locals, assign, inputs); + rhs = getStringValue(rhs); + ensureSafeMemberName(rhs, expression); + if (create && create !== 1) { + ensureSafeAssignContext(lhs); + if (lhs && !(lhs[rhs])) { + lhs[rhs] = {}; + } + } + value = lhs[rhs]; + ensureSafeObject(value, expression); + } + if (context) { + return {context: lhs, name: rhs, value: value}; + } else { + return value; + } + }; + }, + nonComputedMember: function (left, right, expensiveChecks, context, create, expression) { + return function (scope, locals, assign, inputs) { + var lhs = left(scope, locals, assign, inputs); + if (create && create !== 1) { + ensureSafeAssignContext(lhs); + if (lhs && !(lhs[right])) { + lhs[right] = {}; + } + } + var value = lhs != null ? lhs[right] : undefined; + if (expensiveChecks || isPossiblyDangerousMemberName(right)) { + ensureSafeObject(value, expression); + } + if (context) { + return {context: lhs, name: right, value: value}; + } else { + return value; + } + }; + }, + inputs: function (input, watchId) { + return function (scope, value, locals, inputs) { + if (inputs) return inputs[watchId]; + return input(scope, value, locals); + }; + } + }; - this.$get = ['$exceptionHandler', '$parse', '$browser', - function($exceptionHandler, $parse, $browser) { + /** + * @constructor + */ + var Parser = function (lexer, $filter, options) { + this.lexer = lexer; + this.$filter = $filter; + this.options = options; + this.ast = new AST(lexer, options); + this.astCompiler = options.csp ? new ASTInterpreter(this.ast, $filter) : + new ASTCompiler(this.ast, $filter); + }; - function destroyChildScope($event) { - $event.currentScope.$$destroyed = true; - } + Parser.prototype = { + constructor: Parser, - function cleanUpScope($scope) { + parse: function (text) { + return this.astCompiler.compile(text, this.options.expensiveChecks); + } + }; - if (msie === 9) { - // There is a memory leak in IE9 if all child scopes are not disconnected - // completely when a scope is destroyed. So this code will recurse up through - // all this scopes children - // - // See issue https://github.com/angular/angular.js/issues/10706 - $scope.$$childHead && cleanUpScope($scope.$$childHead); - $scope.$$nextSibling && cleanUpScope($scope.$$nextSibling); - } + function isPossiblyDangerousMemberName(name) { + return name == 'constructor'; + } - // The code below works around IE9 and V8's memory leaks - // - // See: - // - https://code.google.com/p/v8/issues/detail?id=2073#c26 - // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909 - // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451 + var objectValueOf = Object.prototype.valueOf; - $scope.$parent = $scope.$$nextSibling = $scope.$$prevSibling = $scope.$$childHead = - $scope.$$childTail = $scope.$root = $scope.$$watchers = null; + function getValueOf(value) { + return isFunction(value.valueOf) ? value.valueOf() : objectValueOf.call(value); } +/////////////////////////////////// + /** - * @ngdoc type - * @name $rootScope.Scope + * @ngdoc service + * @name $parse + * @kind function * * @description - * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the - * {@link auto.$injector $injector}. Child scopes are created using the - * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when - * compiled HTML template is executed.) See also the {@link guide/scope Scopes guide} for - * an in-depth introduction and usage examples. * + * Converts Angular {@link guide/expression expression} into a function. * - * # Inheritance - * A scope can inherit from a parent scope, as in this example: * ```js - var parent = $rootScope; - var child = parent.$new(); - - parent.salutation = "Hello"; - expect(child.salutation).toEqual('Hello'); - - child.salutation = "Welcome"; - expect(child.salutation).toEqual('Welcome'); - expect(parent.salutation).toEqual('Hello'); + * var getter = $parse('user.name'); + * var setter = getter.assign; + * var context = {user:{name:'angular'}}; + * var locals = {user:{name:'local'}}; + * + * expect(getter(context)).toEqual('angular'); + * setter(context, 'newValue'); + * expect(context.user.name).toEqual('newValue'); + * expect(getter(context, locals)).toEqual('local'); * ``` * - * When interacting with `Scope` in tests, additional helper methods are available on the - * instances of `Scope` type. See {@link ngMock.$rootScope.Scope ngMock Scope} for additional - * details. * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. * - * @param {Object.=} providers Map of service factory which need to be - * provided for the current scope. Defaults to {@link ng}. - * @param {Object.=} instanceCache Provides pre-instantiated services which should - * append/override services provided by `providers`. This is handy - * when unit-testing and having the need to override a default - * service. - * @returns {Object} Newly created scope. + * The returned function also has the following properties: + * * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript + * literal. + * * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript + * constant literals. + * * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be + * set to a function to change its value on the given context. * */ - function Scope() { - this.$id = nextUid(); - this.$$phase = this.$parent = this.$$watchers = - this.$$nextSibling = this.$$prevSibling = - this.$$childHead = this.$$childTail = null; - this.$root = this; - this.$$destroyed = false; - this.$$listeners = {}; - this.$$listenerCount = {}; - this.$$watchersCount = 0; - this.$$isolateBindings = null; - } + /** - * @ngdoc property - * @name $rootScope.Scope#$id + * @ngdoc provider + * @name $parseProvider * * @description - * Unique scope ID (monotonically increasing) useful for debugging. + * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse} + * service. */ - - /** - * @ngdoc property - * @name $rootScope.Scope#$parent - * - * @description - * Reference to the parent scope. - */ - - /** - * @ngdoc property - * @name $rootScope.Scope#$root - * - * @description - * Reference to the root scope. - */ - - Scope.prototype = { - constructor: Scope, - /** - * @ngdoc method - * @name $rootScope.Scope#$new - * @kind function - * - * @description - * Creates a new child {@link ng.$rootScope.Scope scope}. - * - * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event. - * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}. - * - * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is - * desired for the scope and its child scopes to be permanently detached from the parent and - * thus stop participating in model change detection and listener notification by invoking. - * - * @param {boolean} isolate If true, then the scope does not prototypically inherit from the - * parent scope. The scope is isolated, as it can not see parent scope properties. - * When creating widgets, it is useful for the widget to not accidentally read parent - * state. - * - * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will be the `$parent` - * of the newly created scope. Defaults to `this` scope if not provided. - * This is used when creating a transclude scope to correctly place it - * in the scope hierarchy while maintaining the correct prototypical - * inheritance. - * - * @returns {Object} The newly created child scope. - * - */ - $new: function(isolate, parent) { - var child; - - parent = parent || this; - - if (isolate) { - child = new Scope(); - child.$root = this.$root; - } else { - // Only create a child scope class if somebody asks for one, - // but cache it to allow the VM to optimize lookups. - if (!this.$$ChildScope) { - this.$$ChildScope = createChildScopeClass(this); - } - child = new this.$$ChildScope(); - } - child.$parent = parent; - child.$$prevSibling = parent.$$childTail; - if (parent.$$childHead) { - parent.$$childTail.$$nextSibling = child; - parent.$$childTail = child; - } else { - parent.$$childHead = parent.$$childTail = child; - } - - // When the new scope is not isolated or we inherit from `this`, and - // the parent scope is destroyed, the property `$$destroyed` is inherited - // prototypically. In all other cases, this property needs to be set - // when the parent scope is destroyed. - // The listener needs to be added after the parent is set - if (isolate || parent != this) child.$on('$destroy', destroyChildScope); - - return child; - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$watch - * @kind function - * - * @description - * Registers a `listener` callback to be executed whenever the `watchExpression` changes. - * - * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest - * $digest()} and should return the value that will be watched. (`watchExpression` should not change - * its value when executed multiple times with the same input because it may be executed multiple - * times by {@link ng.$rootScope.Scope#$digest $digest()}. That is, `watchExpression` should be - * [idempotent](http://en.wikipedia.org/wiki/Idempotence). - * - The `listener` is called only when the value from the current `watchExpression` and the - * previous call to `watchExpression` are not equal (with the exception of the initial run, - * see below). Inequality is determined according to reference inequality, - * [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators) - * via the `!==` Javascript operator, unless `objectEquality == true` - * (see next point) - * - When `objectEquality == true`, inequality of the `watchExpression` is determined - * according to the {@link angular.equals} function. To save the value of the object for - * later comparison, the {@link angular.copy} function is used. This therefore means that - * watching complex objects will have adverse memory and performance implications. - * - The watch `listener` may change the model, which may trigger other `listener`s to fire. - * This is achieved by rerunning the watchers until no changes are detected. The rerun - * iteration limit is 10 to prevent an infinite loop deadlock. - * - * - * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called, - * you can register a `watchExpression` function with no `listener`. (Be prepared for - * multiple calls to your `watchExpression` because it will execute multiple times in a - * single {@link ng.$rootScope.Scope#$digest $digest} cycle if a change is detected.) - * - * After a watcher is registered with the scope, the `listener` fn is called asynchronously - * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the - * watcher. In rare cases, this is undesirable because the listener is called when the result - * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you - * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the - * listener was called due to initialization. - * - * - * - * # Example - * ```js - // let's assume that scope was dependency injected as the $rootScope - var scope = $rootScope; - scope.name = 'misko'; - scope.counter = 0; - - expect(scope.counter).toEqual(0); - scope.$watch('name', function(newValue, oldValue) { - scope.counter = scope.counter + 1; - }); - expect(scope.counter).toEqual(0); - - scope.$digest(); - // the listener is always called during the first $digest loop after it was registered - expect(scope.counter).toEqual(1); - - scope.$digest(); - // but now it will not be called unless the value changes - expect(scope.counter).toEqual(1); - - scope.name = 'adam'; - scope.$digest(); - expect(scope.counter).toEqual(2); - - - - // Using a function as a watchExpression - var food; - scope.foodCounter = 0; - expect(scope.foodCounter).toEqual(0); - scope.$watch( - // This function returns the value being watched. It is called for each turn of the $digest loop - function() { return food; }, - // This is the change listener, called when the value returned from the above function changes - function(newValue, oldValue) { - if ( newValue !== oldValue ) { - // Only increment the counter if the value changed - scope.foodCounter = scope.foodCounter + 1; - } - } - ); - // No digest has been run so the counter will be zero - expect(scope.foodCounter).toEqual(0); - - // Run the digest but since food has not changed count will still be zero - scope.$digest(); - expect(scope.foodCounter).toEqual(0); - - // Update food and run digest. Now the counter will increment - food = 'cheeseburger'; - scope.$digest(); - expect(scope.foodCounter).toEqual(1); - - * ``` - * - * - * - * @param {(function()|string)} watchExpression Expression that is evaluated on each - * {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers - * a call to the `listener`. - * - * - `string`: Evaluated as {@link guide/expression expression} - * - `function(scope)`: called with current `scope` as a parameter. - * @param {function(newVal, oldVal, scope)} listener Callback called whenever the value - * of `watchExpression` changes. - * - * - `newVal` contains the current value of the `watchExpression` - * - `oldVal` contains the previous value of the `watchExpression` - * - `scope` refers to the current scope - * @param {boolean=} [objectEquality=false] Compare for object equality using {@link angular.equals} instead of - * comparing for reference equality. - * @returns {function()} Returns a deregistration function for this listener. - */ - $watch: function(watchExp, listener, objectEquality, prettyPrintExpression) { - var get = $parse(watchExp); - - if (get.$$watchDelegate) { - return get.$$watchDelegate(this, listener, objectEquality, get, watchExp); - } - var scope = this, - array = scope.$$watchers, - watcher = { - fn: listener, - last: initWatchVal, - get: get, - exp: prettyPrintExpression || watchExp, - eq: !!objectEquality - }; - - lastDirtyWatch = null; - - if (!isFunction(listener)) { - watcher.fn = noop; - } - - if (!array) { - array = scope.$$watchers = []; - } - // we use unshift since we use a while loop in $digest for speed. - // the while loop reads in reverse order. - array.unshift(watcher); - incrementWatchersCount(this, 1); - - return function deregisterWatch() { - if (arrayRemove(array, watcher) >= 0) { - incrementWatchersCount(scope, -1); - } - lastDirtyWatch = null; + function $ParseProvider() { + var cacheDefault = createMap(); + var cacheExpensive = createMap(); + var literals = { + 'true': true, + 'false': false, + 'null': null, + 'undefined': undefined }; - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$watchGroup - * @kind function - * - * @description - * A variant of {@link ng.$rootScope.Scope#$watch $watch()} where it watches an array of `watchExpressions`. - * If any one expression in the collection changes the `listener` is executed. - * - * - The items in the `watchExpressions` array are observed via standard $watch operation and are examined on every - * call to $digest() to see if any items changes. - * - The `listener` is called whenever any expression in the `watchExpressions` array changes. - * - * @param {Array.} watchExpressions Array of expressions that will be individually - * watched using {@link ng.$rootScope.Scope#$watch $watch()} - * - * @param {function(newValues, oldValues, scope)} listener Callback called whenever the return value of any - * expression in `watchExpressions` changes - * The `newValues` array contains the current values of the `watchExpressions`, with the indexes matching - * those of `watchExpression` - * and the `oldValues` array contains the previous values of the `watchExpressions`, with the indexes matching - * those of `watchExpression` - * The `scope` refers to the current scope. - * @returns {function()} Returns a de-registration function for all listeners. - */ - $watchGroup: function(watchExpressions, listener) { - var oldValues = new Array(watchExpressions.length); - var newValues = new Array(watchExpressions.length); - var deregisterFns = []; - var self = this; - var changeReactionScheduled = false; - var firstRun = true; - - if (!watchExpressions.length) { - // No expressions means we call the listener ASAP - var shouldCall = true; - self.$evalAsync(function() { - if (shouldCall) listener(newValues, newValues, self); - }); - return function deregisterWatchGroup() { - shouldCall = false; - }; - } - - if (watchExpressions.length === 1) { - // Special case size of one - return this.$watch(watchExpressions[0], function watchGroupAction(value, oldValue, scope) { - newValues[0] = value; - oldValues[0] = oldValue; - listener(newValues, (value === oldValue) ? newValues : oldValues, scope); - }); - } - - forEach(watchExpressions, function(expr, i) { - var unwatchFn = self.$watch(expr, function watchGroupSubAction(value, oldValue) { - newValues[i] = value; - oldValues[i] = oldValue; - if (!changeReactionScheduled) { - changeReactionScheduled = true; - self.$evalAsync(watchGroupAction); - } - }); - deregisterFns.push(unwatchFn); - }); + var identStart, identContinue; - function watchGroupAction() { - changeReactionScheduled = false; - - if (firstRun) { - firstRun = false; - listener(newValues, newValues, self); - } else { - listener(newValues, oldValues, self); - } - } - - return function deregisterWatchGroup() { - while (deregisterFns.length) { - deregisterFns.shift()(); - } + /** + * @ngdoc method + * @name $parseProvider#addLiteral + * @description + * + * Configure $parse service to add literal values that will be present as literal at expressions. + * + * @param {string} literalName Token for the literal value. The literal name value must be a valid literal name. + * @param {*} literalValue Value for this literal. All literal values must be primitives or `undefined`. + * + **/ + this.addLiteral = function (literalName, literalValue) { + literals[literalName] = literalValue; }; - }, + /** + * @ngdoc method + * @name $parseProvider#setIdentifierFns + * @description + * + * Allows defining the set of characters that are allowed in Angular expressions. The function + * `identifierStart` will get called to know if a given character is a valid character to be the + * first character for an identifier. The function `identifierContinue` will get called to know if + * a given character is a valid character to be a follow-up identifier character. The functions + * `identifierStart` and `identifierContinue` will receive as arguments the single character to be + * identifier and the character code point. These arguments will be `string` and `numeric`. Keep in + * mind that the `string` parameter can be two characters long depending on the character + * representation. It is expected for the function to return `true` or `false`, whether that + * character is allowed or not. + * + * Since this function will be called extensivelly, keep the implementation of these functions fast, + * as the performance of these functions have a direct impact on the expressions parsing speed. + * + * @param {function=} identifierStart The function that will decide whether the given character is + * a valid identifier start character. + * @param {function=} identifierContinue The function that will decide whether the given character is + * a valid identifier continue character. + */ + this.setIdentifierFns = function (identifierStart, identifierContinue) { + identStart = identifierStart; + identContinue = identifierContinue; + return this; + }; - /** - * @ngdoc method - * @name $rootScope.Scope#$watchCollection - * @kind function - * - * @description - * Shallow watches the properties of an object and fires whenever any of the properties change - * (for arrays, this implies watching the array items; for object maps, this implies watching - * the properties). If a change is detected, the `listener` callback is fired. - * - * - The `obj` collection is observed via standard $watch operation and is examined on every - * call to $digest() to see if any items have been added, removed, or moved. - * - The `listener` is called whenever anything within the `obj` has changed. Examples include - * adding, removing, and moving items belonging to an object or array. - * - * - * # Example - * ```js - $scope.names = ['igor', 'matias', 'misko', 'james']; - $scope.dataCount = 4; + this.$get = ['$filter', function ($filter) { + var noUnsafeEval = csp().noUnsafeEval; + var $parseOptions = { + csp: noUnsafeEval, + expensiveChecks: false, + literals: copy(literals), + isIdentifierStart: isFunction(identStart) && identStart, + isIdentifierContinue: isFunction(identContinue) && identContinue + }, + $parseOptionsExpensive = { + csp: noUnsafeEval, + expensiveChecks: true, + literals: copy(literals), + isIdentifierStart: isFunction(identStart) && identStart, + isIdentifierContinue: isFunction(identContinue) && identContinue + }; + var runningChecksEnabled = false; - $scope.$watchCollection('names', function(newNames, oldNames) { - $scope.dataCount = newNames.length; - }); + $parse.$$runningExpensiveChecks = function () { + return runningChecksEnabled; + }; - expect($scope.dataCount).toEqual(4); - $scope.$digest(); + return $parse; + + function $parse(exp, interceptorFn, expensiveChecks) { + var parsedExpression, oneTime, cacheKey; + + expensiveChecks = expensiveChecks || runningChecksEnabled; + + switch (typeof exp) { + case 'string': + exp = exp.trim(); + cacheKey = exp; + + var cache = (expensiveChecks ? cacheExpensive : cacheDefault); + parsedExpression = cache[cacheKey]; + + if (!parsedExpression) { + if (exp.charAt(0) === ':' && exp.charAt(1) === ':') { + oneTime = true; + exp = exp.substring(2); + } + var parseOptions = expensiveChecks ? $parseOptionsExpensive : $parseOptions; + var lexer = new Lexer(parseOptions); + var parser = new Parser(lexer, $filter, parseOptions); + parsedExpression = parser.parse(exp); + if (parsedExpression.constant) { + parsedExpression.$$watchDelegate = constantWatchDelegate; + } else if (oneTime) { + parsedExpression.$$watchDelegate = parsedExpression.literal ? + oneTimeLiteralWatchDelegate : oneTimeWatchDelegate; + } else if (parsedExpression.inputs) { + parsedExpression.$$watchDelegate = inputsWatchDelegate; + } + if (expensiveChecks) { + parsedExpression = expensiveChecksInterceptor(parsedExpression); + } + cache[cacheKey] = parsedExpression; + } + return addInterceptor(parsedExpression, interceptorFn); + + case 'function': + return addInterceptor(exp, interceptorFn); + + default: + return addInterceptor(noop, interceptorFn); + } + } - //still at 4 ... no changes - expect($scope.dataCount).toEqual(4); + function expensiveChecksInterceptor(fn) { + if (!fn) return fn; + expensiveCheckFn.$$watchDelegate = fn.$$watchDelegate; + expensiveCheckFn.assign = expensiveChecksInterceptor(fn.assign); + expensiveCheckFn.constant = fn.constant; + expensiveCheckFn.literal = fn.literal; + for (var i = 0; fn.inputs && i < fn.inputs.length; ++i) { + fn.inputs[i] = expensiveChecksInterceptor(fn.inputs[i]); + } + expensiveCheckFn.inputs = fn.inputs; - $scope.names.pop(); - $scope.$digest(); + return expensiveCheckFn; - //now there's been a change - expect($scope.dataCount).toEqual(3); - * ``` - * - * - * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The - * expression value should evaluate to an object or an array which is observed on each - * {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the - * collection will trigger a call to the `listener`. - * - * @param {function(newCollection, oldCollection, scope)} listener a callback function called - * when a change is detected. - * - The `newCollection` object is the newly modified data obtained from the `obj` expression - * - The `oldCollection` object is a copy of the former collection data. - * Due to performance considerations, the`oldCollection` value is computed only if the - * `listener` function declares two or more arguments. - * - The `scope` argument refers to the current scope. - * - * @returns {function()} Returns a de-registration function for this listener. When the - * de-registration function is executed, the internal watch operation is terminated. - */ - $watchCollection: function(obj, listener) { - $watchCollectionInterceptor.$stateful = true; - - var self = this; - // the current value, updated on each dirty-check run - var newValue; - // a shallow copy of the newValue from the last dirty-check run, - // updated to match newValue during dirty-check run - var oldValue; - // a shallow copy of the newValue from when the last change happened - var veryOldValue; - // only track veryOldValue if the listener is asking for it - var trackVeryOldValue = (listener.length > 1); - var changeDetected = 0; - var changeDetector = $parse(obj, $watchCollectionInterceptor); - var internalArray = []; - var internalObject = {}; - var initRun = true; - var oldLength = 0; - - function $watchCollectionInterceptor(_value) { - newValue = _value; - var newLength, key, bothNaN, newItem, oldItem; - - // If the new value is undefined, then return undefined as the watch may be a one-time watch - if (isUndefined(newValue)) return; - - if (!isObject(newValue)) { // if primitive - if (oldValue !== newValue) { - oldValue = newValue; - changeDetected++; - } - } else if (isArrayLike(newValue)) { - if (oldValue !== internalArray) { - // we are transitioning from something which was not an array into array. - oldValue = internalArray; - oldLength = oldValue.length = 0; - changeDetected++; - } - - newLength = newValue.length; - - if (oldLength !== newLength) { - // if lengths do not match we need to trigger change notification - changeDetected++; - oldValue.length = oldLength = newLength; - } - // copy the items to oldValue and look for changes. - for (var i = 0; i < newLength; i++) { - oldItem = oldValue[i]; - newItem = newValue[i]; - - bothNaN = (oldItem !== oldItem) && (newItem !== newItem); - if (!bothNaN && (oldItem !== newItem)) { - changeDetected++; - oldValue[i] = newItem; - } - } - } else { - if (oldValue !== internalObject) { - // we are transitioning from something which was not an object into object. - oldValue = internalObject = {}; - oldLength = 0; - changeDetected++; - } - // copy the items to oldValue and look for changes. - newLength = 0; - for (key in newValue) { - if (hasOwnProperty.call(newValue, key)) { - newLength++; - newItem = newValue[key]; - oldItem = oldValue[key]; - - if (key in oldValue) { - bothNaN = (oldItem !== oldItem) && (newItem !== newItem); - if (!bothNaN && (oldItem !== newItem)) { - changeDetected++; - oldValue[key] = newItem; - } - } else { - oldLength++; - oldValue[key] = newItem; - changeDetected++; + function expensiveCheckFn(scope, locals, assign, inputs) { + var expensiveCheckOldValue = runningChecksEnabled; + runningChecksEnabled = true; + try { + return fn(scope, locals, assign, inputs); + } finally { + runningChecksEnabled = expensiveCheckOldValue; + } } - } } - if (oldLength > newLength) { - // we used to have more keys, need to find them and destroy them. - changeDetected++; - for (key in oldValue) { - if (!hasOwnProperty.call(newValue, key)) { - oldLength--; - delete oldValue[key]; + + function expressionInputDirtyCheck(newValue, oldValueOfValue) { + + if (newValue == null || oldValueOfValue == null) { // null/undefined + return newValue === oldValueOfValue; } - } - } - } - return changeDetected; - } - function $watchCollectionAction() { - if (initRun) { - initRun = false; - listener(newValue, newValue, self); - } else { - listener(newValue, veryOldValue, self); - } + if (typeof newValue === 'object') { - // make a copy for the next time a collection is changed - if (trackVeryOldValue) { - if (!isObject(newValue)) { - //primitive - veryOldValue = newValue; - } else if (isArrayLike(newValue)) { - veryOldValue = new Array(newValue.length); - for (var i = 0; i < newValue.length; i++) { - veryOldValue[i] = newValue[i]; - } - } else { // if object - veryOldValue = {}; - for (var key in newValue) { - if (hasOwnProperty.call(newValue, key)) { - veryOldValue[key] = newValue[key]; + // attempt to convert the value to a primitive type + // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can + // be cheaply dirty-checked + newValue = getValueOf(newValue); + + if (typeof newValue === 'object') { + // objects/arrays are not supported - deep-watching them would be too expensive + return false; + } + + // fall-through to the primitive equality check } - } - } - } - } - return this.$watch(changeDetector, $watchCollectionAction); - }, + //Primitive or NaN + return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue); + } - /** - * @ngdoc method - * @name $rootScope.Scope#$digest - * @kind function - * - * @description - * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and - * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change - * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers} - * until no more listeners are firing. This means that it is possible to get into an infinite - * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of - * iterations exceeds 10. - * - * Usually, you don't call `$digest()` directly in - * {@link ng.directive:ngController controllers} or in - * {@link ng.$compileProvider#directive directives}. - * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within - * a {@link ng.$compileProvider#directive directive}), which will force a `$digest()`. - * - * If you want to be notified whenever `$digest()` is called, - * you can register a `watchExpression` function with - * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`. - * - * In unit tests, you may need to call `$digest()` to simulate the scope life cycle. - * - * # Example - * ```js - var scope = ...; - scope.name = 'misko'; - scope.counter = 0; - - expect(scope.counter).toEqual(0); - scope.$watch('name', function(newValue, oldValue) { - scope.counter = scope.counter + 1; - }); - expect(scope.counter).toEqual(0); + function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) { + var inputExpressions = parsedExpression.inputs; + var lastResult; + + if (inputExpressions.length === 1) { + var oldInputValueOf = expressionInputDirtyCheck; // init to something unique so that equals check fails + inputExpressions = inputExpressions[0]; + return scope.$watch(function expressionInputWatch(scope) { + var newInputValue = inputExpressions(scope); + if (!expressionInputDirtyCheck(newInputValue, oldInputValueOf)) { + lastResult = parsedExpression(scope, undefined, undefined, [newInputValue]); + oldInputValueOf = newInputValue && getValueOf(newInputValue); + } + return lastResult; + }, listener, objectEquality, prettyPrintExpression); + } - scope.$digest(); - // the listener is always called during the first $digest loop after it was registered - expect(scope.counter).toEqual(1); + var oldInputValueOfValues = []; + var oldInputValues = []; + for (var i = 0, ii = inputExpressions.length; i < ii; i++) { + oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails + oldInputValues[i] = null; + } - scope.$digest(); - // but now it will not be called unless the value changes - expect(scope.counter).toEqual(1); + return scope.$watch(function expressionInputsWatch(scope) { + var changed = false; - scope.name = 'adam'; - scope.$digest(); - expect(scope.counter).toEqual(2); - * ``` - * - */ - $digest: function() { - var watch, value, last, fn, get, - watchers, - length, - dirty, ttl = TTL, - next, current, target = this, - watchLog = [], - logIdx, asyncTask; - - beginPhase('$digest'); - // Check for changes to browser url that happened in sync before the call to $digest - $browser.$$checkUrlChange(); - - if (this === $rootScope && applyAsyncId !== null) { - // If this is the root scope, and $applyAsync has scheduled a deferred $apply(), then - // cancel the scheduled $apply and flush the queue of expressions to be evaluated. - $browser.defer.cancel(applyAsyncId); - flushApplyAsync(); - } + for (var i = 0, ii = inputExpressions.length; i < ii; i++) { + var newInputValue = inputExpressions[i](scope); + if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) { + oldInputValues[i] = newInputValue; + oldInputValueOfValues[i] = newInputValue && getValueOf(newInputValue); + } + } - lastDirtyWatch = null; + if (changed) { + lastResult = parsedExpression(scope, undefined, undefined, oldInputValues); + } - do { // "while dirty" loop - dirty = false; - current = target; + return lastResult; + }, listener, objectEquality, prettyPrintExpression); + } - while (asyncQueue.length) { - try { - asyncTask = asyncQueue.shift(); - asyncTask.scope.$eval(asyncTask.expression, asyncTask.locals); - } catch (e) { - $exceptionHandler(e); + function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) { + var unwatch, lastValue; + return unwatch = scope.$watch(function oneTimeWatch(scope) { + return parsedExpression(scope); + }, function oneTimeListener(value, old, scope) { + lastValue = value; + if (isFunction(listener)) { + listener.apply(this, arguments); + } + if (isDefined(value)) { + scope.$$postDigest(function () { + if (isDefined(lastValue)) { + unwatch(); + } + }); + } + }, objectEquality); } - lastDirtyWatch = null; - } - traverseScopesLoop: - do { // "traverse the scopes" loop - if ((watchers = current.$$watchers)) { - // process our watches - length = watchers.length; - while (length--) { - try { - watch = watchers[length]; - // Most common watches are on primitives, in which case we can short - // circuit it with === operator, only when === fails do we use .equals - if (watch) { - get = watch.get; - if ((value = get(current)) !== (last = watch.last) && - !(watch.eq - ? equals(value, last) - : (typeof value === 'number' && typeof last === 'number' - && isNaN(value) && isNaN(last)))) { - dirty = true; - lastDirtyWatch = watch; - watch.last = watch.eq ? copy(value, null) : value; - fn = watch.fn; - fn(value, ((last === initWatchVal) ? value : last), current); - if (ttl < 5) { - logIdx = 4 - ttl; - if (!watchLog[logIdx]) watchLog[logIdx] = []; - watchLog[logIdx].push({ - msg: isFunction(watch.exp) ? 'fn: ' + (watch.exp.name || watch.exp.toString()) : watch.exp, - newVal: value, - oldVal: last + function oneTimeLiteralWatchDelegate(scope, listener, objectEquality, parsedExpression) { + var unwatch, lastValue; + return unwatch = scope.$watch(function oneTimeWatch(scope) { + return parsedExpression(scope); + }, function oneTimeListener(value, old, scope) { + lastValue = value; + if (isFunction(listener)) { + listener.call(this, value, old, scope); + } + if (isAllDefined(value)) { + scope.$$postDigest(function () { + if (isAllDefined(lastValue)) unwatch(); }); - } - } else if (watch === lastDirtyWatch) { - // If the most recently dirty watcher is now clean, short circuit since the remaining watchers - // have already been tested. - dirty = false; - break traverseScopesLoop; } - } - } catch (e) { - $exceptionHandler(e); + }, objectEquality); + + function isAllDefined(value) { + var allDefined = true; + forEach(value, function (val) { + if (!isDefined(val)) allDefined = false; + }); + return allDefined; } - } } - // Insanity Warning: scope depth-first traversal - // yes, this code is a bit crazy, but it works and we have tests to prove it! - // this piece should be kept in sync with the traversal in $broadcast - if (!(next = ((current.$$watchersCount && current.$$childHead) || - (current !== target && current.$$nextSibling)))) { - while (current !== target && !(next = current.$$nextSibling)) { - current = current.$parent; - } + function constantWatchDelegate(scope, listener, objectEquality, parsedExpression) { + var unwatch; + return unwatch = scope.$watch(function constantWatch(scope) { + unwatch(); + return parsedExpression(scope); + }, listener, objectEquality); } - } while ((current = next)); - // `break traverseScopesLoop;` takes us to here + function addInterceptor(parsedExpression, interceptorFn) { + if (!interceptorFn) return parsedExpression; + var watchDelegate = parsedExpression.$$watchDelegate; + var useInputs = false; + + var regularWatch = + watchDelegate !== oneTimeLiteralWatchDelegate && + watchDelegate !== oneTimeWatchDelegate; + + var fn = regularWatch ? function regularInterceptedExpression(scope, locals, assign, inputs) { + var value = useInputs && inputs ? inputs[0] : parsedExpression(scope, locals, assign, inputs); + return interceptorFn(value, scope, locals); + } : function oneTimeInterceptedExpression(scope, locals, assign, inputs) { + var value = parsedExpression(scope, locals, assign, inputs); + var result = interceptorFn(value, scope, locals); + // we only return the interceptor's result if the + // initial value is defined (for bind-once) + return isDefined(value) ? result : value; + }; - if ((dirty || asyncQueue.length) && !(ttl--)) { - clearPhase(); - throw $rootScopeMinErr('infdig', - '{0} $digest() iterations reached. Aborting!\n' + - 'Watchers fired in the last 5 iterations: {1}', - TTL, watchLog); - } + // Propagate $$watchDelegates other then inputsWatchDelegate + if (parsedExpression.$$watchDelegate && + parsedExpression.$$watchDelegate !== inputsWatchDelegate) { + fn.$$watchDelegate = parsedExpression.$$watchDelegate; + } else if (!interceptorFn.$stateful) { + // If there is an interceptor, but no watchDelegate then treat the interceptor like + // we treat filters - it is assumed to be a pure function unless flagged with $stateful + fn.$$watchDelegate = inputsWatchDelegate; + useInputs = !parsedExpression.inputs; + fn.inputs = parsedExpression.inputs ? parsedExpression.inputs : [parsedExpression]; + } - } while (dirty || asyncQueue.length); + return fn; + } + }]; + } - clearPhase(); + /** + * @ngdoc service + * @name $q + * @requires $rootScope + * + * @description + * A service that helps you run functions asynchronously, and use their return values (or exceptions) + * when they are done processing. + * + * This is an implementation of promises/deferred objects inspired by + * [Kris Kowal's Q](https://github.com/kriskowal/q). + * + * $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred + * implementations, and the other which resembles ES6 (ES2015) promises to some degree. + * + * # $q constructor + * + * The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver` + * function as the first argument. This is similar to the native Promise implementation from ES6, + * see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise). + * + * While the constructor-style use is supported, not all of the supporting methods from ES6 promises are + * available yet. + * + * It can be used like so: + * + * ```js + * // for the purpose of this example let's assume that variables `$q` and `okToGreet` + * // are available in the current lexical scope (they could have been injected or passed in). + * + * function asyncGreet(name) { + * // perform some asynchronous operation, resolve or reject the promise when appropriate. + * return $q(function(resolve, reject) { + * setTimeout(function() { + * if (okToGreet(name)) { + * resolve('Hello, ' + name + '!'); + * } else { + * reject('Greeting ' + name + ' is not allowed.'); + * } + * }, 1000); + * }); + * } + * + * var promise = asyncGreet('Robin Hood'); + * promise.then(function(greeting) { + * alert('Success: ' + greeting); + * }, function(reason) { + * alert('Failed: ' + reason); + * }); + * ``` + * + * Note: progress/notify callbacks are not currently supported via the ES6-style interface. + * + * Note: unlike ES6 behavior, an exception thrown in the constructor function will NOT implicitly reject the promise. + * + * However, the more traditional CommonJS-style usage is still available, and documented below. + * + * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an + * interface for interacting with an object that represents the result of an action that is + * performed asynchronously, and may or may not be finished at any given point in time. + * + * From the perspective of dealing with error handling, deferred and promise APIs are to + * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming. + * + * ```js + * // for the purpose of this example let's assume that variables `$q` and `okToGreet` + * // are available in the current lexical scope (they could have been injected or passed in). + * + * function asyncGreet(name) { + * var deferred = $q.defer(); + * + * setTimeout(function() { + * deferred.notify('About to greet ' + name + '.'); + * + * if (okToGreet(name)) { + * deferred.resolve('Hello, ' + name + '!'); + * } else { + * deferred.reject('Greeting ' + name + ' is not allowed.'); + * } + * }, 1000); + * + * return deferred.promise; + * } + * + * var promise = asyncGreet('Robin Hood'); + * promise.then(function(greeting) { + * alert('Success: ' + greeting); + * }, function(reason) { + * alert('Failed: ' + reason); + * }, function(update) { + * alert('Got notification: ' + update); + * }); + * ``` + * + * At first it might not be obvious why this extra complexity is worth the trouble. The payoff + * comes in the way of guarantees that promise and deferred APIs make, see + * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md. + * + * Additionally the promise api allows for composition that is very hard to do with the + * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach. + * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the + * section on serial or parallel joining of promises. + * + * # The Deferred API + * + * A new instance of deferred is constructed by calling `$q.defer()`. + * + * The purpose of the deferred object is to expose the associated Promise instance as well as APIs + * that can be used for signaling the successful or unsuccessful completion, as well as the status + * of the task. + * + * **Methods** + * + * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection + * constructed via `$q.reject`, the promise will be rejected instead. + * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to + * resolving it with a rejection constructed via `$q.reject`. + * - `notify(value)` - provides updates on the status of the promise's execution. This may be called + * multiple times before the promise is either resolved or rejected. + * + * **Properties** + * + * - promise – `{Promise}` – promise object associated with this deferred. + * + * + * # The Promise API + * + * A new promise instance is created when a deferred instance is created and can be retrieved by + * calling `deferred.promise`. + * + * The purpose of the promise object is to allow for interested parties to get access to the result + * of the deferred task when it completes. + * + * **Methods** + * + * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or + * will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously + * as soon as the result is available. The callbacks are called with a single argument: the result + * or rejection reason. Additionally, the notify callback may be called zero or more times to + * provide a progress indication, before the promise is resolved or rejected. + * + * This method *returns a new promise* which is resolved or rejected via the return value of the + * `successCallback`, `errorCallback` (unless that value is a promise, in which case it is resolved + * with the value which is resolved in that promise using + * [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)). + * It also notifies via the return value of the `notifyCallback` method. The promise cannot be + * resolved or rejected from the notifyCallback method. + * + * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)` + * + * - `finally(callback, notifyCallback)` – allows you to observe either the fulfillment or rejection of a promise, + * but to do so without modifying the final value. This is useful to release resources or do some + * clean-up that needs to be done whether the promise was rejected or resolved. See the [full + * specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for + * more information. + * + * # Chaining promises + * + * Because calling the `then` method of a promise returns a new derived promise, it is easily + * possible to create a chain of promises: + * + * ```js + * promiseB = promiseA.then(function(result) { + * return result + 1; + * }); + * + * // promiseB will be resolved immediately after promiseA is resolved and its value + * // will be the result of promiseA incremented by 1 + * ``` + * + * It is possible to create chains of any length and since a promise can be resolved with another + * promise (which will defer its resolution further), it is possible to pause/defer resolution of + * the promises at any point in the chain. This makes it possible to implement powerful APIs like + * $http's response interceptors. + * + * + * # Differences between Kris Kowal's Q and $q + * + * There are two main differences: + * + * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation + * mechanism in angular, which means faster propagation of resolution or rejection into your + * models and avoiding unnecessary browser repaints, which would result in flickering UI. + * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains + * all the important functionality needed for common async tasks. + * + * # Testing + * + * ```js + * it('should simulate promise', inject(function($q, $rootScope) { + * var deferred = $q.defer(); + * var promise = deferred.promise; + * var resolvedValue; + * + * promise.then(function(value) { resolvedValue = value; }); + * expect(resolvedValue).toBeUndefined(); + * + * // Simulate resolving of promise + * deferred.resolve(123); + * // Note that the 'then' function does not get called synchronously. + * // This is because we want the promise API to always be async, whether or not + * // it got called synchronously or asynchronously. + * expect(resolvedValue).toBeUndefined(); + * + * // Propagate promise resolution to 'then' functions using $apply(). + * $rootScope.$apply(); + * expect(resolvedValue).toEqual(123); + * })); + * ``` + * + * @param {function(function, function)} resolver Function which is responsible for resolving or + * rejecting the newly created promise. The first parameter is a function which resolves the + * promise, the second parameter is a function which rejects the promise. + * + * @returns {Promise} The newly created promise. + */ + function $QProvider() { - while (postDigestQueue.length) { - try { - postDigestQueue.shift()(); - } catch (e) { - $exceptionHandler(e); - } - } - }, + this.$get = ['$rootScope', '$exceptionHandler', function ($rootScope, $exceptionHandler) { + return qFactory(function (callback) { + $rootScope.$evalAsync(callback); + }, $exceptionHandler); + }]; + } + function $$QProvider() { + this.$get = ['$browser', '$exceptionHandler', function ($browser, $exceptionHandler) { + return qFactory(function (callback) { + $browser.defer(callback); + }, $exceptionHandler); + }]; + } - /** - * @ngdoc event - * @name $rootScope.Scope#$destroy - * @eventType broadcast on scope being destroyed - * - * @description - * Broadcasted when a scope and its children are being destroyed. - * - * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to - * clean up DOM bindings before an element is removed from the DOM. - */ - - /** - * @ngdoc method - * @name $rootScope.Scope#$destroy - * @kind function - * - * @description - * Removes the current scope (and all of its children) from the parent scope. Removal implies - * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer - * propagate to the current scope and its children. Removal also implies that the current - * scope is eligible for garbage collection. - * - * The `$destroy()` is usually used by directives such as - * {@link ng.directive:ngRepeat ngRepeat} for managing the - * unrolling of the loop. - * - * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope. - * Application code can register a `$destroy` event handler that will give it a chance to - * perform any necessary cleanup. - * - * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to - * clean up DOM bindings before an element is removed from the DOM. - */ - $destroy: function() { - // We can't destroy a scope that has been already destroyed. - if (this.$$destroyed) return; - var parent = this.$parent; - - this.$broadcast('$destroy'); - this.$$destroyed = true; - - if (this === $rootScope) { - //Remove handlers attached to window when $rootScope is removed - $browser.$$applicationDestroyed(); - } + /** + * Constructs a promise manager. + * + * @param {function(function)} nextTick Function for executing functions in the next turn. + * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for + * debugging purposes. + * @returns {object} Promise manager. + */ + function qFactory(nextTick, exceptionHandler) { + var $qMinErr = minErr('$q', TypeError); - incrementWatchersCount(this, -this.$$watchersCount); - for (var eventName in this.$$listenerCount) { - decrementListenerCount(this, this.$$listenerCount[eventName], eventName); - } + /** + * @ngdoc method + * @name ng.$q#defer + * @kind function + * + * @description + * Creates a `Deferred` object which represents a task which will finish in the future. + * + * @returns {Deferred} Returns a new instance of deferred. + */ + var defer = function () { + var d = new Deferred(); + //Necessary to support unbound execution :/ + d.resolve = simpleBind(d, d.resolve); + d.reject = simpleBind(d, d.reject); + d.notify = simpleBind(d, d.notify); + return d; + }; - // sever all the references to parent scopes (after this cleanup, the current scope should - // not be retained by any of our references and should be eligible for garbage collection) - if (parent && parent.$$childHead == this) parent.$$childHead = this.$$nextSibling; - if (parent && parent.$$childTail == this) parent.$$childTail = this.$$prevSibling; - if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling; - if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling; - - // Disable listeners, watchers and apply/digest methods - this.$destroy = this.$digest = this.$apply = this.$evalAsync = this.$applyAsync = noop; - this.$on = this.$watch = this.$watchGroup = function() { return noop; }; - this.$$listeners = {}; - - // Disconnect the next sibling to prevent `cleanUpScope` destroying those too - this.$$nextSibling = null; - cleanUpScope(this); - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$eval - * @kind function - * - * @description - * Executes the `expression` on the current scope and returns the result. Any exceptions in - * the expression are propagated (uncaught). This is useful when evaluating Angular - * expressions. - * - * # Example - * ```js - var scope = ng.$rootScope.Scope(); - scope.a = 1; - scope.b = 2; - - expect(scope.$eval('a+b')).toEqual(3); - expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3); - * ``` - * - * @param {(string|function())=} expression An angular expression to be executed. - * - * - `string`: execute using the rules as defined in {@link guide/expression expression}. - * - `function(scope)`: execute the function with the current `scope` parameter. - * - * @param {(object)=} locals Local variables object, useful for overriding values in scope. - * @returns {*} The result of evaluating the expression. - */ - $eval: function(expr, locals) { - return $parse(expr)(this, locals); - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$evalAsync - * @kind function - * - * @description - * Executes the expression on the current scope at a later point in time. - * - * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only - * that: - * - * - it will execute after the function that scheduled the evaluation (preferably before DOM - * rendering). - * - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after - * `expression` execution. - * - * Any exceptions from the execution of the expression are forwarded to the - * {@link ng.$exceptionHandler $exceptionHandler} service. - * - * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle - * will be scheduled. However, it is encouraged to always call code that changes the model - * from within an `$apply` call. That includes code evaluated via `$evalAsync`. - * - * @param {(string|function())=} expression An angular expression to be executed. - * - * - `string`: execute using the rules as defined in {@link guide/expression expression}. - * - `function(scope)`: execute the function with the current `scope` parameter. - * - * @param {(object)=} locals Local variables object, useful for overriding values in scope. - */ - $evalAsync: function(expr, locals) { - // if we are outside of an $digest loop and this is the first time we are scheduling async - // task also schedule async auto-flush - if (!$rootScope.$$phase && !asyncQueue.length) { - $browser.defer(function() { - if (asyncQueue.length) { - $rootScope.$digest(); - } - }); + function Promise() { + this.$$state = {status: 0}; } - asyncQueue.push({scope: this, expression: $parse(expr), locals: locals}); - }, + extend(Promise.prototype, { + then: function (onFulfilled, onRejected, progressBack) { + if (isUndefined(onFulfilled) && isUndefined(onRejected) && isUndefined(progressBack)) { + return this; + } + var result = new Deferred(); - $$postDigest: function(fn) { - postDigestQueue.push(fn); - }, + this.$$state.pending = this.$$state.pending || []; + this.$$state.pending.push([result, onFulfilled, onRejected, progressBack]); + if (this.$$state.status > 0) scheduleProcessQueue(this.$$state); - /** - * @ngdoc method - * @name $rootScope.Scope#$apply - * @kind function - * - * @description - * `$apply()` is used to execute an expression in angular from outside of the angular - * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries). - * Because we are calling into the angular framework we need to perform proper scope life - * cycle of {@link ng.$exceptionHandler exception handling}, - * {@link ng.$rootScope.Scope#$digest executing watches}. - * - * ## Life cycle - * - * # Pseudo-Code of `$apply()` - * ```js - function $apply(expr) { - try { - return $eval(expr); - } catch (e) { - $exceptionHandler(e); - } finally { - $root.$digest(); - } - } - * ``` - * - * - * Scope's `$apply()` method transitions through the following stages: - * - * 1. The {@link guide/expression expression} is executed using the - * {@link ng.$rootScope.Scope#$eval $eval()} method. - * 2. Any exceptions from the execution of the expression are forwarded to the - * {@link ng.$exceptionHandler $exceptionHandler} service. - * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the - * expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method. - * - * - * @param {(string|function())=} exp An angular expression to be executed. - * - * - `string`: execute using the rules as defined in {@link guide/expression expression}. - * - `function(scope)`: execute the function with current `scope` parameter. - * - * @returns {*} The result of evaluating the expression. - */ - $apply: function(expr) { - try { - beginPhase('$apply'); - try { - return this.$eval(expr); - } finally { - clearPhase(); - } - } catch (e) { - $exceptionHandler(e); - } finally { - try { - $rootScope.$digest(); - } catch (e) { - $exceptionHandler(e); - throw e; - } + return result.promise; + }, + + "catch": function (callback) { + return this.then(null, callback); + }, + + "finally": function (callback, progressBack) { + return this.then(function (value) { + return handleCallback(value, true, callback); + }, function (error) { + return handleCallback(error, false, callback); + }, progressBack); + } + }); + + //Faster, more basic than angular.bind http://jsperf.com/angular-bind-vs-custom-vs-native + function simpleBind(context, fn) { + return function (value) { + fn.call(context, value); + }; } - }, - /** - * @ngdoc method - * @name $rootScope.Scope#$applyAsync - * @kind function - * - * @description - * Schedule the invocation of $apply to occur at a later time. The actual time difference - * varies across browsers, but is typically around ~10 milliseconds. - * - * This can be used to queue up multiple expressions which need to be evaluated in the same - * digest. - * - * @param {(string|function())=} exp An angular expression to be executed. - * - * - `string`: execute using the rules as defined in {@link guide/expression expression}. - * - `function(scope)`: execute the function with current `scope` parameter. - */ - $applyAsync: function(expr) { - var scope = this; - expr && applyAsyncQueue.push($applyAsyncExpression); - expr = $parse(expr); - scheduleApplyAsync(); - - function $applyAsyncExpression() { - scope.$eval(expr); + function processQueue(state) { + var fn, deferred, pending; + + pending = state.pending; + state.processScheduled = false; + state.pending = undefined; + for (var i = 0, ii = pending.length; i < ii; ++i) { + deferred = pending[i][0]; + fn = pending[i][state.status]; + try { + if (isFunction(fn)) { + deferred.resolve(fn(state.value)); + } else if (state.status === 1) { + deferred.resolve(state.value); + } else { + deferred.reject(state.value); + } + } catch (e) { + deferred.reject(e); + exceptionHandler(e); + } + } } - }, - /** - * @ngdoc method - * @name $rootScope.Scope#$on - * @kind function - * - * @description - * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for - * discussion of event life cycle. - * - * The event listener function format is: `function(event, args...)`. The `event` object - * passed into the listener has the following attributes: - * - * - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or - * `$broadcast`-ed. - * - `currentScope` - `{Scope}`: the scope that is currently handling the event. Once the - * event propagates through the scope hierarchy, this property is set to null. - * - `name` - `{string}`: name of the event. - * - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel - * further event propagation (available only for events that were `$emit`-ed). - * - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag - * to true. - * - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called. - * - * @param {string} name Event name to listen on. - * @param {function(event, ...args)} listener Function to call when the event is emitted. - * @returns {function()} Returns a deregistration function for this listener. - */ - $on: function(name, listener) { - var namedListeners = this.$$listeners[name]; - if (!namedListeners) { - this.$$listeners[name] = namedListeners = []; + function scheduleProcessQueue(state) { + if (state.processScheduled || !state.pending) return; + state.processScheduled = true; + nextTick(function () { + processQueue(state); + }); } - namedListeners.push(listener); - var current = this; - do { - if (!current.$$listenerCount[name]) { - current.$$listenerCount[name] = 0; - } - current.$$listenerCount[name]++; - } while ((current = current.$parent)); - - var self = this; - return function() { - var indexOfListener = namedListeners.indexOf(listener); - if (indexOfListener !== -1) { - namedListeners[indexOfListener] = null; - decrementListenerCount(self, 1, name); - } - }; - }, + function Deferred() { + this.promise = new Promise(); + } + extend(Deferred.prototype, { + resolve: function (val) { + if (this.promise.$$state.status) return; + if (val === this.promise) { + this.$$reject($qMinErr( + 'qcycle', + "Expected promise to be resolved with value other than itself '{0}'", + val)); + } else { + this.$$resolve(val); + } - /** - * @ngdoc method - * @name $rootScope.Scope#$emit - * @kind function - * - * @description - * Dispatches an event `name` upwards through the scope hierarchy notifying the - * registered {@link ng.$rootScope.Scope#$on} listeners. - * - * The event life cycle starts at the scope on which `$emit` was called. All - * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get - * notified. Afterwards, the event traverses upwards toward the root scope and calls all - * registered listeners along the way. The event will stop propagating if one of the listeners - * cancels it. - * - * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed - * onto the {@link ng.$exceptionHandler $exceptionHandler} service. - * - * @param {string} name Event name to emit. - * @param {...*} args Optional one or more arguments which will be passed onto the event listeners. - * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}). - */ - $emit: function(name, args) { - var empty = [], - namedListeners, - scope = this, - stopPropagation = false, - event = { - name: name, - targetScope: scope, - stopPropagation: function() {stopPropagation = true;}, - preventDefault: function() { - event.defaultPrevented = true; - }, - defaultPrevented: false }, - listenerArgs = concat([event], arguments, 1), - i, length; - do { - namedListeners = scope.$$listeners[name] || empty; - event.currentScope = scope; - for (i = 0, length = namedListeners.length; i < length; i++) { + $$resolve: function (val) { + var then; + var that = this; + var done = false; + try { + if ((isObject(val) || isFunction(val))) then = val && val.then; + if (isFunction(then)) { + this.promise.$$state.status = -1; + then.call(val, resolvePromise, rejectPromise, simpleBind(this, this.notify)); + } else { + this.promise.$$state.value = val; + this.promise.$$state.status = 1; + scheduleProcessQueue(this.promise.$$state); + } + } catch (e) { + rejectPromise(e); + exceptionHandler(e); + } + + function resolvePromise(val) { + if (done) return; + done = true; + that.$$resolve(val); + } + + function rejectPromise(val) { + if (done) return; + done = true; + that.$$reject(val); + } + }, + + reject: function (reason) { + if (this.promise.$$state.status) return; + this.$$reject(reason); + }, + + $$reject: function (reason) { + this.promise.$$state.value = reason; + this.promise.$$state.status = 2; + scheduleProcessQueue(this.promise.$$state); + }, + + notify: function (progress) { + var callbacks = this.promise.$$state.pending; + + if ((this.promise.$$state.status <= 0) && callbacks && callbacks.length) { + nextTick(function () { + var callback, result; + for (var i = 0, ii = callbacks.length; i < ii; i++) { + result = callbacks[i][0]; + callback = callbacks[i][3]; + try { + result.notify(isFunction(callback) ? callback(progress) : progress); + } catch (e) { + exceptionHandler(e); + } + } + }); + } + } + }); + + /** + * @ngdoc method + * @name $q#reject + * @kind function + * + * @description + * Creates a promise that is resolved as rejected with the specified `reason`. This api should be + * used to forward rejection in a chain of promises. If you are dealing with the last promise in + * a promise chain, you don't need to worry about it. + * + * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of + * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via + * a promise error callback and you want to forward the error to the promise derived from the + * current promise, you have to "rethrow" the error by returning a rejection constructed via + * `reject`. + * + * ```js + * promiseB = promiseA.then(function(result) { + * // success: do something and resolve promiseB + * // with the old or a new result + * return result; + * }, function(reason) { + * // error: handle the error if possible and + * // resolve promiseB with newPromiseOrValue, + * // otherwise forward the rejection to promiseB + * if (canHandle(reason)) { + * // handle the error and recover + * return newPromiseOrValue; + * } + * return $q.reject(reason); + * }); + * ``` + * + * @param {*} reason Constant, message, exception or an object representing the rejection reason. + * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`. + */ + var reject = function (reason) { + var result = new Deferred(); + result.reject(reason); + return result.promise; + }; - // if listeners were deregistered, defragment the array - if (!namedListeners[i]) { - namedListeners.splice(i, 1); - i--; - length--; - continue; + var makePromise = function makePromise(value, resolved) { + var result = new Deferred(); + if (resolved) { + result.resolve(value); + } else { + result.reject(value); } + return result.promise; + }; + + var handleCallback = function handleCallback(value, isResolved, callback) { + var callbackOutput = null; try { - //allow all listeners attached to the current scope to run - namedListeners[i].apply(null, listenerArgs); + if (isFunction(callback)) callbackOutput = callback(); } catch (e) { - $exceptionHandler(e); + return makePromise(e, false); } - } - //if any listener on the current scope stops propagation, prevent bubbling - if (stopPropagation) { - event.currentScope = null; - return event; - } - //traverse upwards - scope = scope.$parent; - } while (scope); + if (isPromiseLike(callbackOutput)) { + return callbackOutput.then(function () { + return makePromise(value, isResolved); + }, function (error) { + return makePromise(error, false); + }); + } else { + return makePromise(value, isResolved); + } + }; - event.currentScope = null; + /** + * @ngdoc method + * @name $q#when + * @kind function + * + * @description + * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. + * This is useful when you are dealing with an object that might or might not be a promise, or if + * the promise comes from a source that can't be trusted. + * + * @param {*} value Value or a promise + * @param {Function=} successCallback + * @param {Function=} errorCallback + * @param {Function=} progressCallback + * @returns {Promise} Returns a promise of the passed value or promise + */ - return event; - }, + var when = function (value, callback, errback, progressBack) { + var result = new Deferred(); + result.resolve(value); + return result.promise.then(callback, errback, progressBack); + }; - /** - * @ngdoc method - * @name $rootScope.Scope#$broadcast - * @kind function - * - * @description - * Dispatches an event `name` downwards to all child scopes (and their children) notifying the - * registered {@link ng.$rootScope.Scope#$on} listeners. - * - * The event life cycle starts at the scope on which `$broadcast` was called. All - * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get - * notified. Afterwards, the event propagates to all direct and indirect scopes of the current - * scope and calls all registered listeners along the way. The event cannot be canceled. - * - * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed - * onto the {@link ng.$exceptionHandler $exceptionHandler} service. - * - * @param {string} name Event name to broadcast. - * @param {...*} args Optional one or more arguments which will be passed onto the event listeners. - * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on} - */ - $broadcast: function(name, args) { - var target = this, - current = target, - next = target, - event = { - name: name, - targetScope: target, - preventDefault: function() { - event.defaultPrevented = true; - }, - defaultPrevented: false - }; + /** + * @ngdoc method + * @name $q#resolve + * @kind function + * + * @description + * Alias of {@link ng.$q#when when} to maintain naming consistency with ES6. + * + * @param {*} value Value or a promise + * @param {Function=} successCallback + * @param {Function=} errorCallback + * @param {Function=} progressCallback + * @returns {Promise} Returns a promise of the passed value or promise + */ + var resolve = when; - if (!target.$$listenerCount[name]) return event; + /** + * @ngdoc method + * @name $q#all + * @kind function + * + * @description + * Combines multiple promises into a single promise that is resolved when all of the input + * promises are resolved. + * + * @param {Array.|Object.} promises An array or hash of promises. + * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values, + * each value corresponding to the promise at the same index/key in the `promises` array/hash. + * If any of the promises is resolved with a rejection, this resulting promise will be rejected + * with the same rejection value. + */ - var listenerArgs = concat([event], arguments, 1), - listeners, i, length; + function all(promises) { + var deferred = new Deferred(), + counter = 0, + results = isArray(promises) ? [] : {}; + + forEach(promises, function (promise, key) { + counter++; + when(promise).then(function (value) { + if (results.hasOwnProperty(key)) return; + results[key] = value; + if (!(--counter)) deferred.resolve(results); + }, function (reason) { + if (results.hasOwnProperty(key)) return; + deferred.reject(reason); + }); + }); - //down while you can, then up and next sibling or up and next sibling until back at root - while ((current = next)) { - event.currentScope = current; - listeners = current.$$listeners[name] || []; - for (i = 0, length = listeners.length; i < length; i++) { - // if listeners were deregistered, defragment the array - if (!listeners[i]) { - listeners.splice(i, 1); - i--; - length--; - continue; + if (counter === 0) { + deferred.resolve(results); } - try { - listeners[i].apply(null, listenerArgs); - } catch (e) { - $exceptionHandler(e); - } - } + return deferred.promise; + } - // Insanity Warning: scope depth-first traversal - // yes, this code is a bit crazy, but it works and we have tests to prove it! - // this piece should be kept in sync with the traversal in $digest - // (though it differs due to having the extra check for $$listenerCount) - if (!(next = ((current.$$listenerCount[name] && current.$$childHead) || - (current !== target && current.$$nextSibling)))) { - while (current !== target && !(next = current.$$nextSibling)) { - current = current.$parent; + var $Q = function Q(resolver) { + if (!isFunction(resolver)) { + throw $qMinErr('norslvr', "Expected resolverFn, got '{0}'", resolver); } - } - } - event.currentScope = null; - return event; - } - }; + var deferred = new Deferred(); + + function resolveFn(value) { + deferred.resolve(value); + } - var $rootScope = new Scope(); + function rejectFn(reason) { + deferred.reject(reason); + } - //The internal queues. Expose them on the $rootScope for debugging/testing purposes. - var asyncQueue = $rootScope.$$asyncQueue = []; - var postDigestQueue = $rootScope.$$postDigestQueue = []; - var applyAsyncQueue = $rootScope.$$applyAsyncQueue = []; + resolver(resolveFn, rejectFn); - return $rootScope; + return deferred.promise; + }; + // Let's make the instanceof operator work for promises, so that + // `new $q(fn) instanceof $q` would evaluate to true. + $Q.prototype = Promise.prototype; - function beginPhase(phase) { - if ($rootScope.$$phase) { - throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase); - } + $Q.defer = defer; + $Q.reject = reject; + $Q.when = when; + $Q.resolve = resolve; + $Q.all = all; - $rootScope.$$phase = phase; + return $Q; } - function clearPhase() { - $rootScope.$$phase = null; - } + function $$RAFProvider() { //rAF + this.$get = ['$window', '$timeout', function ($window, $timeout) { + var requestAnimationFrame = $window.requestAnimationFrame || + $window.webkitRequestAnimationFrame; - function incrementWatchersCount(current, count) { - do { - current.$$watchersCount += count; - } while ((current = current.$parent)); - } + var cancelAnimationFrame = $window.cancelAnimationFrame || + $window.webkitCancelAnimationFrame || + $window.webkitCancelRequestAnimationFrame; - function decrementListenerCount(current, count, name) { - do { - current.$$listenerCount[name] -= count; + var rafSupported = !!requestAnimationFrame; + var raf = rafSupported + ? function (fn) { + var id = requestAnimationFrame(fn); + return function () { + cancelAnimationFrame(id); + }; + } + : function (fn) { + var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666 + return function () { + $timeout.cancel(timer); + }; + }; - if (current.$$listenerCount[name] === 0) { - delete current.$$listenerCount[name]; - } - } while ((current = current.$parent)); + raf.supported = rafSupported; + + return raf; + }]; } /** - * function used as an initial value for watchers. - * because it's unique we can easily tell it apart from other values + * DESIGN NOTES + * + * The design decisions behind the scope are heavily favored for speed and memory consumption. + * + * The typical use of scope is to watch the expressions, which most of the time return the same + * value as last time so we optimize the operation. + * + * Closures construction is expensive in terms of speed as well as memory: + * - No closures, instead use prototypical inheritance for API + * - Internal state needs to be stored on scope directly, which means that private state is + * exposed as $$____ properties + * + * Loop operations are optimized by using while(count--) { ... } + * - This means that in order to keep the same order of execution as addition we have to add + * items to the array at the beginning (unshift) instead of at the end (push) + * + * Child scopes are created and removed often + * - Using an array would be slow since inserts in the middle are expensive; so we use linked lists + * + * There are fewer watches than observers. This is why you don't want the observer to be implemented + * in the same way as watch. Watch requires return of the initialization function which is expensive + * to construct. */ - function initWatchVal() {} - function flushApplyAsync() { - while (applyAsyncQueue.length) { - try { - applyAsyncQueue.shift()(); - } catch (e) { - $exceptionHandler(e); - } - } - applyAsyncId = null; - } - function scheduleApplyAsync() { - if (applyAsyncId === null) { - applyAsyncId = $browser.defer(function() { - $rootScope.$apply(flushApplyAsync); - }); - } - } - }]; -} + /** + * @ngdoc provider + * @name $rootScopeProvider + * @description + * + * Provider for the $rootScope service. + */ -/** - * @ngdoc service - * @name $rootElement - * - * @description - * The root element of Angular application. This is either the element where {@link - * ng.directive:ngApp ngApp} was declared or the element passed into - * {@link angular.bootstrap}. The element represents the root element of application. It is also the - * location where the application's {@link auto.$injector $injector} service gets - * published, and can be retrieved using `$rootElement.injector()`. - */ + /** + * @ngdoc method + * @name $rootScopeProvider#digestTtl + * @description + * + * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and + * assuming that the model is unstable. + * + * The current default is 10 iterations. + * + * In complex applications it's possible that the dependencies between `$watch`s will result in + * several digest iterations. However if an application needs more than the default 10 digest + * iterations for its model to stabilize then you should investigate what is causing the model to + * continuously change during the digest. + * + * Increasing the TTL could have performance implications, so you should not change it without + * proper justification. + * + * @param {number} limit The number of digest iterations. + */ -// the implementation is in angular.bootstrap + /** + * @ngdoc service + * @name $rootScope + * @description + * + * Every application has a single root {@link ng.$rootScope.Scope scope}. + * All other scopes are descendant scopes of the root scope. Scopes provide separation + * between the model and the view, via a mechanism for watching the model for changes. + * They also provide event emission/broadcast and subscription facility. See the + * {@link guide/scope developer guide on scopes}. + */ + function $RootScopeProvider() { + var TTL = 10; + var $rootScopeMinErr = minErr('$rootScope'); + var lastDirtyWatch = null; + var applyAsyncId = null; + + this.digestTtl = function (value) { + if (arguments.length) { + TTL = value; + } + return TTL; + }; -/** - * @description - * Private service to sanitize uris for links and images. Used by $compile and $sanitize. - */ -function $$SanitizeUriProvider() { - var aHrefSanitizationWhitelist = /^\s*(https?|ftp|mailto|tel|file):/, - imgSrcSanitizationWhitelist = /^\s*((https?|ftp|file|blob):|data:image\/)/; - - /** - * @description - * Retrieves or overrides the default regular expression that is used for whitelisting of safe - * urls during a[href] sanitization. - * - * The sanitization is a security measure aimed at prevent XSS attacks via html links. - * - * Any url about to be assigned to a[href] via data-binding is first normalized and turned into - * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist` - * regular expression. If a match is found, the original url is written into the dom. Otherwise, - * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. - * - * @param {RegExp=} regexp New regexp to whitelist urls with. - * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for - * chaining otherwise. - */ - this.aHrefSanitizationWhitelist = function(regexp) { - if (isDefined(regexp)) { - aHrefSanitizationWhitelist = regexp; - return this; - } - return aHrefSanitizationWhitelist; - }; + function createChildScopeClass(parent) { + function ChildScope() { + this.$$watchers = this.$$nextSibling = + this.$$childHead = this.$$childTail = null; + this.$$listeners = {}; + this.$$listenerCount = {}; + this.$$watchersCount = 0; + this.$id = nextUid(); + this.$$ChildScope = null; + } + ChildScope.prototype = parent; + return ChildScope; + } - /** - * @description - * Retrieves or overrides the default regular expression that is used for whitelisting of safe - * urls during img[src] sanitization. - * - * The sanitization is a security measure aimed at prevent XSS attacks via html links. - * - * Any url about to be assigned to img[src] via data-binding is first normalized and turned into - * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist` - * regular expression. If a match is found, the original url is written into the dom. Otherwise, - * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. - * - * @param {RegExp=} regexp New regexp to whitelist urls with. - * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for - * chaining otherwise. - */ - this.imgSrcSanitizationWhitelist = function(regexp) { - if (isDefined(regexp)) { - imgSrcSanitizationWhitelist = regexp; - return this; - } - return imgSrcSanitizationWhitelist; - }; - - this.$get = function() { - return function sanitizeUri(uri, isImage) { - var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist; - var normalizedVal; - normalizedVal = urlResolve(uri).href; - if (normalizedVal !== '' && !normalizedVal.match(regex)) { - return 'unsafe:' + normalizedVal; - } - return uri; - }; - }; -} + this.$get = ['$exceptionHandler', '$parse', '$browser', + function ($exceptionHandler, $parse, $browser) { -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Any commits to this file should be reviewed with security in mind. * - * Changes to this file can potentially create security vulnerabilities. * - * An approval from 2 Core members with history of modifying * - * this file is required. * - * * - * Does the change somehow allow for arbitrary javascript to be executed? * - * Or allows for someone to change the prototype of built-in objects? * - * Or gives undesired access to variables likes document or window? * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + function destroyChildScope($event) { + $event.currentScope.$$destroyed = true; + } -var $sceMinErr = minErr('$sce'); + function cleanUpScope($scope) { -var SCE_CONTEXTS = { - HTML: 'html', - CSS: 'css', - URL: 'url', - // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a - // url. (e.g. ng-include, script src, templateUrl) - RESOURCE_URL: 'resourceUrl', - JS: 'js' -}; + if (msie === 9) { + // There is a memory leak in IE9 if all child scopes are not disconnected + // completely when a scope is destroyed. So this code will recurse up through + // all this scopes children + // + // See issue https://github.com/angular/angular.js/issues/10706 + $scope.$$childHead && cleanUpScope($scope.$$childHead); + $scope.$$nextSibling && cleanUpScope($scope.$$nextSibling); + } -// Helper functions follow. + // The code below works around IE9 and V8's memory leaks + // + // See: + // - https://code.google.com/p/v8/issues/detail?id=2073#c26 + // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909 + // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451 -function adjustMatcher(matcher) { - if (matcher === 'self') { - return matcher; - } else if (isString(matcher)) { - // Strings match exactly except for 2 wildcards - '*' and '**'. - // '*' matches any character except those from the set ':/.?&'. - // '**' matches any character (like .* in a RegExp). - // More than 2 *'s raises an error as it's ill defined. - if (matcher.indexOf('***') > -1) { - throw $sceMinErr('iwcard', - 'Illegal sequence *** in string matcher. String: {0}', matcher); - } - matcher = escapeForRegexp(matcher). - replace('\\*\\*', '.*'). - replace('\\*', '[^:/.?&;]*'); - return new RegExp('^' + matcher + '$'); - } else if (isRegExp(matcher)) { - // The only other type of matcher allowed is a Regexp. - // Match entire URL / disallow partial matches. - // Flags are reset (i.e. no global, ignoreCase or multiline) - return new RegExp('^' + matcher.source + '$'); - } else { - throw $sceMinErr('imatcher', - 'Matchers may only be "self", string patterns or RegExp objects'); - } -} - - -function adjustMatchers(matchers) { - var adjustedMatchers = []; - if (isDefined(matchers)) { - forEach(matchers, function(matcher) { - adjustedMatchers.push(adjustMatcher(matcher)); - }); - } - return adjustedMatchers; -} + $scope.$parent = $scope.$$nextSibling = $scope.$$prevSibling = $scope.$$childHead = + $scope.$$childTail = $scope.$root = $scope.$$watchers = null; + } + /** + * @ngdoc type + * @name $rootScope.Scope + * + * @description + * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the + * {@link auto.$injector $injector}. Child scopes are created using the + * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when + * compiled HTML template is executed.) See also the {@link guide/scope Scopes guide} for + * an in-depth introduction and usage examples. + * + * + * # Inheritance + * A scope can inherit from a parent scope, as in this example: + * ```js + var parent = $rootScope; + var child = parent.$new(); + + parent.salutation = "Hello"; + expect(child.salutation).toEqual('Hello'); + + child.salutation = "Welcome"; + expect(child.salutation).toEqual('Welcome'); + expect(parent.salutation).toEqual('Hello'); + * ``` + * + * When interacting with `Scope` in tests, additional helper methods are available on the + * instances of `Scope` type. See {@link ngMock.$rootScope.Scope ngMock Scope} for additional + * details. + * + * + * @param {Object.=} providers Map of service factory which need to be + * provided for the current scope. Defaults to {@link ng}. + * @param {Object.=} instanceCache Provides pre-instantiated services which should + * append/override services provided by `providers`. This is handy + * when unit-testing and having the need to override a default + * service. + * @returns {Object} Newly created scope. + * + */ + function Scope() { + this.$id = nextUid(); + this.$$phase = this.$parent = this.$$watchers = + this.$$nextSibling = this.$$prevSibling = + this.$$childHead = this.$$childTail = null; + this.$root = this; + this.$$destroyed = false; + this.$$listeners = {}; + this.$$listenerCount = {}; + this.$$watchersCount = 0; + this.$$isolateBindings = null; + } -/** - * @ngdoc service - * @name $sceDelegate - * @kind function - * - * @description - * - * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict - * Contextual Escaping (SCE)} services to AngularJS. - * - * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of - * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS. This is - * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to - * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things - * work because `$sce` delegates to `$sceDelegate` for these operations. - * - * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service. - * - * The default instance of `$sceDelegate` should work out of the box with little pain. While you - * can override it completely to change the behavior of `$sce`, the common case would - * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting - * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as - * templates. Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist - * $sceDelegateProvider.resourceUrlWhitelist} and {@link - * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist} - */ + /** + * @ngdoc property + * @name $rootScope.Scope#$id + * + * @description + * Unique scope ID (monotonically increasing) useful for debugging. + */ + + /** + * @ngdoc property + * @name $rootScope.Scope#$parent + * + * @description + * Reference to the parent scope. + */ + + /** + * @ngdoc property + * @name $rootScope.Scope#$root + * + * @description + * Reference to the root scope. + */ + + Scope.prototype = { + constructor: Scope, + /** + * @ngdoc method + * @name $rootScope.Scope#$new + * @kind function + * + * @description + * Creates a new child {@link ng.$rootScope.Scope scope}. + * + * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event. + * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}. + * + * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is + * desired for the scope and its child scopes to be permanently detached from the parent and + * thus stop participating in model change detection and listener notification by invoking. + * + * @param {boolean} isolate If true, then the scope does not prototypically inherit from the + * parent scope. The scope is isolated, as it can not see parent scope properties. + * When creating widgets, it is useful for the widget to not accidentally read parent + * state. + * + * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will be the `$parent` + * of the newly created scope. Defaults to `this` scope if not provided. + * This is used when creating a transclude scope to correctly place it + * in the scope hierarchy while maintaining the correct prototypical + * inheritance. + * + * @returns {Object} The newly created child scope. + * + */ + $new: function (isolate, parent) { + var child; + + parent = parent || this; + + if (isolate) { + child = new Scope(); + child.$root = this.$root; + } else { + // Only create a child scope class if somebody asks for one, + // but cache it to allow the VM to optimize lookups. + if (!this.$$ChildScope) { + this.$$ChildScope = createChildScopeClass(this); + } + child = new this.$$ChildScope(); + } + child.$parent = parent; + child.$$prevSibling = parent.$$childTail; + if (parent.$$childHead) { + parent.$$childTail.$$nextSibling = child; + parent.$$childTail = child; + } else { + parent.$$childHead = parent.$$childTail = child; + } + + // When the new scope is not isolated or we inherit from `this`, and + // the parent scope is destroyed, the property `$$destroyed` is inherited + // prototypically. In all other cases, this property needs to be set + // when the parent scope is destroyed. + // The listener needs to be added after the parent is set + if (isolate || parent != this) child.$on('$destroy', destroyChildScope); + + return child; + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$watch + * @kind function + * + * @description + * Registers a `listener` callback to be executed whenever the `watchExpression` changes. + * + * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest + * $digest()} and should return the value that will be watched. (`watchExpression` should not change + * its value when executed multiple times with the same input because it may be executed multiple + * times by {@link ng.$rootScope.Scope#$digest $digest()}. That is, `watchExpression` should be + * [idempotent](http://en.wikipedia.org/wiki/Idempotence). + * - The `listener` is called only when the value from the current `watchExpression` and the + * previous call to `watchExpression` are not equal (with the exception of the initial run, + * see below). Inequality is determined according to reference inequality, + * [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators) + * via the `!==` Javascript operator, unless `objectEquality == true` + * (see next point) + * - When `objectEquality == true`, inequality of the `watchExpression` is determined + * according to the {@link angular.equals} function. To save the value of the object for + * later comparison, the {@link angular.copy} function is used. This therefore means that + * watching complex objects will have adverse memory and performance implications. + * - The watch `listener` may change the model, which may trigger other `listener`s to fire. + * This is achieved by rerunning the watchers until no changes are detected. The rerun + * iteration limit is 10 to prevent an infinite loop deadlock. + * + * + * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called, + * you can register a `watchExpression` function with no `listener`. (Be prepared for + * multiple calls to your `watchExpression` because it will execute multiple times in a + * single {@link ng.$rootScope.Scope#$digest $digest} cycle if a change is detected.) + * + * After a watcher is registered with the scope, the `listener` fn is called asynchronously + * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the + * watcher. In rare cases, this is undesirable because the listener is called when the result + * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you + * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the + * listener was called due to initialization. + * + * + * + * # Example + * ```js + // let's assume that scope was dependency injected as the $rootScope + var scope = $rootScope; + scope.name = 'misko'; + scope.counter = 0; + + expect(scope.counter).toEqual(0); + scope.$watch('name', function(newValue, oldValue) { + scope.counter = scope.counter + 1; + }); + expect(scope.counter).toEqual(0); -/** - * @ngdoc provider - * @name $sceDelegateProvider - * @description - * - * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate - * $sceDelegate} service. This allows one to get/set the whitelists and blacklists used to ensure - * that the URLs used for sourcing Angular templates are safe. Refer {@link - * ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and - * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist} - * - * For the general details about this service in Angular, read the main page for {@link ng.$sce - * Strict Contextual Escaping (SCE)}. - * - * **Example**: Consider the following case. - * - * - your app is hosted at url `http://myapp.example.com/` - * - but some of your templates are hosted on other domains you control such as - * `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc. - * - and you have an open redirect at `http://myapp.example.com/clickThru?...`. - * - * Here is what a secure configuration for this scenario might look like: - * - * ``` - * angular.module('myApp', []).config(function($sceDelegateProvider) { - * $sceDelegateProvider.resourceUrlWhitelist([ - * // Allow same origin resource loads. - * 'self', - * // Allow loading from our assets domain. Notice the difference between * and **. - * 'http://srv*.assets.example.com/**' - * ]); - * - * // The blacklist overrides the whitelist so the open redirect here is blocked. - * $sceDelegateProvider.resourceUrlBlacklist([ - * 'http://myapp.example.com/clickThru**' - * ]); - * }); - * ``` - */ + scope.$digest(); + // the listener is always called during the first $digest loop after it was registered + expect(scope.counter).toEqual(1); -function $SceDelegateProvider() { - this.SCE_CONTEXTS = SCE_CONTEXTS; + scope.$digest(); + // but now it will not be called unless the value changes + expect(scope.counter).toEqual(1); - // Resource URLs can also be trusted by policy. - var resourceUrlWhitelist = ['self'], - resourceUrlBlacklist = []; + scope.name = 'adam'; + scope.$digest(); + expect(scope.counter).toEqual(2); + + + + // Using a function as a watchExpression + var food; + scope.foodCounter = 0; + expect(scope.foodCounter).toEqual(0); + scope.$watch( + // This function returns the value being watched. It is called for each turn of the $digest loop + function() { return food; }, + // This is the change listener, called when the value returned from the above function changes + function(newValue, oldValue) { + if ( newValue !== oldValue ) { + // Only increment the counter if the value changed + scope.foodCounter = scope.foodCounter + 1; + } + } + ); + // No digest has been run so the counter will be zero + expect(scope.foodCounter).toEqual(0); + + // Run the digest but since food has not changed count will still be zero + scope.$digest(); + expect(scope.foodCounter).toEqual(0); + + // Update food and run digest. Now the counter will increment + food = 'cheeseburger'; + scope.$digest(); + expect(scope.foodCounter).toEqual(1); + + * ``` + * + * + * + * @param {(function()|string)} watchExpression Expression that is evaluated on each + * {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers + * a call to the `listener`. + * + * - `string`: Evaluated as {@link guide/expression expression} + * - `function(scope)`: called with current `scope` as a parameter. + * @param {function(newVal, oldVal, scope)} listener Callback called whenever the value + * of `watchExpression` changes. + * + * - `newVal` contains the current value of the `watchExpression` + * - `oldVal` contains the previous value of the `watchExpression` + * - `scope` refers to the current scope + * @param {boolean=} [objectEquality=false] Compare for object equality using {@link angular.equals} instead of + * comparing for reference equality. + * @returns {function()} Returns a deregistration function for this listener. + */ + $watch: function (watchExp, listener, objectEquality, prettyPrintExpression) { + var get = $parse(watchExp); + + if (get.$$watchDelegate) { + return get.$$watchDelegate(this, listener, objectEquality, get, watchExp); + } + var scope = this, + array = scope.$$watchers, + watcher = { + fn: listener, + last: initWatchVal, + get: get, + exp: prettyPrintExpression || watchExp, + eq: !!objectEquality + }; + + lastDirtyWatch = null; + + if (!isFunction(listener)) { + watcher.fn = noop; + } + + if (!array) { + array = scope.$$watchers = []; + } + // we use unshift since we use a while loop in $digest for speed. + // the while loop reads in reverse order. + array.unshift(watcher); + incrementWatchersCount(this, 1); + + return function deregisterWatch() { + if (arrayRemove(array, watcher) >= 0) { + incrementWatchersCount(scope, -1); + } + lastDirtyWatch = null; + }; + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$watchGroup + * @kind function + * + * @description + * A variant of {@link ng.$rootScope.Scope#$watch $watch()} where it watches an array of `watchExpressions`. + * If any one expression in the collection changes the `listener` is executed. + * + * - The items in the `watchExpressions` array are observed via standard $watch operation and are examined on every + * call to $digest() to see if any items changes. + * - The `listener` is called whenever any expression in the `watchExpressions` array changes. + * + * @param {Array.} watchExpressions Array of expressions that will be individually + * watched using {@link ng.$rootScope.Scope#$watch $watch()} + * + * @param {function(newValues, oldValues, scope)} listener Callback called whenever the return value of any + * expression in `watchExpressions` changes + * The `newValues` array contains the current values of the `watchExpressions`, with the indexes matching + * those of `watchExpression` + * and the `oldValues` array contains the previous values of the `watchExpressions`, with the indexes matching + * those of `watchExpression` + * The `scope` refers to the current scope. + * @returns {function()} Returns a de-registration function for all listeners. + */ + $watchGroup: function (watchExpressions, listener) { + var oldValues = new Array(watchExpressions.length); + var newValues = new Array(watchExpressions.length); + var deregisterFns = []; + var self = this; + var changeReactionScheduled = false; + var firstRun = true; + + if (!watchExpressions.length) { + // No expressions means we call the listener ASAP + var shouldCall = true; + self.$evalAsync(function () { + if (shouldCall) listener(newValues, newValues, self); + }); + return function deregisterWatchGroup() { + shouldCall = false; + }; + } + + if (watchExpressions.length === 1) { + // Special case size of one + return this.$watch(watchExpressions[0], function watchGroupAction(value, oldValue, scope) { + newValues[0] = value; + oldValues[0] = oldValue; + listener(newValues, (value === oldValue) ? newValues : oldValues, scope); + }); + } + + forEach(watchExpressions, function (expr, i) { + var unwatchFn = self.$watch(expr, function watchGroupSubAction(value, oldValue) { + newValues[i] = value; + oldValues[i] = oldValue; + if (!changeReactionScheduled) { + changeReactionScheduled = true; + self.$evalAsync(watchGroupAction); + } + }); + deregisterFns.push(unwatchFn); + }); + + function watchGroupAction() { + changeReactionScheduled = false; + + if (firstRun) { + firstRun = false; + listener(newValues, newValues, self); + } else { + listener(newValues, oldValues, self); + } + } + + return function deregisterWatchGroup() { + while (deregisterFns.length) { + deregisterFns.shift()(); + } + }; + }, + + + /** + * @ngdoc method + * @name $rootScope.Scope#$watchCollection + * @kind function + * + * @description + * Shallow watches the properties of an object and fires whenever any of the properties change + * (for arrays, this implies watching the array items; for object maps, this implies watching + * the properties). If a change is detected, the `listener` callback is fired. + * + * - The `obj` collection is observed via standard $watch operation and is examined on every + * call to $digest() to see if any items have been added, removed, or moved. + * - The `listener` is called whenever anything within the `obj` has changed. Examples include + * adding, removing, and moving items belonging to an object or array. + * + * + * # Example + * ```js + $scope.names = ['igor', 'matias', 'misko', 'james']; + $scope.dataCount = 4; + + $scope.$watchCollection('names', function(newNames, oldNames) { + $scope.dataCount = newNames.length; + }); + + expect($scope.dataCount).toEqual(4); + $scope.$digest(); + + //still at 4 ... no changes + expect($scope.dataCount).toEqual(4); + + $scope.names.pop(); + $scope.$digest(); + + //now there's been a change + expect($scope.dataCount).toEqual(3); + * ``` + * + * + * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The + * expression value should evaluate to an object or an array which is observed on each + * {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the + * collection will trigger a call to the `listener`. + * + * @param {function(newCollection, oldCollection, scope)} listener a callback function called + * when a change is detected. + * - The `newCollection` object is the newly modified data obtained from the `obj` expression + * - The `oldCollection` object is a copy of the former collection data. + * Due to performance considerations, the`oldCollection` value is computed only if the + * `listener` function declares two or more arguments. + * - The `scope` argument refers to the current scope. + * + * @returns {function()} Returns a de-registration function for this listener. When the + * de-registration function is executed, the internal watch operation is terminated. + */ + $watchCollection: function (obj, listener) { + $watchCollectionInterceptor.$stateful = true; + + var self = this; + // the current value, updated on each dirty-check run + var newValue; + // a shallow copy of the newValue from the last dirty-check run, + // updated to match newValue during dirty-check run + var oldValue; + // a shallow copy of the newValue from when the last change happened + var veryOldValue; + // only track veryOldValue if the listener is asking for it + var trackVeryOldValue = (listener.length > 1); + var changeDetected = 0; + var changeDetector = $parse(obj, $watchCollectionInterceptor); + var internalArray = []; + var internalObject = {}; + var initRun = true; + var oldLength = 0; + + function $watchCollectionInterceptor(_value) { + newValue = _value; + var newLength, key, bothNaN, newItem, oldItem; + + // If the new value is undefined, then return undefined as the watch may be a one-time watch + if (isUndefined(newValue)) return; + + if (!isObject(newValue)) { // if primitive + if (oldValue !== newValue) { + oldValue = newValue; + changeDetected++; + } + } else if (isArrayLike(newValue)) { + if (oldValue !== internalArray) { + // we are transitioning from something which was not an array into array. + oldValue = internalArray; + oldLength = oldValue.length = 0; + changeDetected++; + } + + newLength = newValue.length; + + if (oldLength !== newLength) { + // if lengths do not match we need to trigger change notification + changeDetected++; + oldValue.length = oldLength = newLength; + } + // copy the items to oldValue and look for changes. + for (var i = 0; i < newLength; i++) { + oldItem = oldValue[i]; + newItem = newValue[i]; + + bothNaN = (oldItem !== oldItem) && (newItem !== newItem); + if (!bothNaN && (oldItem !== newItem)) { + changeDetected++; + oldValue[i] = newItem; + } + } + } else { + if (oldValue !== internalObject) { + // we are transitioning from something which was not an object into object. + oldValue = internalObject = {}; + oldLength = 0; + changeDetected++; + } + // copy the items to oldValue and look for changes. + newLength = 0; + for (key in newValue) { + if (hasOwnProperty.call(newValue, key)) { + newLength++; + newItem = newValue[key]; + oldItem = oldValue[key]; + + if (key in oldValue) { + bothNaN = (oldItem !== oldItem) && (newItem !== newItem); + if (!bothNaN && (oldItem !== newItem)) { + changeDetected++; + oldValue[key] = newItem; + } + } else { + oldLength++; + oldValue[key] = newItem; + changeDetected++; + } + } + } + if (oldLength > newLength) { + // we used to have more keys, need to find them and destroy them. + changeDetected++; + for (key in oldValue) { + if (!hasOwnProperty.call(newValue, key)) { + oldLength--; + delete oldValue[key]; + } + } + } + } + return changeDetected; + } + + function $watchCollectionAction() { + if (initRun) { + initRun = false; + listener(newValue, newValue, self); + } else { + listener(newValue, veryOldValue, self); + } + + // make a copy for the next time a collection is changed + if (trackVeryOldValue) { + if (!isObject(newValue)) { + //primitive + veryOldValue = newValue; + } else if (isArrayLike(newValue)) { + veryOldValue = new Array(newValue.length); + for (var i = 0; i < newValue.length; i++) { + veryOldValue[i] = newValue[i]; + } + } else { // if object + veryOldValue = {}; + for (var key in newValue) { + if (hasOwnProperty.call(newValue, key)) { + veryOldValue[key] = newValue[key]; + } + } + } + } + } + + return this.$watch(changeDetector, $watchCollectionAction); + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$digest + * @kind function + * + * @description + * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and + * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change + * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers} + * until no more listeners are firing. This means that it is possible to get into an infinite + * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of + * iterations exceeds 10. + * + * Usually, you don't call `$digest()` directly in + * {@link ng.directive:ngController controllers} or in + * {@link ng.$compileProvider#directive directives}. + * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within + * a {@link ng.$compileProvider#directive directive}), which will force a `$digest()`. + * + * If you want to be notified whenever `$digest()` is called, + * you can register a `watchExpression` function with + * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`. + * + * In unit tests, you may need to call `$digest()` to simulate the scope life cycle. + * + * # Example + * ```js + var scope = ...; + scope.name = 'misko'; + scope.counter = 0; + + expect(scope.counter).toEqual(0); + scope.$watch('name', function(newValue, oldValue) { + scope.counter = scope.counter + 1; + }); + expect(scope.counter).toEqual(0); + + scope.$digest(); + // the listener is always called during the first $digest loop after it was registered + expect(scope.counter).toEqual(1); + + scope.$digest(); + // but now it will not be called unless the value changes + expect(scope.counter).toEqual(1); + + scope.name = 'adam'; + scope.$digest(); + expect(scope.counter).toEqual(2); + * ``` + * + */ + $digest: function () { + var watch, value, last, fn, get, + watchers, + length, + dirty, ttl = TTL, + next, current, target = this, + watchLog = [], + logIdx, asyncTask; + + beginPhase('$digest'); + // Check for changes to browser url that happened in sync before the call to $digest + $browser.$$checkUrlChange(); + + if (this === $rootScope && applyAsyncId !== null) { + // If this is the root scope, and $applyAsync has scheduled a deferred $apply(), then + // cancel the scheduled $apply and flush the queue of expressions to be evaluated. + $browser.defer.cancel(applyAsyncId); + flushApplyAsync(); + } + + lastDirtyWatch = null; + + do { // "while dirty" loop + dirty = false; + current = target; + + while (asyncQueue.length) { + try { + asyncTask = asyncQueue.shift(); + asyncTask.scope.$eval(asyncTask.expression, asyncTask.locals); + } catch (e) { + $exceptionHandler(e); + } + lastDirtyWatch = null; + } + + traverseScopesLoop: + do { // "traverse the scopes" loop + if ((watchers = current.$$watchers)) { + // process our watches + length = watchers.length; + while (length--) { + try { + watch = watchers[length]; + // Most common watches are on primitives, in which case we can short + // circuit it with === operator, only when === fails do we use .equals + if (watch) { + get = watch.get; + if ((value = get(current)) !== (last = watch.last) && + !(watch.eq + ? equals(value, last) + : (typeof value === 'number' && typeof last === 'number' + && isNaN(value) && isNaN(last)))) { + dirty = true; + lastDirtyWatch = watch; + watch.last = watch.eq ? copy(value, null) : value; + fn = watch.fn; + fn(value, ((last === initWatchVal) ? value : last), current); + if (ttl < 5) { + logIdx = 4 - ttl; + if (!watchLog[logIdx]) watchLog[logIdx] = []; + watchLog[logIdx].push({ + msg: isFunction(watch.exp) ? 'fn: ' + (watch.exp.name || watch.exp.toString()) : watch.exp, + newVal: value, + oldVal: last + }); + } + } else if (watch === lastDirtyWatch) { + // If the most recently dirty watcher is now clean, short circuit since the remaining watchers + // have already been tested. + dirty = false; + break traverseScopesLoop; + } + } + } catch (e) { + $exceptionHandler(e); + } + } + } + + // Insanity Warning: scope depth-first traversal + // yes, this code is a bit crazy, but it works and we have tests to prove it! + // this piece should be kept in sync with the traversal in $broadcast + if (!(next = ((current.$$watchersCount && current.$$childHead) || + (current !== target && current.$$nextSibling)))) { + while (current !== target && !(next = current.$$nextSibling)) { + current = current.$parent; + } + } + } while ((current = next)); + + // `break traverseScopesLoop;` takes us to here + + if ((dirty || asyncQueue.length) && !(ttl--)) { + clearPhase(); + throw $rootScopeMinErr('infdig', + '{0} $digest() iterations reached. Aborting!\n' + + 'Watchers fired in the last 5 iterations: {1}', + TTL, watchLog); + } + + } while (dirty || asyncQueue.length); + + clearPhase(); + + while (postDigestQueue.length) { + try { + postDigestQueue.shift()(); + } catch (e) { + $exceptionHandler(e); + } + } + }, + + + /** + * @ngdoc event + * @name $rootScope.Scope#$destroy + * @eventType broadcast on scope being destroyed + * + * @description + * Broadcasted when a scope and its children are being destroyed. + * + * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to + * clean up DOM bindings before an element is removed from the DOM. + */ + + /** + * @ngdoc method + * @name $rootScope.Scope#$destroy + * @kind function + * + * @description + * Removes the current scope (and all of its children) from the parent scope. Removal implies + * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer + * propagate to the current scope and its children. Removal also implies that the current + * scope is eligible for garbage collection. + * + * The `$destroy()` is usually used by directives such as + * {@link ng.directive:ngRepeat ngRepeat} for managing the + * unrolling of the loop. + * + * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope. + * Application code can register a `$destroy` event handler that will give it a chance to + * perform any necessary cleanup. + * + * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to + * clean up DOM bindings before an element is removed from the DOM. + */ + $destroy: function () { + // We can't destroy a scope that has been already destroyed. + if (this.$$destroyed) return; + var parent = this.$parent; + + this.$broadcast('$destroy'); + this.$$destroyed = true; + + if (this === $rootScope) { + //Remove handlers attached to window when $rootScope is removed + $browser.$$applicationDestroyed(); + } + + incrementWatchersCount(this, -this.$$watchersCount); + for (var eventName in this.$$listenerCount) { + decrementListenerCount(this, this.$$listenerCount[eventName], eventName); + } + + // sever all the references to parent scopes (after this cleanup, the current scope should + // not be retained by any of our references and should be eligible for garbage collection) + if (parent && parent.$$childHead == this) parent.$$childHead = this.$$nextSibling; + if (parent && parent.$$childTail == this) parent.$$childTail = this.$$prevSibling; + if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling; + if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling; + + // Disable listeners, watchers and apply/digest methods + this.$destroy = this.$digest = this.$apply = this.$evalAsync = this.$applyAsync = noop; + this.$on = this.$watch = this.$watchGroup = function () { + return noop; + }; + this.$$listeners = {}; + + // Disconnect the next sibling to prevent `cleanUpScope` destroying those too + this.$$nextSibling = null; + cleanUpScope(this); + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$eval + * @kind function + * + * @description + * Executes the `expression` on the current scope and returns the result. Any exceptions in + * the expression are propagated (uncaught). This is useful when evaluating Angular + * expressions. + * + * # Example + * ```js + var scope = ng.$rootScope.Scope(); + scope.a = 1; + scope.b = 2; + + expect(scope.$eval('a+b')).toEqual(3); + expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3); + * ``` + * + * @param {(string|function())=} expression An angular expression to be executed. + * + * - `string`: execute using the rules as defined in {@link guide/expression expression}. + * - `function(scope)`: execute the function with the current `scope` parameter. + * + * @param {(object)=} locals Local variables object, useful for overriding values in scope. + * @returns {*} The result of evaluating the expression. + */ + $eval: function (expr, locals) { + return $parse(expr)(this, locals); + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$evalAsync + * @kind function + * + * @description + * Executes the expression on the current scope at a later point in time. + * + * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only + * that: + * + * - it will execute after the function that scheduled the evaluation (preferably before DOM + * rendering). + * - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after + * `expression` execution. + * + * Any exceptions from the execution of the expression are forwarded to the + * {@link ng.$exceptionHandler $exceptionHandler} service. + * + * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle + * will be scheduled. However, it is encouraged to always call code that changes the model + * from within an `$apply` call. That includes code evaluated via `$evalAsync`. + * + * @param {(string|function())=} expression An angular expression to be executed. + * + * - `string`: execute using the rules as defined in {@link guide/expression expression}. + * - `function(scope)`: execute the function with the current `scope` parameter. + * + * @param {(object)=} locals Local variables object, useful for overriding values in scope. + */ + $evalAsync: function (expr, locals) { + // if we are outside of an $digest loop and this is the first time we are scheduling async + // task also schedule async auto-flush + if (!$rootScope.$$phase && !asyncQueue.length) { + $browser.defer(function () { + if (asyncQueue.length) { + $rootScope.$digest(); + } + }); + } + + asyncQueue.push({scope: this, expression: $parse(expr), locals: locals}); + }, + + $$postDigest: function (fn) { + postDigestQueue.push(fn); + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$apply + * @kind function + * + * @description + * `$apply()` is used to execute an expression in angular from outside of the angular + * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries). + * Because we are calling into the angular framework we need to perform proper scope life + * cycle of {@link ng.$exceptionHandler exception handling}, + * {@link ng.$rootScope.Scope#$digest executing watches}. + * + * ## Life cycle + * + * # Pseudo-Code of `$apply()` + * ```js + function $apply(expr) { + try { + return $eval(expr); + } catch (e) { + $exceptionHandler(e); + } finally { + $root.$digest(); + } + } + * ``` + * + * + * Scope's `$apply()` method transitions through the following stages: + * + * 1. The {@link guide/expression expression} is executed using the + * {@link ng.$rootScope.Scope#$eval $eval()} method. + * 2. Any exceptions from the execution of the expression are forwarded to the + * {@link ng.$exceptionHandler $exceptionHandler} service. + * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the + * expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method. + * + * + * @param {(string|function())=} exp An angular expression to be executed. + * + * - `string`: execute using the rules as defined in {@link guide/expression expression}. + * - `function(scope)`: execute the function with current `scope` parameter. + * + * @returns {*} The result of evaluating the expression. + */ + $apply: function (expr) { + try { + beginPhase('$apply'); + try { + return this.$eval(expr); + } finally { + clearPhase(); + } + } catch (e) { + $exceptionHandler(e); + } finally { + try { + $rootScope.$digest(); + } catch (e) { + $exceptionHandler(e); + throw e; + } + } + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$applyAsync + * @kind function + * + * @description + * Schedule the invocation of $apply to occur at a later time. The actual time difference + * varies across browsers, but is typically around ~10 milliseconds. + * + * This can be used to queue up multiple expressions which need to be evaluated in the same + * digest. + * + * @param {(string|function())=} exp An angular expression to be executed. + * + * - `string`: execute using the rules as defined in {@link guide/expression expression}. + * - `function(scope)`: execute the function with current `scope` parameter. + */ + $applyAsync: function (expr) { + var scope = this; + expr && applyAsyncQueue.push($applyAsyncExpression); + expr = $parse(expr); + scheduleApplyAsync(); + + function $applyAsyncExpression() { + scope.$eval(expr); + } + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$on + * @kind function + * + * @description + * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for + * discussion of event life cycle. + * + * The event listener function format is: `function(event, args...)`. The `event` object + * passed into the listener has the following attributes: + * + * - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or + * `$broadcast`-ed. + * - `currentScope` - `{Scope}`: the scope that is currently handling the event. Once the + * event propagates through the scope hierarchy, this property is set to null. + * - `name` - `{string}`: name of the event. + * - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel + * further event propagation (available only for events that were `$emit`-ed). + * - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag + * to true. + * - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called. + * + * @param {string} name Event name to listen on. + * @param {function(event, ...args)} listener Function to call when the event is emitted. + * @returns {function()} Returns a deregistration function for this listener. + */ + $on: function (name, listener) { + var namedListeners = this.$$listeners[name]; + if (!namedListeners) { + this.$$listeners[name] = namedListeners = []; + } + namedListeners.push(listener); + + var current = this; + do { + if (!current.$$listenerCount[name]) { + current.$$listenerCount[name] = 0; + } + current.$$listenerCount[name]++; + } while ((current = current.$parent)); + + var self = this; + return function () { + var indexOfListener = namedListeners.indexOf(listener); + if (indexOfListener !== -1) { + namedListeners[indexOfListener] = null; + decrementListenerCount(self, 1, name); + } + }; + }, + + + /** + * @ngdoc method + * @name $rootScope.Scope#$emit + * @kind function + * + * @description + * Dispatches an event `name` upwards through the scope hierarchy notifying the + * registered {@link ng.$rootScope.Scope#$on} listeners. + * + * The event life cycle starts at the scope on which `$emit` was called. All + * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get + * notified. Afterwards, the event traverses upwards toward the root scope and calls all + * registered listeners along the way. The event will stop propagating if one of the listeners + * cancels it. + * + * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed + * onto the {@link ng.$exceptionHandler $exceptionHandler} service. + * + * @param {string} name Event name to emit. + * @param {...*} args Optional one or more arguments which will be passed onto the event listeners. + * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}). + */ + $emit: function (name, args) { + var empty = [], + namedListeners, + scope = this, + stopPropagation = false, + event = { + name: name, + targetScope: scope, + stopPropagation: function () { + stopPropagation = true; + }, + preventDefault: function () { + event.defaultPrevented = true; + }, + defaultPrevented: false + }, + listenerArgs = concat([event], arguments, 1), + i, length; + + do { + namedListeners = scope.$$listeners[name] || empty; + event.currentScope = scope; + for (i = 0, length = namedListeners.length; i < length; i++) { + + // if listeners were deregistered, defragment the array + if (!namedListeners[i]) { + namedListeners.splice(i, 1); + i--; + length--; + continue; + } + try { + //allow all listeners attached to the current scope to run + namedListeners[i].apply(null, listenerArgs); + } catch (e) { + $exceptionHandler(e); + } + } + //if any listener on the current scope stops propagation, prevent bubbling + if (stopPropagation) { + event.currentScope = null; + return event; + } + //traverse upwards + scope = scope.$parent; + } while (scope); + + event.currentScope = null; + + return event; + }, + + + /** + * @ngdoc method + * @name $rootScope.Scope#$broadcast + * @kind function + * + * @description + * Dispatches an event `name` downwards to all child scopes (and their children) notifying the + * registered {@link ng.$rootScope.Scope#$on} listeners. + * + * The event life cycle starts at the scope on which `$broadcast` was called. All + * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get + * notified. Afterwards, the event propagates to all direct and indirect scopes of the current + * scope and calls all registered listeners along the way. The event cannot be canceled. + * + * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed + * onto the {@link ng.$exceptionHandler $exceptionHandler} service. + * + * @param {string} name Event name to broadcast. + * @param {...*} args Optional one or more arguments which will be passed onto the event listeners. + * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on} + */ + $broadcast: function (name, args) { + var target = this, + current = target, + next = target, + event = { + name: name, + targetScope: target, + preventDefault: function () { + event.defaultPrevented = true; + }, + defaultPrevented: false + }; + + if (!target.$$listenerCount[name]) return event; + + var listenerArgs = concat([event], arguments, 1), + listeners, i, length; + + //down while you can, then up and next sibling or up and next sibling until back at root + while ((current = next)) { + event.currentScope = current; + listeners = current.$$listeners[name] || []; + for (i = 0, length = listeners.length; i < length; i++) { + // if listeners were deregistered, defragment the array + if (!listeners[i]) { + listeners.splice(i, 1); + i--; + length--; + continue; + } + + try { + listeners[i].apply(null, listenerArgs); + } catch (e) { + $exceptionHandler(e); + } + } + + // Insanity Warning: scope depth-first traversal + // yes, this code is a bit crazy, but it works and we have tests to prove it! + // this piece should be kept in sync with the traversal in $digest + // (though it differs due to having the extra check for $$listenerCount) + if (!(next = ((current.$$listenerCount[name] && current.$$childHead) || + (current !== target && current.$$nextSibling)))) { + while (current !== target && !(next = current.$$nextSibling)) { + current = current.$parent; + } + } + } + + event.currentScope = null; + return event; + } + }; - /** - * @ngdoc method - * @name $sceDelegateProvider#resourceUrlWhitelist - * @kind function - * - * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value - * provided. This must be an array or null. A snapshot of this array is used so further - * changes to the array are ignored. - * - * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items - * allowed in this array. - * - *
- * **Note:** an empty whitelist array will block all URLs! - *
- * - * @return {Array} the currently set whitelist array. - * - * The **default value** when no whitelist has been explicitly set is `['self']` allowing only - * same origin resource requests. - * - * @description - * Sets/Gets the whitelist of trusted resource URLs. - */ - this.resourceUrlWhitelist = function(value) { - if (arguments.length) { - resourceUrlWhitelist = adjustMatchers(value); - } - return resourceUrlWhitelist; - }; + var $rootScope = new Scope(); - /** - * @ngdoc method - * @name $sceDelegateProvider#resourceUrlBlacklist - * @kind function - * - * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value - * provided. This must be an array or null. A snapshot of this array is used so further - * changes to the array are ignored. - * - * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items - * allowed in this array. - * - * The typical usage for the blacklist is to **block - * [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as - * these would otherwise be trusted but actually return content from the redirected domain. - * - * Finally, **the blacklist overrides the whitelist** and has the final say. - * - * @return {Array} the currently set blacklist array. - * - * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there - * is no blacklist.) - * - * @description - * Sets/Gets the blacklist of trusted resource URLs. - */ + //The internal queues. Expose them on the $rootScope for debugging/testing purposes. + var asyncQueue = $rootScope.$$asyncQueue = []; + var postDigestQueue = $rootScope.$$postDigestQueue = []; + var applyAsyncQueue = $rootScope.$$applyAsyncQueue = []; - this.resourceUrlBlacklist = function(value) { - if (arguments.length) { - resourceUrlBlacklist = adjustMatchers(value); - } - return resourceUrlBlacklist; - }; + return $rootScope; - this.$get = ['$injector', function($injector) { - var htmlSanitizer = function htmlSanitizer(html) { - throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.'); - }; + function beginPhase(phase) { + if ($rootScope.$$phase) { + throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase); + } - if ($injector.has('$sanitize')) { - htmlSanitizer = $injector.get('$sanitize'); - } + $rootScope.$$phase = phase; + } + function clearPhase() { + $rootScope.$$phase = null; + } - function matchUrl(matcher, parsedUrl) { - if (matcher === 'self') { - return urlIsSameOrigin(parsedUrl); - } else { - // definitely a regex. See adjustMatchers() - return !!matcher.exec(parsedUrl.href); - } - } + function incrementWatchersCount(current, count) { + do { + current.$$watchersCount += count; + } while ((current = current.$parent)); + } - function isResourceUrlAllowedByPolicy(url) { - var parsedUrl = urlResolve(url.toString()); - var i, n, allowed = false; - // Ensure that at least one item from the whitelist allows this url. - for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) { - if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) { - allowed = true; - break; - } - } - if (allowed) { - // Ensure that no item from the blacklist blocked this url. - for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) { - if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) { - allowed = false; - break; - } - } - } - return allowed; - } + function decrementListenerCount(current, count, name) { + do { + current.$$listenerCount[name] -= count; - function generateHolderType(Base) { - var holderType = function TrustedValueHolderType(trustedValue) { - this.$$unwrapTrustedValue = function() { - return trustedValue; - }; - }; - if (Base) { - holderType.prototype = new Base(); - } - holderType.prototype.valueOf = function sceValueOf() { - return this.$$unwrapTrustedValue(); - }; - holderType.prototype.toString = function sceToString() { - return this.$$unwrapTrustedValue().toString(); - }; - return holderType; - } + if (current.$$listenerCount[name] === 0) { + delete current.$$listenerCount[name]; + } + } while ((current = current.$parent)); + } - var trustedValueHolderBase = generateHolderType(), - byType = {}; + /** + * function used as an initial value for watchers. + * because it's unique we can easily tell it apart from other values + */ + function initWatchVal() { + } - byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase); - byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase); - byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase); - byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase); - byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]); + function flushApplyAsync() { + while (applyAsyncQueue.length) { + try { + applyAsyncQueue.shift()(); + } catch (e) { + $exceptionHandler(e); + } + } + applyAsyncId = null; + } - /** - * @ngdoc method - * @name $sceDelegate#trustAs - * - * @description - * Returns an object that is trusted by angular for use in specified strict - * contextual escaping contexts (such as ng-bind-html, ng-include, any src - * attribute interpolation, any dom event binding attribute interpolation - * such as for onclick, etc.) that uses the provided value. - * See {@link ng.$sce $sce} for enabling strict contextual escaping. - * - * @param {string} type The kind of context in which this value is safe for use. e.g. url, - * resourceUrl, html, js and css. - * @param {*} value The value that that should be considered trusted/safe. - * @returns {*} A value that can be used to stand in for the provided `value` in places - * where Angular expects a $sce.trustAs() return value. - */ - function trustAs(type, trustedValue) { - var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null); - if (!Constructor) { - throw $sceMinErr('icontext', - 'Attempted to trust a value in invalid context. Context: {0}; Value: {1}', - type, trustedValue); - } - if (trustedValue === null || isUndefined(trustedValue) || trustedValue === '') { - return trustedValue; - } - // All the current contexts in SCE_CONTEXTS happen to be strings. In order to avoid trusting - // mutable objects, we ensure here that the value passed in is actually a string. - if (typeof trustedValue !== 'string') { - throw $sceMinErr('itype', - 'Attempted to trust a non-string value in a content requiring a string: Context: {0}', - type); - } - return new Constructor(trustedValue); + function scheduleApplyAsync() { + if (applyAsyncId === null) { + applyAsyncId = $browser.defer(function () { + $rootScope.$apply(flushApplyAsync); + }); + } + } + }]; } /** - * @ngdoc method - * @name $sceDelegate#valueOf + * @ngdoc service + * @name $rootElement * * @description - * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs - * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link - * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. - * - * If the passed parameter is not a value that had been returned by {@link - * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, returns it as-is. - * - * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} - * call or anything else. - * @returns {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs - * `$sceDelegate.trustAs`} if `value` is the result of such a call. Otherwise, returns - * `value` unchanged. + * The root element of Angular application. This is either the element where {@link + * ng.directive:ngApp ngApp} was declared or the element passed into + * {@link angular.bootstrap}. The element represents the root element of application. It is also the + * location where the application's {@link auto.$injector $injector} service gets + * published, and can be retrieved using `$rootElement.injector()`. */ - function valueOf(maybeTrusted) { - if (maybeTrusted instanceof trustedValueHolderBase) { - return maybeTrusted.$$unwrapTrustedValue(); - } else { - return maybeTrusted; - } - } + + +// the implementation is in angular.bootstrap /** - * @ngdoc method - * @name $sceDelegate#getTrusted - * * @description - * Takes the result of a {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call and - * returns the originally supplied value if the queried context type is a supertype of the - * created type. If this condition isn't satisfied, throws an exception. - * - *
- * Disabling auto-escaping is extremely dangerous, it usually creates a Cross Site Scripting - * (XSS) vulnerability in your application. - *
- * - * @param {string} type The kind of context in which this value is to be used. - * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs - * `$sceDelegate.trustAs`} call. - * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#trustAs - * `$sceDelegate.trustAs`} if valid in this context. Otherwise, throws an exception. + * Private service to sanitize uris for links and images. Used by $compile and $sanitize. */ - function getTrusted(type, maybeTrusted) { - if (maybeTrusted === null || isUndefined(maybeTrusted) || maybeTrusted === '') { - return maybeTrusted; - } - var constructor = (byType.hasOwnProperty(type) ? byType[type] : null); - if (constructor && maybeTrusted instanceof constructor) { - return maybeTrusted.$$unwrapTrustedValue(); - } - // If we get here, then we may only take one of two actions. - // 1. sanitize the value for the requested type, or - // 2. throw an exception. - if (type === SCE_CONTEXTS.RESOURCE_URL) { - if (isResourceUrlAllowedByPolicy(maybeTrusted)) { - return maybeTrusted; - } else { - throw $sceMinErr('insecurl', - 'Blocked loading resource from url not allowed by $sceDelegate policy. URL: {0}', - maybeTrusted.toString()); - } - } else if (type === SCE_CONTEXTS.HTML) { - return htmlSanitizer(maybeTrusted); - } - throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.'); - } - - return { trustAs: trustAs, - getTrusted: getTrusted, - valueOf: valueOf }; - }]; -} + function $$SanitizeUriProvider() { + var aHrefSanitizationWhitelist = /^\s*(https?|ftp|mailto|tel|file):/, + imgSrcSanitizationWhitelist = /^\s*((https?|ftp|file|blob):|data:image\/)/; + /** + * @description + * Retrieves or overrides the default regular expression that is used for whitelisting of safe + * urls during a[href] sanitization. + * + * The sanitization is a security measure aimed at prevent XSS attacks via html links. + * + * Any url about to be assigned to a[href] via data-binding is first normalized and turned into + * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist` + * regular expression. If a match is found, the original url is written into the dom. Otherwise, + * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. + * + * @param {RegExp=} regexp New regexp to whitelist urls with. + * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for + * chaining otherwise. + */ + this.aHrefSanitizationWhitelist = function (regexp) { + if (isDefined(regexp)) { + aHrefSanitizationWhitelist = regexp; + return this; + } + return aHrefSanitizationWhitelist; + }; -/** - * @ngdoc provider - * @name $sceProvider - * @description - * - * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service. - * - enable/disable Strict Contextual Escaping (SCE) in a module - * - override the default implementation with a custom delegate - * - * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}. - */ -/* jshint maxlen: false*/ + /** + * @description + * Retrieves or overrides the default regular expression that is used for whitelisting of safe + * urls during img[src] sanitization. + * + * The sanitization is a security measure aimed at prevent XSS attacks via html links. + * + * Any url about to be assigned to img[src] via data-binding is first normalized and turned into + * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist` + * regular expression. If a match is found, the original url is written into the dom. Otherwise, + * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. + * + * @param {RegExp=} regexp New regexp to whitelist urls with. + * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for + * chaining otherwise. + */ + this.imgSrcSanitizationWhitelist = function (regexp) { + if (isDefined(regexp)) { + imgSrcSanitizationWhitelist = regexp; + return this; + } + return imgSrcSanitizationWhitelist; + }; -/** - * @ngdoc service - * @name $sce - * @kind function - * - * @description - * - * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS. - * - * # Strict Contextual Escaping - * - * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain - * contexts to result in a value that is marked as safe to use for that context. One example of - * such a context is binding arbitrary html controlled by the user via `ng-bind-html`. We refer - * to these contexts as privileged or SCE contexts. - * - * As of version 1.2, Angular ships with SCE enabled by default. - * - * Note: When enabled (the default), IE<11 in quirks mode is not supported. In this mode, IE<11 allow - * one to execute arbitrary javascript by the use of the expression() syntax. Refer - * to learn more about them. - * You can ensure your document is in standards mode and not quirks mode by adding `` - * to the top of your HTML document. - * - * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for - * security vulnerabilities such as XSS, clickjacking, etc. a lot easier. - * - * Here's an example of a binding in a privileged context: - * - * ``` - * - *
- * ``` - * - * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user. With SCE - * disabled, this application allows the user to render arbitrary HTML into the DIV. - * In a more realistic example, one may be rendering user comments, blog articles, etc. via - * bindings. (HTML is just one example of a context where rendering user controlled input creates - * security vulnerabilities.) - * - * For the case of HTML, you might use a library, either on the client side, or on the server side, - * to sanitize unsafe HTML before binding to the value and rendering it in the document. - * - * How would you ensure that every place that used these types of bindings was bound to a value that - * was sanitized by your library (or returned as safe for rendering by your server?) How can you - * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some - * properties/fields and forgot to update the binding to the sanitized value? - * - * To be secure by default, you want to ensure that any such bindings are disallowed unless you can - * determine that something explicitly says it's safe to use a value for binding in that - * context. You can then audit your code (a simple grep would do) to ensure that this is only done - * for those values that you can easily tell are safe - because they were received from your server, - * sanitized by your library, etc. You can organize your codebase to help with this - perhaps - * allowing only the files in a specific directory to do this. Ensuring that the internal API - * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task. - * - * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs} - * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to - * obtain values that will be accepted by SCE / privileged contexts. - * - * - * ## How does it work? - * - * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted - * $sce.getTrusted(context, value)} rather than to the value directly. Directives use {@link - * ng.$sce#parseAs $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the - * {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals. - * - * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link - * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}. Here's the actual code (slightly - * simplified): - * - * ``` - * var ngBindHtmlDirective = ['$sce', function($sce) { - * return function(scope, element, attr) { - * scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) { - * element.html(value || ''); - * }); - * }; - * }]; - * ``` - * - * ## Impact on loading templates - * - * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as - * `templateUrl`'s specified by {@link guide/directive directives}. - * - * By default, Angular only loads templates from the same domain and protocol as the application - * document. This is done by calling {@link ng.$sce#getTrustedResourceUrl - * $sce.getTrustedResourceUrl} on the template URL. To load templates from other domains and/or - * protocols, you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist - * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value. - * - * *Please note*: - * The browser's - * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest) - * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/) - * policy apply in addition to this and may further restrict whether the template is successfully - * loaded. This means that without the right CORS policy, loading templates from a different domain - * won't work on all browsers. Also, loading templates from `file://` URL does not work on some - * browsers. - * - * ## This feels like too much overhead - * - * It's important to remember that SCE only applies to interpolation expressions. - * - * If your expressions are constant literals, they're automatically trusted and you don't need to - * call `$sce.trustAs` on them (remember to include the `ngSanitize` module) (e.g. - * `
`) just works. - * - * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them - * through {@link ng.$sce#getTrusted $sce.getTrusted}. SCE doesn't play a role here. - * - * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load - * templates in `ng-include` from your application's domain without having to even know about SCE. - * It blocks loading templates from other domains or loading templates over http from an https - * served document. You can change these by setting your own custom {@link - * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link - * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs. - * - * This significantly reduces the overhead. It is far easier to pay the small overhead and have an - * application that's secure and can be audited to verify that with much more ease than bolting - * security onto an application later. - * - * - * ## What trusted context types are supported? - * - * | Context | Notes | - * |---------------------|----------------| - * | `$sce.HTML` | For HTML that's safe to source into the application. The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered and the {@link ngSanitize $sanitize} module is present this will sanitize the value instead of throwing an error. | - * | `$sce.CSS` | For CSS that's safe to source into the application. Currently unused. Feel free to use it in your own directives. | - * | `$sce.URL` | For URLs that are safe to follow as links. Currently unused (`
Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. | - * | `$sce.JS` | For JavaScript that is safe to execute in your application's context. Currently unused. Feel free to use it in your own directives. | - * - * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} - * - * Each element in these arrays must be one of the following: - * - * - **'self'** - * - The special **string**, `'self'`, can be used to match against all URLs of the **same - * domain** as the application document using the **same protocol**. - * - **String** (except the special value `'self'`) - * - The string is matched against the full *normalized / absolute URL* of the resource - * being tested (substring matches are not good enough.) - * - There are exactly **two wildcard sequences** - `*` and `**`. All other characters - * match themselves. - * - `*`: matches zero or more occurrences of any character other than one of the following 6 - * characters: '`:`', '`/`', '`.`', '`?`', '`&`' and '`;`'. It's a useful wildcard for use - * in a whitelist. - * - `**`: matches zero or more occurrences of *any* character. As such, it's not - * appropriate for use in a scheme, domain, etc. as it would match too much. (e.g. - * http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might - * not have been the intention.) Its usage at the very end of the path is ok. (e.g. - * http://foo.example.com/templates/**). - * - **RegExp** (*see caveat below*) - * - *Caveat*: While regular expressions are powerful and offer great flexibility, their syntax - * (and all the inevitable escaping) makes them *harder to maintain*. It's easy to - * accidentally introduce a bug when one updates a complex expression (imho, all regexes should - * have good test coverage). For instance, the use of `.` in the regex is correct only in a - * small number of cases. A `.` character in the regex used when matching the scheme or a - * subdomain could be matched against a `:` or literal `.` that was likely not intended. It - * is highly recommended to use the string patterns and only fall back to regular expressions - * as a last resort. - * - The regular expression must be an instance of RegExp (i.e. not a string.) It is - * matched against the **entire** *normalized / absolute URL* of the resource being tested - * (even when the RegExp did not have the `^` and `$` codes.) In addition, any flags - * present on the RegExp (such as multiline, global, ignoreCase) are ignored. - * - If you are generating your JavaScript from some other templating engine (not - * recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)), - * remember to escape your regular expression (and be aware that you might need more than - * one level of escaping depending on your templating engine and the way you interpolated - * the value.) Do make use of your platform's escaping mechanism as it might be good - * enough before coding your own. E.g. Ruby has - * [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape) - * and Python has [re.escape](http://docs.python.org/library/re.html#re.escape). - * Javascript lacks a similar built in function for escaping. Take a look at Google - * Closure library's [goog.string.regExpEscape(s)]( - * http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962). - * - * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example. - * - * ## Show me an example using SCE. - * - * - * - *
- *

- * User comments
- * By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when - * $sanitize is available. If $sanitize isn't available, this results in an error instead of an - * exploit. - *
- *
- * {{userComment.name}}: - * - *
- *
- *
- *
- * - * - * - * angular.module('mySceApp', ['ngSanitize']) - * .controller('AppController', ['$http', '$templateCache', '$sce', - * function($http, $templateCache, $sce) { - * var self = this; - * $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) { - * self.userComments = userComments; - * }); - * self.explicitlyTrustedHtml = $sce.trustAsHtml( - * 'Hover over this text.'); - * }]); - * - * - * - * [ - * { "name": "Alice", - * "htmlComment": - * "Is anyone reading this?" - * }, - * { "name": "Bob", - * "htmlComment": "Yes! Am I the only other one?" - * } - * ] - * - * - * - * describe('SCE doc demo', function() { - * it('should sanitize untrusted values', function() { - * expect(element.all(by.css('.htmlComment')).first().getInnerHtml()) - * .toBe('Is anyone reading this?'); - * }); - * - * it('should NOT sanitize explicitly trusted values', function() { - * expect(element(by.id('explicitlyTrustedHtml')).getInnerHtml()).toBe( - * 'Hover over this text.'); - * }); - * }); - * - * - * - * - * - * ## Can I disable SCE completely? - * - * Yes, you can. However, this is strongly discouraged. SCE gives you a lot of security benefits - * for little coding overhead. It will be much harder to take an SCE disabled application and - * either secure it on your own or enable SCE at a later stage. It might make sense to disable SCE - * for cases where you have a lot of existing code that was written before SCE was introduced and - * you're migrating them a module at a time. - * - * That said, here's how you can completely disable SCE: - * - * ``` - * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) { - * // Completely disable SCE. For demonstration purposes only! - * // Do not use in new projects. - * $sceProvider.enabled(false); - * }); - * ``` - * - */ -/* jshint maxlen: 100 */ + this.$get = function () { + return function sanitizeUri(uri, isImage) { + var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist; + var normalizedVal; + normalizedVal = urlResolve(uri).href; + if (normalizedVal !== '' && !normalizedVal.match(regex)) { + return 'unsafe:' + normalizedVal; + } + return uri; + }; + }; + } -function $SceProvider() { - var enabled = true; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Any commits to this file should be reviewed with security in mind. * + * Changes to this file can potentially create security vulnerabilities. * + * An approval from 2 Core members with history of modifying * + * this file is required. * + * * + * Does the change somehow allow for arbitrary javascript to be executed? * + * Or allows for someone to change the prototype of built-in objects? * + * Or gives undesired access to variables likes document or window? * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - /** - * @ngdoc method - * @name $sceProvider#enabled - * @kind function - * - * @param {boolean=} value If provided, then enables/disables SCE. - * @return {boolean} true if SCE is enabled, false otherwise. - * - * @description - * Enables/disables SCE and returns the current value. - */ - this.enabled = function(value) { - if (arguments.length) { - enabled = !!value; - } - return enabled; - }; + var $sceMinErr = minErr('$sce'); + var SCE_CONTEXTS = { + HTML: 'html', + CSS: 'css', + URL: 'url', + // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a + // url. (e.g. ng-include, script src, templateUrl) + RESOURCE_URL: 'resourceUrl', + JS: 'js' + }; - /* Design notes on the default implementation for SCE. - * - * The API contract for the SCE delegate - * ------------------------------------- - * The SCE delegate object must provide the following 3 methods: - * - * - trustAs(contextEnum, value) - * This method is used to tell the SCE service that the provided value is OK to use in the - * contexts specified by contextEnum. It must return an object that will be accepted by - * getTrusted() for a compatible contextEnum and return this value. - * - * - valueOf(value) - * For values that were not produced by trustAs(), return them as is. For values that were - * produced by trustAs(), return the corresponding input value to trustAs. Basically, if - * trustAs is wrapping the given values into some type, this operation unwraps it when given - * such a value. - * - * - getTrusted(contextEnum, value) - * This function should return the a value that is safe to use in the context specified by - * contextEnum or throw and exception otherwise. - * - * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be - * opaque or wrapped in some holder object. That happens to be an implementation detail. For - * instance, an implementation could maintain a registry of all trusted objects by context. In - * such a case, trustAs() would return the same object that was passed in. getTrusted() would - * return the same object passed in if it was found in the registry under a compatible context or - * throw an exception otherwise. An implementation might only wrap values some of the time based - * on some criteria. getTrusted() might return a value and not throw an exception for special - * constants or objects even if not wrapped. All such implementations fulfill this contract. - * - * - * A note on the inheritance model for SCE contexts - * ------------------------------------------------ - * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types. This - * is purely an implementation details. - * - * The contract is simply this: - * - * getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value) - * will also succeed. - * - * Inheritance happens to capture this in a natural way. In some future, we - * may not use inheritance anymore. That is OK because no code outside of - * sce.js and sceSpecs.js would need to be aware of this detail. - */ +// Helper functions follow. - this.$get = ['$parse', '$sceDelegate', function( - $parse, $sceDelegate) { - // Prereq: Ensure that we're not running in IE<11 quirks mode. In that mode, IE < 11 allow - // the "expression(javascript expression)" syntax which is insecure. - if (enabled && msie < 8) { - throw $sceMinErr('iequirks', - 'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' + - 'mode. You can fix this by adding the text to the top of your HTML ' + - 'document. See http://docs.angularjs.org/api/ng.$sce for more information.'); + function adjustMatcher(matcher) { + if (matcher === 'self') { + return matcher; + } else if (isString(matcher)) { + // Strings match exactly except for 2 wildcards - '*' and '**'. + // '*' matches any character except those from the set ':/.?&'. + // '**' matches any character (like .* in a RegExp). + // More than 2 *'s raises an error as it's ill defined. + if (matcher.indexOf('***') > -1) { + throw $sceMinErr('iwcard', + 'Illegal sequence *** in string matcher. String: {0}', matcher); + } + matcher = escapeForRegexp(matcher).replace('\\*\\*', '.*').replace('\\*', '[^:/.?&;]*'); + return new RegExp('^' + matcher + '$'); + } else if (isRegExp(matcher)) { + // The only other type of matcher allowed is a Regexp. + // Match entire URL / disallow partial matches. + // Flags are reset (i.e. no global, ignoreCase or multiline) + return new RegExp('^' + matcher.source + '$'); + } else { + throw $sceMinErr('imatcher', + 'Matchers may only be "self", string patterns or RegExp objects'); + } } - var sce = shallowCopy(SCE_CONTEXTS); - - /** - * @ngdoc method - * @name $sce#isEnabled - * @kind function - * - * @return {Boolean} true if SCE is enabled, false otherwise. If you want to set the value, you - * have to do it at module config time on {@link ng.$sceProvider $sceProvider}. - * - * @description - * Returns a boolean indicating if SCE is enabled. - */ - sce.isEnabled = function() { - return enabled; - }; - sce.trustAs = $sceDelegate.trustAs; - sce.getTrusted = $sceDelegate.getTrusted; - sce.valueOf = $sceDelegate.valueOf; - if (!enabled) { - sce.trustAs = sce.getTrusted = function(type, value) { return value; }; - sce.valueOf = identity; + function adjustMatchers(matchers) { + var adjustedMatchers = []; + if (isDefined(matchers)) { + forEach(matchers, function (matcher) { + adjustedMatchers.push(adjustMatcher(matcher)); + }); + } + return adjustedMatchers; } + /** - * @ngdoc method - * @name $sce#parseAs + * @ngdoc service + * @name $sceDelegate + * @kind function * * @description - * Converts Angular {@link guide/expression expression} into a function. This is like {@link - * ng.$parse $parse} and is identical when the expression is a literal constant. Otherwise, it - * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*, - * *result*)} * - * @param {string} type The kind of SCE context in which this result will be used. - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: + * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict + * Contextual Escaping (SCE)} services to AngularJS. * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - sce.parseAs = function sceParseAs(type, expr) { - var parsed = $parse(expr); - if (parsed.literal && parsed.constant) { - return parsed; - } else { - return $parse(expr, function(value) { - return sce.getTrusted(type, value); - }); - } - }; - - /** - * @ngdoc method - * @name $sce#trustAs + * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of + * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS. This is + * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to + * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things + * work because `$sce` delegates to `$sceDelegate` for these operations. * - * @description - * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. As such, - * returns an object that is trusted by angular for use in specified strict contextual - * escaping contexts (such as ng-bind-html, ng-include, any src attribute - * interpolation, any dom event binding attribute interpolation such as for onclick, etc.) - * that uses the provided value. See * {@link ng.$sce $sce} for enabling strict contextual - * escaping. - * - * @param {string} type The kind of context in which this value is safe for use. e.g. url, - * resourceUrl, html, js and css. - * @param {*} value The value that that should be considered trusted/safe. - * @returns {*} A value that can be used to stand in for the provided `value` in places - * where Angular expects a $sce.trustAs() return value. + * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service. + * + * The default instance of `$sceDelegate` should work out of the box with little pain. While you + * can override it completely to change the behavior of `$sce`, the common case would + * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting + * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as + * templates. Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist + * $sceDelegateProvider.resourceUrlWhitelist} and {@link + * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist} */ /** - * @ngdoc method - * @name $sce#trustAsHtml - * + * @ngdoc provider + * @name $sceDelegateProvider * @description - * Shorthand method. `$sce.trustAsHtml(value)` → - * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`} * - * @param {*} value The value to trustAs. - * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedHtml - * $sce.getTrustedHtml(value)} to obtain the original value. (privileged directives - * only accept expressions that are either literal constants or are the - * return value of {@link ng.$sce#trustAs $sce.trustAs}.) - */ - - /** - * @ngdoc method - * @name $sce#trustAsUrl + * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate + * $sceDelegate} service. This allows one to get/set the whitelists and blacklists used to ensure + * that the URLs used for sourcing Angular templates are safe. Refer {@link + * ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and + * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist} * - * @description - * Shorthand method. `$sce.trustAsUrl(value)` → - * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`} + * For the general details about this service in Angular, read the main page for {@link ng.$sce + * Strict Contextual Escaping (SCE)}. * - * @param {*} value The value to trustAs. - * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedUrl - * $sce.getTrustedUrl(value)} to obtain the original value. (privileged directives - * only accept expressions that are either literal constants or are the - * return value of {@link ng.$sce#trustAs $sce.trustAs}.) - */ - - /** - * @ngdoc method - * @name $sce#trustAsResourceUrl + * **Example**: Consider the following case. * - * @description - * Shorthand method. `$sce.trustAsResourceUrl(value)` → - * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`} + * - your app is hosted at url `http://myapp.example.com/` + * - but some of your templates are hosted on other domains you control such as + * `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc. + * - and you have an open redirect at `http://myapp.example.com/clickThru?...`. * - * @param {*} value The value to trustAs. - * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedResourceUrl - * $sce.getTrustedResourceUrl(value)} to obtain the original value. (privileged directives - * only accept expressions that are either literal constants or are the return - * value of {@link ng.$sce#trustAs $sce.trustAs}.) + * Here is what a secure configuration for this scenario might look like: + * + * ``` + * angular.module('myApp', []).config(function($sceDelegateProvider) { + * $sceDelegateProvider.resourceUrlWhitelist([ + * // Allow same origin resource loads. + * 'self', + * // Allow loading from our assets domain. Notice the difference between * and **. + * 'http://srv*.assets.example.com/**' + * ]); + * + * // The blacklist overrides the whitelist so the open redirect here is blocked. + * $sceDelegateProvider.resourceUrlBlacklist([ + * 'http://myapp.example.com/clickThru**' + * ]); + * }); + * ``` */ + function $SceDelegateProvider() { + this.SCE_CONTEXTS = SCE_CONTEXTS; + + // Resource URLs can also be trusted by policy. + var resourceUrlWhitelist = ['self'], + resourceUrlBlacklist = []; + + /** + * @ngdoc method + * @name $sceDelegateProvider#resourceUrlWhitelist + * @kind function + * + * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value + * provided. This must be an array or null. A snapshot of this array is used so further + * changes to the array are ignored. + * + * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items + * allowed in this array. + * + *
+ * **Note:** an empty whitelist array will block all URLs! + *
+ * + * @return {Array} the currently set whitelist array. + * + * The **default value** when no whitelist has been explicitly set is `['self']` allowing only + * same origin resource requests. + * + * @description + * Sets/Gets the whitelist of trusted resource URLs. + */ + this.resourceUrlWhitelist = function (value) { + if (arguments.length) { + resourceUrlWhitelist = adjustMatchers(value); + } + return resourceUrlWhitelist; + }; + + /** + * @ngdoc method + * @name $sceDelegateProvider#resourceUrlBlacklist + * @kind function + * + * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value + * provided. This must be an array or null. A snapshot of this array is used so further + * changes to the array are ignored. + * + * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items + * allowed in this array. + * + * The typical usage for the blacklist is to **block + * [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as + * these would otherwise be trusted but actually return content from the redirected domain. + * + * Finally, **the blacklist overrides the whitelist** and has the final say. + * + * @return {Array} the currently set blacklist array. + * + * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there + * is no blacklist.) + * + * @description + * Sets/Gets the blacklist of trusted resource URLs. + */ + + this.resourceUrlBlacklist = function (value) { + if (arguments.length) { + resourceUrlBlacklist = adjustMatchers(value); + } + return resourceUrlBlacklist; + }; + + this.$get = ['$injector', function ($injector) { + + var htmlSanitizer = function htmlSanitizer(html) { + throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.'); + }; + + if ($injector.has('$sanitize')) { + htmlSanitizer = $injector.get('$sanitize'); + } + + + function matchUrl(matcher, parsedUrl) { + if (matcher === 'self') { + return urlIsSameOrigin(parsedUrl); + } else { + // definitely a regex. See adjustMatchers() + return !!matcher.exec(parsedUrl.href); + } + } + + function isResourceUrlAllowedByPolicy(url) { + var parsedUrl = urlResolve(url.toString()); + var i, n, allowed = false; + // Ensure that at least one item from the whitelist allows this url. + for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) { + if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) { + allowed = true; + break; + } + } + if (allowed) { + // Ensure that no item from the blacklist blocked this url. + for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) { + if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) { + allowed = false; + break; + } + } + } + return allowed; + } + + function generateHolderType(Base) { + var holderType = function TrustedValueHolderType(trustedValue) { + this.$$unwrapTrustedValue = function () { + return trustedValue; + }; + }; + if (Base) { + holderType.prototype = new Base(); + } + holderType.prototype.valueOf = function sceValueOf() { + return this.$$unwrapTrustedValue(); + }; + holderType.prototype.toString = function sceToString() { + return this.$$unwrapTrustedValue().toString(); + }; + return holderType; + } + + var trustedValueHolderBase = generateHolderType(), + byType = {}; + + byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase); + byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase); + byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase); + byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase); + byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]); + + /** + * @ngdoc method + * @name $sceDelegate#trustAs + * + * @description + * Returns an object that is trusted by angular for use in specified strict + * contextual escaping contexts (such as ng-bind-html, ng-include, any src + * attribute interpolation, any dom event binding attribute interpolation + * such as for onclick, etc.) that uses the provided value. + * See {@link ng.$sce $sce} for enabling strict contextual escaping. + * + * @param {string} type The kind of context in which this value is safe for use. e.g. url, + * resourceUrl, html, js and css. + * @param {*} value The value that that should be considered trusted/safe. + * @returns {*} A value that can be used to stand in for the provided `value` in places + * where Angular expects a $sce.trustAs() return value. + */ + function trustAs(type, trustedValue) { + var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null); + if (!Constructor) { + throw $sceMinErr('icontext', + 'Attempted to trust a value in invalid context. Context: {0}; Value: {1}', + type, trustedValue); + } + if (trustedValue === null || isUndefined(trustedValue) || trustedValue === '') { + return trustedValue; + } + // All the current contexts in SCE_CONTEXTS happen to be strings. In order to avoid trusting + // mutable objects, we ensure here that the value passed in is actually a string. + if (typeof trustedValue !== 'string') { + throw $sceMinErr('itype', + 'Attempted to trust a non-string value in a content requiring a string: Context: {0}', + type); + } + return new Constructor(trustedValue); + } + + /** + * @ngdoc method + * @name $sceDelegate#valueOf + * + * @description + * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs + * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link + * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. + * + * If the passed parameter is not a value that had been returned by {@link + * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, returns it as-is. + * + * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} + * call or anything else. + * @returns {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs + * `$sceDelegate.trustAs`} if `value` is the result of such a call. Otherwise, returns + * `value` unchanged. + */ + function valueOf(maybeTrusted) { + if (maybeTrusted instanceof trustedValueHolderBase) { + return maybeTrusted.$$unwrapTrustedValue(); + } else { + return maybeTrusted; + } + } + + /** + * @ngdoc method + * @name $sceDelegate#getTrusted + * + * @description + * Takes the result of a {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call and + * returns the originally supplied value if the queried context type is a supertype of the + * created type. If this condition isn't satisfied, throws an exception. + * + *
+ * Disabling auto-escaping is extremely dangerous, it usually creates a Cross Site Scripting + * (XSS) vulnerability in your application. + *
+ * + * @param {string} type The kind of context in which this value is to be used. + * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs + * `$sceDelegate.trustAs`} call. + * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#trustAs + * `$sceDelegate.trustAs`} if valid in this context. Otherwise, throws an exception. + */ + function getTrusted(type, maybeTrusted) { + if (maybeTrusted === null || isUndefined(maybeTrusted) || maybeTrusted === '') { + return maybeTrusted; + } + var constructor = (byType.hasOwnProperty(type) ? byType[type] : null); + if (constructor && maybeTrusted instanceof constructor) { + return maybeTrusted.$$unwrapTrustedValue(); + } + // If we get here, then we may only take one of two actions. + // 1. sanitize the value for the requested type, or + // 2. throw an exception. + if (type === SCE_CONTEXTS.RESOURCE_URL) { + if (isResourceUrlAllowedByPolicy(maybeTrusted)) { + return maybeTrusted; + } else { + throw $sceMinErr('insecurl', + 'Blocked loading resource from url not allowed by $sceDelegate policy. URL: {0}', + maybeTrusted.toString()); + } + } else if (type === SCE_CONTEXTS.HTML) { + return htmlSanitizer(maybeTrusted); + } + throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.'); + } + + return { + trustAs: trustAs, + getTrusted: getTrusted, + valueOf: valueOf + }; + }]; + } + + /** - * @ngdoc method - * @name $sce#trustAsJs - * + * @ngdoc provider + * @name $sceProvider * @description - * Shorthand method. `$sce.trustAsJs(value)` → - * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`} * - * @param {*} value The value to trustAs. - * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedJs - * $sce.getTrustedJs(value)} to obtain the original value. (privileged directives - * only accept expressions that are either literal constants or are the - * return value of {@link ng.$sce#trustAs $sce.trustAs}.) - */ - - /** - * @ngdoc method - * @name $sce#getTrusted + * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service. + * - enable/disable Strict Contextual Escaping (SCE) in a module + * - override the default implementation with a custom delegate * - * @description - * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}. As such, - * takes the result of a {@link ng.$sce#trustAs `$sce.trustAs`}() call and returns the - * originally supplied value if the queried context type is a supertype of the created type. - * If this condition isn't satisfied, throws an exception. - * - * @param {string} type The kind of context in which this value is to be used. - * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs `$sce.trustAs`} - * call. - * @returns {*} The value the was originally provided to - * {@link ng.$sce#trustAs `$sce.trustAs`} if valid in this context. - * Otherwise, throws an exception. + * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}. */ + /* jshint maxlen: false*/ + /** - * @ngdoc method - * @name $sce#getTrustedHtml + * @ngdoc service + * @name $sce + * @kind function * * @description - * Shorthand method. `$sce.getTrustedHtml(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`} * - * @param {*} value The value to pass to `$sce.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)` - */ - - /** - * @ngdoc method - * @name $sce#getTrustedCss + * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS. * - * @description - * Shorthand method. `$sce.getTrustedCss(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`} + * # Strict Contextual Escaping * - * @param {*} value The value to pass to `$sce.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)` - */ - - /** - * @ngdoc method - * @name $sce#getTrustedUrl + * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain + * contexts to result in a value that is marked as safe to use for that context. One example of + * such a context is binding arbitrary html controlled by the user via `ng-bind-html`. We refer + * to these contexts as privileged or SCE contexts. * - * @description - * Shorthand method. `$sce.getTrustedUrl(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`} + * As of version 1.2, Angular ships with SCE enabled by default. * - * @param {*} value The value to pass to `$sce.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)` - */ - - /** - * @ngdoc method - * @name $sce#getTrustedResourceUrl + * Note: When enabled (the default), IE<11 in quirks mode is not supported. In this mode, IE<11 allow + * one to execute arbitrary javascript by the use of the expression() syntax. Refer + * to learn more about them. + * You can ensure your document is in standards mode and not quirks mode by adding `` + * to the top of your HTML document. * - * @description - * Shorthand method. `$sce.getTrustedResourceUrl(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`} + * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for + * security vulnerabilities such as XSS, clickjacking, etc. a lot easier. * - * @param {*} value The value to pass to `$sceDelegate.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)` - */ - - /** - * @ngdoc method - * @name $sce#getTrustedJs + * Here's an example of a binding in a privileged context: * - * @description - * Shorthand method. `$sce.getTrustedJs(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`} + * ``` + * + *
+ * ``` * - * @param {*} value The value to pass to `$sce.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)` - */ - - /** - * @ngdoc method - * @name $sce#parseAsHtml + * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user. With SCE + * disabled, this application allows the user to render arbitrary HTML into the DIV. + * In a more realistic example, one may be rendering user comments, blog articles, etc. via + * bindings. (HTML is just one example of a context where rendering user controlled input creates + * security vulnerabilities.) * - * @description - * Shorthand method. `$sce.parseAsHtml(expression string)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.HTML, value)`} + * For the case of HTML, you might use a library, either on the client side, or on the server side, + * to sanitize unsafe HTML before binding to the value and rendering it in the document. * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: + * How would you ensure that every place that used these types of bindings was bound to a value that + * was sanitized by your library (or returned as safe for rendering by your server?) How can you + * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some + * properties/fields and forgot to update the binding to the sanitized value? * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - - /** - * @ngdoc method - * @name $sce#parseAsCss + * To be secure by default, you want to ensure that any such bindings are disallowed unless you can + * determine that something explicitly says it's safe to use a value for binding in that + * context. You can then audit your code (a simple grep would do) to ensure that this is only done + * for those values that you can easily tell are safe - because they were received from your server, + * sanitized by your library, etc. You can organize your codebase to help with this - perhaps + * allowing only the files in a specific directory to do this. Ensuring that the internal API + * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task. * - * @description - * Shorthand method. `$sce.parseAsCss(value)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.CSS, value)`} + * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs} + * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to + * obtain values that will be accepted by SCE / privileged contexts. * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - - /** - * @ngdoc method - * @name $sce#parseAsUrl + * ## How does it work? * - * @description - * Shorthand method. `$sce.parseAsUrl(value)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.URL, value)`} + * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted + * $sce.getTrusted(context, value)} rather than to the value directly. Directives use {@link + * ng.$sce#parseAs $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the + * {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals. + * + * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link + * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}. Here's the actual code (slightly + * simplified): + * + * ``` + * var ngBindHtmlDirective = ['$sce', function($sce) { + * return function(scope, element, attr) { + * scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) { + * element.html(value || ''); + * }); + * }; + * }]; + * ``` + * + * ## Impact on loading templates + * + * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as + * `templateUrl`'s specified by {@link guide/directive directives}. + * + * By default, Angular only loads templates from the same domain and protocol as the application + * document. This is done by calling {@link ng.$sce#getTrustedResourceUrl + * $sce.getTrustedResourceUrl} on the template URL. To load templates from other domains and/or + * protocols, you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist + * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value. + * + * *Please note*: + * The browser's + * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest) + * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/) + * policy apply in addition to this and may further restrict whether the template is successfully + * loaded. This means that without the right CORS policy, loading templates from a different domain + * won't work on all browsers. Also, loading templates from `file://` URL does not work on some + * browsers. + * + * ## This feels like too much overhead + * + * It's important to remember that SCE only applies to interpolation expressions. + * + * If your expressions are constant literals, they're automatically trusted and you don't need to + * call `$sce.trustAs` on them (remember to include the `ngSanitize` module) (e.g. + * `
`) just works. + * + * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them + * through {@link ng.$sce#getTrusted $sce.getTrusted}. SCE doesn't play a role here. + * + * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load + * templates in `ng-include` from your application's domain without having to even know about SCE. + * It blocks loading templates from other domains or loading templates over http from an https + * served document. You can change these by setting your own custom {@link + * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link + * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs. + * + * This significantly reduces the overhead. It is far easier to pay the small overhead and have an + * application that's secure and can be audited to verify that with much more ease than bolting + * security onto an application later. + * + * + * ## What trusted context types are supported? + * + * | Context | Notes | + * |---------------------|----------------| + * | `$sce.HTML` | For HTML that's safe to source into the application. The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered and the {@link ngSanitize $sanitize} module is present this will sanitize the value instead of throwing an error. | + * | `$sce.CSS` | For CSS that's safe to source into the application. Currently unused. Feel free to use it in your own directives. | + * | `$sce.URL` | For URLs that are safe to follow as links. Currently unused (`
Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. | + * | `$sce.JS` | For JavaScript that is safe to execute in your application's context. Currently unused. Feel free to use it in your own directives. | + * + * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} + * + * Each element in these arrays must be one of the following: + * + * - **'self'** + * - The special **string**, `'self'`, can be used to match against all URLs of the **same + * domain** as the application document using the **same protocol**. + * - **String** (except the special value `'self'`) + * - The string is matched against the full *normalized / absolute URL* of the resource + * being tested (substring matches are not good enough.) + * - There are exactly **two wildcard sequences** - `*` and `**`. All other characters + * match themselves. + * - `*`: matches zero or more occurrences of any character other than one of the following 6 + * characters: '`:`', '`/`', '`.`', '`?`', '`&`' and '`;`'. It's a useful wildcard for use + * in a whitelist. + * - `**`: matches zero or more occurrences of *any* character. As such, it's not + * appropriate for use in a scheme, domain, etc. as it would match too much. (e.g. + * http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might + * not have been the intention.) Its usage at the very end of the path is ok. (e.g. + * http://foo.example.com/templates/**). + * - **RegExp** (*see caveat below*) + * - *Caveat*: While regular expressions are powerful and offer great flexibility, their syntax + * (and all the inevitable escaping) makes them *harder to maintain*. It's easy to + * accidentally introduce a bug when one updates a complex expression (imho, all regexes should + * have good test coverage). For instance, the use of `.` in the regex is correct only in a + * small number of cases. A `.` character in the regex used when matching the scheme or a + * subdomain could be matched against a `:` or literal `.` that was likely not intended. It + * is highly recommended to use the string patterns and only fall back to regular expressions + * as a last resort. + * - The regular expression must be an instance of RegExp (i.e. not a string.) It is + * matched against the **entire** *normalized / absolute URL* of the resource being tested + * (even when the RegExp did not have the `^` and `$` codes.) In addition, any flags + * present on the RegExp (such as multiline, global, ignoreCase) are ignored. + * - If you are generating your JavaScript from some other templating engine (not + * recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)), + * remember to escape your regular expression (and be aware that you might need more than + * one level of escaping depending on your templating engine and the way you interpolated + * the value.) Do make use of your platform's escaping mechanism as it might be good + * enough before coding your own. E.g. Ruby has + * [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape) + * and Python has [re.escape](http://docs.python.org/library/re.html#re.escape). + * Javascript lacks a similar built in function for escaping. Take a look at Google + * Closure library's [goog.string.regExpEscape(s)]( + * http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962). + * + * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example. + * + * ## Show me an example using SCE. + * + * + * + *
+ *

+ * User comments
+ * By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when + * $sanitize is available. If $sanitize isn't available, this results in an error instead of an + * exploit. + *
+ *
+ * {{userComment.name}}: + * + *
+ *
+ *
+ *
+ * + * + * + * angular.module('mySceApp', ['ngSanitize']) + * .controller('AppController', ['$http', '$templateCache', '$sce', + * function($http, $templateCache, $sce) { + * var self = this; + * $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) { + * self.userComments = userComments; + * }); + * self.explicitlyTrustedHtml = $sce.trustAsHtml( + * 'Hover over this text.'); + * }]); + * + * + * + * [ + * { "name": "Alice", + * "htmlComment": + * "Is anyone reading this?" + * }, + * { "name": "Bob", + * "htmlComment": "Yes! Am I the only other one?" + * } + * ] + * * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: + * + * describe('SCE doc demo', function() { + * it('should sanitize untrusted values', function() { + * expect(element.all(by.css('.htmlComment')).first().getInnerHtml()) + * .toBe('Is anyone reading this?'); + * }); + * + * it('should NOT sanitize explicitly trusted values', function() { + * expect(element(by.id('explicitlyTrustedHtml')).getInnerHtml()).toBe( + * 'Hover over this text.'); + * }); + * }); + * + * * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - - /** - * @ngdoc method - * @name $sce#parseAsResourceUrl * - * @description - * Shorthand method. `$sce.parseAsResourceUrl(value)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.RESOURCE_URL, value)`} * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: + * ## Can I disable SCE completely? * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - - /** - * @ngdoc method - * @name $sce#parseAsJs + * Yes, you can. However, this is strongly discouraged. SCE gives you a lot of security benefits + * for little coding overhead. It will be much harder to take an SCE disabled application and + * either secure it on your own or enable SCE at a later stage. It might make sense to disable SCE + * for cases where you have a lot of existing code that was written before SCE was introduced and + * you're migrating them a module at a time. * - * @description - * Shorthand method. `$sce.parseAsJs(value)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.JS, value)`} + * That said, here's how you can completely disable SCE: * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: + * ``` + * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) { + * // Completely disable SCE. For demonstration purposes only! + * // Do not use in new projects. + * $sceProvider.enabled(false); + * }); + * ``` * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. */ - // Shorthand delegations. - var parse = sce.parseAs, - getTrusted = sce.getTrusted, - trustAs = sce.trustAs; - - forEach(SCE_CONTEXTS, function(enumValue, name) { - var lName = lowercase(name); - sce[camelCase("parse_as_" + lName)] = function(expr) { - return parse(enumValue, expr); - }; - sce[camelCase("get_trusted_" + lName)] = function(value) { - return getTrusted(enumValue, value); - }; - sce[camelCase("trust_as_" + lName)] = function(value) { - return trustAs(enumValue, value); - }; - }); - - return sce; - }]; -} - -/** - * !!! This is an undocumented "private" service !!! - * - * @name $sniffer - * @requires $window - * @requires $document - * - * @property {boolean} history Does the browser support html5 history api ? - * @property {boolean} transitions Does the browser support CSS transition events ? - * @property {boolean} animations Does the browser support CSS animation events ? - * - * @description - * This is very simple implementation of testing browser's features. - */ -function $SnifferProvider() { - this.$get = ['$window', '$document', function($window, $document) { - var eventSupport = {}, - // Chrome Packaged Apps are not allowed to access `history.pushState`. They can be detected by - // the presence of `chrome.app.runtime` (see https://developer.chrome.com/apps/api_index) - isChromePackagedApp = $window.chrome && $window.chrome.app && $window.chrome.app.runtime, - hasHistoryPushState = !isChromePackagedApp && $window.history && $window.history.pushState, - android = - toInt((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]), - boxee = /Boxee/i.test(($window.navigator || {}).userAgent), - document = $document[0] || {}, - vendorPrefix, - vendorRegex = /^(Moz|webkit|ms)(?=[A-Z])/, - bodyStyle = document.body && document.body.style, - transitions = false, - animations = false, - match; - - if (bodyStyle) { - for (var prop in bodyStyle) { - if (match = vendorRegex.exec(prop)) { - vendorPrefix = match[0]; - vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1); - break; - } - } - - if (!vendorPrefix) { - vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit'; - } - - transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle)); - animations = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle)); - - if (android && (!transitions || !animations)) { - transitions = isString(bodyStyle.webkitTransition); - animations = isString(bodyStyle.webkitAnimation); - } - } - - - return { - // Android has history.pushState, but it does not update location correctly - // so let's not use the history API at all. - // http://code.google.com/p/android/issues/detail?id=17471 - // https://github.com/angular/angular.js/issues/904 - - // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has - // so let's not use the history API also - // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined - // jshint -W018 - history: !!(hasHistoryPushState && !(android < 4) && !boxee), - // jshint +W018 - hasEvent: function(event) { - // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have - // it. In particular the event is not fired when backspace or delete key are pressed or - // when cut operation is performed. - // IE10+ implements 'input' event but it erroneously fires under various situations, - // e.g. when placeholder changes, or a form is focused. - if (event === 'input' && msie <= 11) return false; - - if (isUndefined(eventSupport[event])) { - var divElm = document.createElement('div'); - eventSupport[event] = 'on' + event in divElm; - } - - return eventSupport[event]; - }, - csp: csp(), - vendorPrefix: vendorPrefix, - transitions: transitions, - animations: animations, - android: android - }; - }]; -} + /* jshint maxlen: 100 */ -var $templateRequestMinErr = minErr('$compile'); + function $SceProvider() { + var enabled = true; -/** - * @ngdoc provider - * @name $templateRequestProvider - * @description - * Used to configure the options passed to the {@link $http} service when making a template request. - * - * For example, it can be used for specifying the "Accept" header that is sent to the server, when - * requesting a template. - */ -function $TemplateRequestProvider() { + /** + * @ngdoc method + * @name $sceProvider#enabled + * @kind function + * + * @param {boolean=} value If provided, then enables/disables SCE. + * @return {boolean} true if SCE is enabled, false otherwise. + * + * @description + * Enables/disables SCE and returns the current value. + */ + this.enabled = function (value) { + if (arguments.length) { + enabled = !!value; + } + return enabled; + }; - var httpOptions; - /** - * @ngdoc method - * @name $templateRequestProvider#httpOptions - * @description - * The options to be passed to the {@link $http} service when making the request. - * You can use this to override options such as the "Accept" header for template requests. + /* Design notes on the default implementation for SCE. * - * The {@link $templateRequest} will set the `cache` and the `transformResponse` properties of the - * options if not overridden here. + * The API contract for the SCE delegate + * ------------------------------------- + * The SCE delegate object must provide the following 3 methods: * - * @param {string=} value new value for the {@link $http} options. - * @returns {string|self} Returns the {@link $http} options when used as getter and self if used as setter. - */ - this.httpOptions = function(val) { - if (val) { - httpOptions = val; - return this; - } - return httpOptions; - }; - - /** - * @ngdoc service - * @name $templateRequest + * - trustAs(contextEnum, value) + * This method is used to tell the SCE service that the provided value is OK to use in the + * contexts specified by contextEnum. It must return an object that will be accepted by + * getTrusted() for a compatible contextEnum and return this value. + * + * - valueOf(value) + * For values that were not produced by trustAs(), return them as is. For values that were + * produced by trustAs(), return the corresponding input value to trustAs. Basically, if + * trustAs is wrapping the given values into some type, this operation unwraps it when given + * such a value. + * + * - getTrusted(contextEnum, value) + * This function should return the a value that is safe to use in the context specified by + * contextEnum or throw and exception otherwise. + * + * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be + * opaque or wrapped in some holder object. That happens to be an implementation detail. For + * instance, an implementation could maintain a registry of all trusted objects by context. In + * such a case, trustAs() would return the same object that was passed in. getTrusted() would + * return the same object passed in if it was found in the registry under a compatible context or + * throw an exception otherwise. An implementation might only wrap values some of the time based + * on some criteria. getTrusted() might return a value and not throw an exception for special + * constants or objects even if not wrapped. All such implementations fulfill this contract. * - * @description - * The `$templateRequest` service runs security checks then downloads the provided template using - * `$http` and, upon success, stores the contents inside of `$templateCache`. If the HTTP request - * fails or the response data of the HTTP request is empty, a `$compile` error will be thrown (the - * exception can be thwarted by setting the 2nd parameter of the function to true). Note that the - * contents of `$templateCache` are trusted, so the call to `$sce.getTrustedUrl(tpl)` is omitted - * when `tpl` is of type string and `$templateCache` has the matching entry. * - * If you want to pass custom options to the `$http` service, such as setting the Accept header you - * can configure this via {@link $templateRequestProvider#httpOptions}. + * A note on the inheritance model for SCE contexts + * ------------------------------------------------ + * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types. This + * is purely an implementation details. * - * @param {string|TrustedResourceUrl} tpl The HTTP request template URL - * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty + * The contract is simply this: * - * @return {Promise} a promise for the HTTP response data of the given URL. + * getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value) + * will also succeed. * - * @property {number} totalPendingRequests total amount of pending template requests being downloaded. + * Inheritance happens to capture this in a natural way. In some future, we + * may not use inheritance anymore. That is OK because no code outside of + * sce.js and sceSpecs.js would need to be aware of this detail. */ - this.$get = ['$templateCache', '$http', '$q', '$sce', function($templateCache, $http, $q, $sce) { - - function handleRequestFn(tpl, ignoreRequestError) { - handleRequestFn.totalPendingRequests++; - - // We consider the template cache holds only trusted templates, so - // there's no need to go through whitelisting again for keys that already - // are included in there. This also makes Angular accept any script - // directive, no matter its name. However, we still need to unwrap trusted - // types. - if (!isString(tpl) || !$templateCache.get(tpl)) { - tpl = $sce.getTrustedResourceUrl(tpl); - } - var transformResponse = $http.defaults && $http.defaults.transformResponse; + this.$get = ['$parse', '$sceDelegate', function ($parse, $sceDelegate) { + // Prereq: Ensure that we're not running in IE<11 quirks mode. In that mode, IE < 11 allow + // the "expression(javascript expression)" syntax which is insecure. + if (enabled && msie < 8) { + throw $sceMinErr('iequirks', + 'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' + + 'mode. You can fix this by adding the text to the top of your HTML ' + + 'document. See http://docs.angularjs.org/api/ng.$sce for more information.'); + } - if (isArray(transformResponse)) { - transformResponse = transformResponse.filter(function(transformer) { - return transformer !== defaultHttpResponseTransform; - }); - } else if (transformResponse === defaultHttpResponseTransform) { - transformResponse = null; - } + var sce = shallowCopy(SCE_CONTEXTS); + + /** + * @ngdoc method + * @name $sce#isEnabled + * @kind function + * + * @return {Boolean} true if SCE is enabled, false otherwise. If you want to set the value, you + * have to do it at module config time on {@link ng.$sceProvider $sceProvider}. + * + * @description + * Returns a boolean indicating if SCE is enabled. + */ + sce.isEnabled = function () { + return enabled; + }; + sce.trustAs = $sceDelegate.trustAs; + sce.getTrusted = $sceDelegate.getTrusted; + sce.valueOf = $sceDelegate.valueOf; - return $http.get(tpl, extend({ - cache: $templateCache, - transformResponse: transformResponse - }, httpOptions)) - ['finally'](function() { - handleRequestFn.totalPendingRequests--; - }) - .then(function(response) { - $templateCache.put(tpl, response.data); - return response.data; - }, handleError); - - function handleError(resp) { - if (!ignoreRequestError) { - throw $templateRequestMinErr('tpload', 'Failed to load template: {0} (HTTP status: {1} {2})', - tpl, resp.status, resp.statusText); - } - return $q.reject(resp); - } - } + if (!enabled) { + sce.trustAs = sce.getTrusted = function (type, value) { + return value; + }; + sce.valueOf = identity; + } - handleRequestFn.totalPendingRequests = 0; + /** + * @ngdoc method + * @name $sce#parseAs + * + * @description + * Converts Angular {@link guide/expression expression} into a function. This is like {@link + * ng.$parse $parse} and is identical when the expression is a literal constant. Otherwise, it + * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*, + * *result*)} + * + * @param {string} type The kind of SCE context in which this result will be used. + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + sce.parseAs = function sceParseAs(type, expr) { + var parsed = $parse(expr); + if (parsed.literal && parsed.constant) { + return parsed; + } else { + return $parse(expr, function (value) { + return sce.getTrusted(type, value); + }); + } + }; - return handleRequestFn; - }]; -} + /** + * @ngdoc method + * @name $sce#trustAs + * + * @description + * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. As such, + * returns an object that is trusted by angular for use in specified strict contextual + * escaping contexts (such as ng-bind-html, ng-include, any src attribute + * interpolation, any dom event binding attribute interpolation such as for onclick, etc.) + * that uses the provided value. See * {@link ng.$sce $sce} for enabling strict contextual + * escaping. + * + * @param {string} type The kind of context in which this value is safe for use. e.g. url, + * resourceUrl, html, js and css. + * @param {*} value The value that that should be considered trusted/safe. + * @returns {*} A value that can be used to stand in for the provided `value` in places + * where Angular expects a $sce.trustAs() return value. + */ + + /** + * @ngdoc method + * @name $sce#trustAsHtml + * + * @description + * Shorthand method. `$sce.trustAsHtml(value)` → + * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`} + * + * @param {*} value The value to trustAs. + * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedHtml + * $sce.getTrustedHtml(value)} to obtain the original value. (privileged directives + * only accept expressions that are either literal constants or are the + * return value of {@link ng.$sce#trustAs $sce.trustAs}.) + */ + + /** + * @ngdoc method + * @name $sce#trustAsUrl + * + * @description + * Shorthand method. `$sce.trustAsUrl(value)` → + * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`} + * + * @param {*} value The value to trustAs. + * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedUrl + * $sce.getTrustedUrl(value)} to obtain the original value. (privileged directives + * only accept expressions that are either literal constants or are the + * return value of {@link ng.$sce#trustAs $sce.trustAs}.) + */ + + /** + * @ngdoc method + * @name $sce#trustAsResourceUrl + * + * @description + * Shorthand method. `$sce.trustAsResourceUrl(value)` → + * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`} + * + * @param {*} value The value to trustAs. + * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedResourceUrl + * $sce.getTrustedResourceUrl(value)} to obtain the original value. (privileged directives + * only accept expressions that are either literal constants or are the return + * value of {@link ng.$sce#trustAs $sce.trustAs}.) + */ + + /** + * @ngdoc method + * @name $sce#trustAsJs + * + * @description + * Shorthand method. `$sce.trustAsJs(value)` → + * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`} + * + * @param {*} value The value to trustAs. + * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedJs + * $sce.getTrustedJs(value)} to obtain the original value. (privileged directives + * only accept expressions that are either literal constants or are the + * return value of {@link ng.$sce#trustAs $sce.trustAs}.) + */ + + /** + * @ngdoc method + * @name $sce#getTrusted + * + * @description + * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}. As such, + * takes the result of a {@link ng.$sce#trustAs `$sce.trustAs`}() call and returns the + * originally supplied value if the queried context type is a supertype of the created type. + * If this condition isn't satisfied, throws an exception. + * + * @param {string} type The kind of context in which this value is to be used. + * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs `$sce.trustAs`} + * call. + * @returns {*} The value the was originally provided to + * {@link ng.$sce#trustAs `$sce.trustAs`} if valid in this context. + * Otherwise, throws an exception. + */ + + /** + * @ngdoc method + * @name $sce#getTrustedHtml + * + * @description + * Shorthand method. `$sce.getTrustedHtml(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`} + * + * @param {*} value The value to pass to `$sce.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)` + */ + + /** + * @ngdoc method + * @name $sce#getTrustedCss + * + * @description + * Shorthand method. `$sce.getTrustedCss(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`} + * + * @param {*} value The value to pass to `$sce.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)` + */ + + /** + * @ngdoc method + * @name $sce#getTrustedUrl + * + * @description + * Shorthand method. `$sce.getTrustedUrl(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`} + * + * @param {*} value The value to pass to `$sce.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)` + */ + + /** + * @ngdoc method + * @name $sce#getTrustedResourceUrl + * + * @description + * Shorthand method. `$sce.getTrustedResourceUrl(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`} + * + * @param {*} value The value to pass to `$sceDelegate.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)` + */ + + /** + * @ngdoc method + * @name $sce#getTrustedJs + * + * @description + * Shorthand method. `$sce.getTrustedJs(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`} + * + * @param {*} value The value to pass to `$sce.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)` + */ + + /** + * @ngdoc method + * @name $sce#parseAsHtml + * + * @description + * Shorthand method. `$sce.parseAsHtml(expression string)` → + * {@link ng.$sce#parseAs `$sce.parseAs($sce.HTML, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + /** + * @ngdoc method + * @name $sce#parseAsCss + * + * @description + * Shorthand method. `$sce.parseAsCss(value)` → + * {@link ng.$sce#parseAs `$sce.parseAs($sce.CSS, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + /** + * @ngdoc method + * @name $sce#parseAsUrl + * + * @description + * Shorthand method. `$sce.parseAsUrl(value)` → + * {@link ng.$sce#parseAs `$sce.parseAs($sce.URL, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + /** + * @ngdoc method + * @name $sce#parseAsResourceUrl + * + * @description + * Shorthand method. `$sce.parseAsResourceUrl(value)` → + * {@link ng.$sce#parseAs `$sce.parseAs($sce.RESOURCE_URL, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + /** + * @ngdoc method + * @name $sce#parseAsJs + * + * @description + * Shorthand method. `$sce.parseAsJs(value)` → + * {@link ng.$sce#parseAs `$sce.parseAs($sce.JS, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + // Shorthand delegations. + var parse = sce.parseAs, + getTrusted = sce.getTrusted, + trustAs = sce.trustAs; + + forEach(SCE_CONTEXTS, function (enumValue, name) { + var lName = lowercase(name); + sce[camelCase("parse_as_" + lName)] = function (expr) { + return parse(enumValue, expr); + }; + sce[camelCase("get_trusted_" + lName)] = function (value) { + return getTrusted(enumValue, value); + }; + sce[camelCase("trust_as_" + lName)] = function (value) { + return trustAs(enumValue, value); + }; + }); -function $$TestabilityProvider() { - this.$get = ['$rootScope', '$browser', '$location', - function($rootScope, $browser, $location) { + return sce; + }]; + } /** - * @name $testability + * !!! This is an undocumented "private" service !!! * - * @description - * The private $$testability service provides a collection of methods for use when debugging - * or by automated test and debugging tools. - */ - var testability = {}; - - /** - * @name $$testability#findBindings + * @name $sniffer + * @requires $window + * @requires $document * - * @description - * Returns an array of elements that are bound (via ng-bind or {{}}) - * to expressions matching the input. + * @property {boolean} history Does the browser support html5 history api ? + * @property {boolean} transitions Does the browser support CSS transition events ? + * @property {boolean} animations Does the browser support CSS animation events ? * - * @param {Element} element The element root to search from. - * @param {string} expression The binding expression to match. - * @param {boolean} opt_exactMatch If true, only returns exact matches - * for the expression. Filters and whitespace are ignored. + * @description + * This is very simple implementation of testing browser's features. */ - testability.findBindings = function(element, expression, opt_exactMatch) { - var bindings = element.getElementsByClassName('ng-binding'); - var matches = []; - forEach(bindings, function(binding) { - var dataBinding = angular.element(binding).data('$binding'); - if (dataBinding) { - forEach(dataBinding, function(bindingName) { - if (opt_exactMatch) { - var matcher = new RegExp('(^|\\s)' + escapeForRegexp(expression) + '(\\s|\\||$)'); - if (matcher.test(bindingName)) { - matches.push(binding); - } - } else { - if (bindingName.indexOf(expression) != -1) { - matches.push(binding); - } + function $SnifferProvider() { + this.$get = ['$window', '$document', function ($window, $document) { + var eventSupport = {}, + // Chrome Packaged Apps are not allowed to access `history.pushState`. They can be detected by + // the presence of `chrome.app.runtime` (see https://developer.chrome.com/apps/api_index) + isChromePackagedApp = $window.chrome && $window.chrome.app && $window.chrome.app.runtime, + hasHistoryPushState = !isChromePackagedApp && $window.history && $window.history.pushState, + android = + toInt((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]), + boxee = /Boxee/i.test(($window.navigator || {}).userAgent), + document = $document[0] || {}, + vendorPrefix, + vendorRegex = /^(Moz|webkit|ms)(?=[A-Z])/, + bodyStyle = document.body && document.body.style, + transitions = false, + animations = false, + match; + + if (bodyStyle) { + for (var prop in bodyStyle) { + if (match = vendorRegex.exec(prop)) { + vendorPrefix = match[0]; + vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1); + break; + } + } + + if (!vendorPrefix) { + vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit'; + } + + transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle)); + animations = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle)); + + if (android && (!transitions || !animations)) { + transitions = isString(bodyStyle.webkitTransition); + animations = isString(bodyStyle.webkitAnimation); + } } - }); - } - }); - return matches; - }; - /** - * @name $$testability#findModels - * - * @description - * Returns an array of elements that are two-way found via ng-model to - * expressions matching the input. - * - * @param {Element} element The element root to search from. - * @param {string} expression The model expression to match. - * @param {boolean} opt_exactMatch If true, only returns exact matches - * for the expression. - */ - testability.findModels = function(element, expression, opt_exactMatch) { - var prefixes = ['ng-', 'data-ng-', 'ng\\:']; - for (var p = 0; p < prefixes.length; ++p) { - var attributeEquals = opt_exactMatch ? '=' : '*='; - var selector = '[' + prefixes[p] + 'model' + attributeEquals + '"' + expression + '"]'; - var elements = element.querySelectorAll(selector); - if (elements.length) { - return elements; - } - } - }; - /** - * @name $$testability#getLocation - * - * @description - * Shortcut for getting the location in a browser agnostic way. Returns - * the path, search, and hash. (e.g. /path?a=b#hash) - */ - testability.getLocation = function() { - return $location.url(); - }; + return { + // Android has history.pushState, but it does not update location correctly + // so let's not use the history API at all. + // http://code.google.com/p/android/issues/detail?id=17471 + // https://github.com/angular/angular.js/issues/904 + + // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has + // so let's not use the history API also + // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined + // jshint -W018 + history: !!(hasHistoryPushState && !(android < 4) && !boxee), + // jshint +W018 + hasEvent: function (event) { + // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have + // it. In particular the event is not fired when backspace or delete key are pressed or + // when cut operation is performed. + // IE10+ implements 'input' event but it erroneously fires under various situations, + // e.g. when placeholder changes, or a form is focused. + if (event === 'input' && msie <= 11) return false; + + if (isUndefined(eventSupport[event])) { + var divElm = document.createElement('div'); + eventSupport[event] = 'on' + event in divElm; + } - /** - * @name $$testability#setLocation - * - * @description - * Shortcut for navigating to a location without doing a full page reload. - * - * @param {string} url The location url (path, search and hash, - * e.g. /path?a=b#hash) to go to. - */ - testability.setLocation = function(url) { - if (url !== $location.url()) { - $location.url(url); - $rootScope.$digest(); - } - }; + return eventSupport[event]; + }, + csp: csp(), + vendorPrefix: vendorPrefix, + transitions: transitions, + animations: animations, + android: android + }; + }]; + } + + var $templateRequestMinErr = minErr('$compile'); /** - * @name $$testability#whenStable - * + * @ngdoc provider + * @name $templateRequestProvider * @description - * Calls the callback when $timeout and $http requests are completed. + * Used to configure the options passed to the {@link $http} service when making a template request. * - * @param {function} callback + * For example, it can be used for specifying the "Accept" header that is sent to the server, when + * requesting a template. */ - testability.whenStable = function(callback) { - $browser.notifyWhenNoOutstandingRequests(callback); - }; + function $TemplateRequestProvider() { - return testability; - }]; -} + var httpOptions; -function $TimeoutProvider() { - this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler', - function($rootScope, $browser, $q, $$q, $exceptionHandler) { + /** + * @ngdoc method + * @name $templateRequestProvider#httpOptions + * @description + * The options to be passed to the {@link $http} service when making the request. + * You can use this to override options such as the "Accept" header for template requests. + * + * The {@link $templateRequest} will set the `cache` and the `transformResponse` properties of the + * options if not overridden here. + * + * @param {string=} value new value for the {@link $http} options. + * @returns {string|self} Returns the {@link $http} options when used as getter and self if used as setter. + */ + this.httpOptions = function (val) { + if (val) { + httpOptions = val; + return this; + } + return httpOptions; + }; - var deferreds = {}; + /** + * @ngdoc service + * @name $templateRequest + * + * @description + * The `$templateRequest` service runs security checks then downloads the provided template using + * `$http` and, upon success, stores the contents inside of `$templateCache`. If the HTTP request + * fails or the response data of the HTTP request is empty, a `$compile` error will be thrown (the + * exception can be thwarted by setting the 2nd parameter of the function to true). Note that the + * contents of `$templateCache` are trusted, so the call to `$sce.getTrustedUrl(tpl)` is omitted + * when `tpl` is of type string and `$templateCache` has the matching entry. + * + * If you want to pass custom options to the `$http` service, such as setting the Accept header you + * can configure this via {@link $templateRequestProvider#httpOptions}. + * + * @param {string|TrustedResourceUrl} tpl The HTTP request template URL + * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty + * + * @return {Promise} a promise for the HTTP response data of the given URL. + * + * @property {number} totalPendingRequests total amount of pending template requests being downloaded. + */ + this.$get = ['$templateCache', '$http', '$q', '$sce', function ($templateCache, $http, $q, $sce) { + + function handleRequestFn(tpl, ignoreRequestError) { + handleRequestFn.totalPendingRequests++; + + // We consider the template cache holds only trusted templates, so + // there's no need to go through whitelisting again for keys that already + // are included in there. This also makes Angular accept any script + // directive, no matter its name. However, we still need to unwrap trusted + // types. + if (!isString(tpl) || !$templateCache.get(tpl)) { + tpl = $sce.getTrustedResourceUrl(tpl); + } + var transformResponse = $http.defaults && $http.defaults.transformResponse; - /** - * @ngdoc service - * @name $timeout - * - * @description - * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch - * block and delegates any exceptions to - * {@link ng.$exceptionHandler $exceptionHandler} service. - * - * The return value of calling `$timeout` is a promise, which will be resolved when - * the delay has passed and the timeout function, if provided, is executed. - * - * To cancel a timeout request, call `$timeout.cancel(promise)`. - * - * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to - * synchronously flush the queue of deferred functions. - * - * If you only want a promise that will be resolved after some specified delay - * then you can call `$timeout` without the `fn` function. - * - * @param {function()=} fn A function, whose execution should be delayed. - * @param {number=} [delay=0] Delay in milliseconds. - * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise - * will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block. - * @param {...*=} Pass additional parameters to the executed function. - * @returns {Promise} Promise that will be resolved when the timeout is reached. The promise - * will be resolved with the return value of the `fn` function. - * - */ - function timeout(fn, delay, invokeApply) { - if (!isFunction(fn)) { - invokeApply = delay; - delay = fn; - fn = noop; - } + if (isArray(transformResponse)) { + transformResponse = transformResponse.filter(function (transformer) { + return transformer !== defaultHttpResponseTransform; + }); + } else if (transformResponse === defaultHttpResponseTransform) { + transformResponse = null; + } - var args = sliceArgs(arguments, 3), - skipApply = (isDefined(invokeApply) && !invokeApply), - deferred = (skipApply ? $$q : $q).defer(), - promise = deferred.promise, - timeoutId; + return $http.get(tpl, extend({ + cache: $templateCache, + transformResponse: transformResponse + }, httpOptions)) + ['finally'](function () { + handleRequestFn.totalPendingRequests--; + }) + .then(function (response) { + $templateCache.put(tpl, response.data); + return response.data; + }, handleError); + + function handleError(resp) { + if (!ignoreRequestError) { + throw $templateRequestMinErr('tpload', 'Failed to load template: {0} (HTTP status: {1} {2})', + tpl, resp.status, resp.statusText); + } + return $q.reject(resp); + } + } - timeoutId = $browser.defer(function() { - try { - deferred.resolve(fn.apply(null, args)); - } catch (e) { - deferred.reject(e); - $exceptionHandler(e); - } - finally { - delete deferreds[promise.$$timeoutId]; - } + handleRequestFn.totalPendingRequests = 0; + + return handleRequestFn; + }]; + } + + function $$TestabilityProvider() { + this.$get = ['$rootScope', '$browser', '$location', + function ($rootScope, $browser, $location) { + + /** + * @name $testability + * + * @description + * The private $$testability service provides a collection of methods for use when debugging + * or by automated test and debugging tools. + */ + var testability = {}; + + /** + * @name $$testability#findBindings + * + * @description + * Returns an array of elements that are bound (via ng-bind or {{}}) + * to expressions matching the input. + * + * @param {Element} element The element root to search from. + * @param {string} expression The binding expression to match. + * @param {boolean} opt_exactMatch If true, only returns exact matches + * for the expression. Filters and whitespace are ignored. + */ + testability.findBindings = function (element, expression, opt_exactMatch) { + var bindings = element.getElementsByClassName('ng-binding'); + var matches = []; + forEach(bindings, function (binding) { + var dataBinding = angular.element(binding).data('$binding'); + if (dataBinding) { + forEach(dataBinding, function (bindingName) { + if (opt_exactMatch) { + var matcher = new RegExp('(^|\\s)' + escapeForRegexp(expression) + '(\\s|\\||$)'); + if (matcher.test(bindingName)) { + matches.push(binding); + } + } else { + if (bindingName.indexOf(expression) != -1) { + matches.push(binding); + } + } + }); + } + }); + return matches; + }; - if (!skipApply) $rootScope.$apply(); - }, delay); + /** + * @name $$testability#findModels + * + * @description + * Returns an array of elements that are two-way found via ng-model to + * expressions matching the input. + * + * @param {Element} element The element root to search from. + * @param {string} expression The model expression to match. + * @param {boolean} opt_exactMatch If true, only returns exact matches + * for the expression. + */ + testability.findModels = function (element, expression, opt_exactMatch) { + var prefixes = ['ng-', 'data-ng-', 'ng\\:']; + for (var p = 0; p < prefixes.length; ++p) { + var attributeEquals = opt_exactMatch ? '=' : '*='; + var selector = '[' + prefixes[p] + 'model' + attributeEquals + '"' + expression + '"]'; + var elements = element.querySelectorAll(selector); + if (elements.length) { + return elements; + } + } + }; - promise.$$timeoutId = timeoutId; - deferreds[timeoutId] = deferred; + /** + * @name $$testability#getLocation + * + * @description + * Shortcut for getting the location in a browser agnostic way. Returns + * the path, search, and hash. (e.g. /path?a=b#hash) + */ + testability.getLocation = function () { + return $location.url(); + }; - return promise; - } + /** + * @name $$testability#setLocation + * + * @description + * Shortcut for navigating to a location without doing a full page reload. + * + * @param {string} url The location url (path, search and hash, + * e.g. /path?a=b#hash) to go to. + */ + testability.setLocation = function (url) { + if (url !== $location.url()) { + $location.url(url); + $rootScope.$digest(); + } + }; + /** + * @name $$testability#whenStable + * + * @description + * Calls the callback when $timeout and $http requests are completed. + * + * @param {function} callback + */ + testability.whenStable = function (callback) { + $browser.notifyWhenNoOutstandingRequests(callback); + }; + + return testability; + }]; + } + + function $TimeoutProvider() { + this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler', + function ($rootScope, $browser, $q, $$q, $exceptionHandler) { + + var deferreds = {}; + + + /** + * @ngdoc service + * @name $timeout + * + * @description + * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch + * block and delegates any exceptions to + * {@link ng.$exceptionHandler $exceptionHandler} service. + * + * The return value of calling `$timeout` is a promise, which will be resolved when + * the delay has passed and the timeout function, if provided, is executed. + * + * To cancel a timeout request, call `$timeout.cancel(promise)`. + * + * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to + * synchronously flush the queue of deferred functions. + * + * If you only want a promise that will be resolved after some specified delay + * then you can call `$timeout` without the `fn` function. + * + * @param {function()=} fn A function, whose execution should be delayed. + * @param {number=} [delay=0] Delay in milliseconds. + * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise + * will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block. + * @param {...*=} Pass additional parameters to the executed function. + * @returns {Promise} Promise that will be resolved when the timeout is reached. The promise + * will be resolved with the return value of the `fn` function. + * + */ + function timeout(fn, delay, invokeApply) { + if (!isFunction(fn)) { + invokeApply = delay; + delay = fn; + fn = noop; + } + + var args = sliceArgs(arguments, 3), + skipApply = (isDefined(invokeApply) && !invokeApply), + deferred = (skipApply ? $$q : $q).defer(), + promise = deferred.promise, + timeoutId; + + timeoutId = $browser.defer(function () { + try { + deferred.resolve(fn.apply(null, args)); + } catch (e) { + deferred.reject(e); + $exceptionHandler(e); + } + finally { + delete deferreds[promise.$$timeoutId]; + } + + if (!skipApply) $rootScope.$apply(); + }, delay); + + promise.$$timeoutId = timeoutId; + deferreds[timeoutId] = deferred; + + return promise; + } - /** - * @ngdoc method - * @name $timeout#cancel - * - * @description - * Cancels a task associated with the `promise`. As a result of this, the promise will be - * resolved with a rejection. - * - * @param {Promise=} promise Promise returned by the `$timeout` function. - * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully - * canceled. - */ - timeout.cancel = function(promise) { - if (promise && promise.$$timeoutId in deferreds) { - deferreds[promise.$$timeoutId].reject('canceled'); - delete deferreds[promise.$$timeoutId]; - return $browser.defer.cancel(promise.$$timeoutId); - } - return false; - }; - return timeout; - }]; -} + /** + * @ngdoc method + * @name $timeout#cancel + * + * @description + * Cancels a task associated with the `promise`. As a result of this, the promise will be + * resolved with a rejection. + * + * @param {Promise=} promise Promise returned by the `$timeout` function. + * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully + * canceled. + */ + timeout.cancel = function (promise) { + if (promise && promise.$$timeoutId in deferreds) { + deferreds[promise.$$timeoutId].reject('canceled'); + delete deferreds[promise.$$timeoutId]; + return $browser.defer.cancel(promise.$$timeoutId); + } + return false; + }; + + return timeout; + }]; + } // NOTE: The usage of window and document instead of $window and $document here is // deliberate. This service depends on the specific behavior of anchor nodes created by the @@ -19205,196 +19293,196 @@ function $TimeoutProvider() { // doesn't know about mocked locations and resolves URLs to the real document - which is // exactly the behavior needed here. There is little value is mocking these out for this // service. -var urlParsingNode = window.document.createElement("a"); -var originUrl = urlResolve(window.location.href); + var urlParsingNode = window.document.createElement("a"); + var originUrl = urlResolve(window.location.href); + + + /** + * + * Implementation Notes for non-IE browsers + * ---------------------------------------- + * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM, + * results both in the normalizing and parsing of the URL. Normalizing means that a relative + * URL will be resolved into an absolute URL in the context of the application document. + * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related + * properties are all populated to reflect the normalized URL. This approach has wide + * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc. See + * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html + * + * Implementation Notes for IE + * --------------------------- + * IE <= 10 normalizes the URL when assigned to the anchor node similar to the other + * browsers. However, the parsed components will not be set if the URL assigned did not specify + * them. (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.) We + * work around that by performing the parsing in a 2nd step by taking a previously normalized + * URL (e.g. by assigning to a.href) and assigning it a.href again. This correctly populates the + * properties such as protocol, hostname, port, etc. + * + * References: + * http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement + * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html + * http://url.spec.whatwg.org/#urlutils + * https://github.com/angular/angular.js/pull/2902 + * http://james.padolsey.com/javascript/parsing-urls-with-the-dom/ + * + * @kind function + * @param {string} url The URL to be parsed. + * @description Normalizes and parses a URL. + * @returns {object} Returns the normalized URL as a dictionary. + * + * | member name | Description | + * |---------------|----------------| + * | href | A normalized version of the provided URL if it was not an absolute URL | + * | protocol | The protocol including the trailing colon | + * | host | The host and port (if the port is non-default) of the normalizedUrl | + * | search | The search params, minus the question mark | + * | hash | The hash string, minus the hash symbol + * | hostname | The hostname + * | port | The port, without ":" + * | pathname | The pathname, beginning with "/" + * + */ + function urlResolve(url) { + var href = url; + if (msie) { + // Normalize before parse. Refer Implementation Notes on why this is + // done in two steps on IE. + urlParsingNode.setAttribute("href", href); + href = urlParsingNode.href; + } -/** - * - * Implementation Notes for non-IE browsers - * ---------------------------------------- - * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM, - * results both in the normalizing and parsing of the URL. Normalizing means that a relative - * URL will be resolved into an absolute URL in the context of the application document. - * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related - * properties are all populated to reflect the normalized URL. This approach has wide - * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc. See - * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html - * - * Implementation Notes for IE - * --------------------------- - * IE <= 10 normalizes the URL when assigned to the anchor node similar to the other - * browsers. However, the parsed components will not be set if the URL assigned did not specify - * them. (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.) We - * work around that by performing the parsing in a 2nd step by taking a previously normalized - * URL (e.g. by assigning to a.href) and assigning it a.href again. This correctly populates the - * properties such as protocol, hostname, port, etc. - * - * References: - * http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement - * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html - * http://url.spec.whatwg.org/#urlutils - * https://github.com/angular/angular.js/pull/2902 - * http://james.padolsey.com/javascript/parsing-urls-with-the-dom/ - * - * @kind function - * @param {string} url The URL to be parsed. - * @description Normalizes and parses a URL. - * @returns {object} Returns the normalized URL as a dictionary. - * - * | member name | Description | - * |---------------|----------------| - * | href | A normalized version of the provided URL if it was not an absolute URL | - * | protocol | The protocol including the trailing colon | - * | host | The host and port (if the port is non-default) of the normalizedUrl | - * | search | The search params, minus the question mark | - * | hash | The hash string, minus the hash symbol - * | hostname | The hostname - * | port | The port, without ":" - * | pathname | The pathname, beginning with "/" - * - */ -function urlResolve(url) { - var href = url; - - if (msie) { - // Normalize before parse. Refer Implementation Notes on why this is - // done in two steps on IE. - urlParsingNode.setAttribute("href", href); - href = urlParsingNode.href; - } - - urlParsingNode.setAttribute('href', href); - - // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils - return { - href: urlParsingNode.href, - protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '', - host: urlParsingNode.host, - search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '', - hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', - hostname: urlParsingNode.hostname, - port: urlParsingNode.port, - pathname: (urlParsingNode.pathname.charAt(0) === '/') - ? urlParsingNode.pathname - : '/' + urlParsingNode.pathname - }; -} + urlParsingNode.setAttribute('href', href); -/** - * Parse a request URL and determine whether this is a same-origin request as the application document. - * - * @param {string|object} requestUrl The url of the request as a string that will be resolved - * or a parsed URL object. - * @returns {boolean} Whether the request is for the same origin as the application document. - */ -function urlIsSameOrigin(requestUrl) { - var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl; - return (parsed.protocol === originUrl.protocol && - parsed.host === originUrl.host); -} + // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils + return { + href: urlParsingNode.href, + protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '', + host: urlParsingNode.host, + search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '', + hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', + hostname: urlParsingNode.hostname, + port: urlParsingNode.port, + pathname: (urlParsingNode.pathname.charAt(0) === '/') + ? urlParsingNode.pathname + : '/' + urlParsingNode.pathname + }; + } -/** - * @ngdoc service - * @name $window - * - * @description - * A reference to the browser's `window` object. While `window` - * is globally available in JavaScript, it causes testability problems, because - * it is a global variable. In angular we always refer to it through the - * `$window` service, so it may be overridden, removed or mocked for testing. - * - * Expressions, like the one defined for the `ngClick` directive in the example - * below, are evaluated with respect to the current scope. Therefore, there is - * no risk of inadvertently coding in a dependency on a global value in such an - * expression. - * - * @example - + /** + * Parse a request URL and determine whether this is a same-origin request as the application document. + * + * @param {string|object} requestUrl The url of the request as a string that will be resolved + * or a parsed URL object. + * @returns {boolean} Whether the request is for the same origin as the application document. + */ + function urlIsSameOrigin(requestUrl) { + var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl; + return (parsed.protocol === originUrl.protocol && + parsed.host === originUrl.host); + } + + /** + * @ngdoc service + * @name $window + * + * @description + * A reference to the browser's `window` object. While `window` + * is globally available in JavaScript, it causes testability problems, because + * it is a global variable. In angular we always refer to it through the + * `$window` service, so it may be overridden, removed or mocked for testing. + * + * Expressions, like the one defined for the `ngClick` directive in the example + * below, are evaluated with respect to the current scope. Therefore, there is + * no risk of inadvertently coding in a dependency on a global value in such an + * expression. + * + * @example + - -
- - -
+ +
+ + +
- it('should display the greeting in the input box', function() { + it('should display the greeting in the input box', function() { element(by.model('greeting')).sendKeys('Hello, E2E Tests'); // If we click the button it will block the test runner // element(':button').click(); }); - - */ -function $WindowProvider() { - this.$get = valueFn(window); -} - -/** - * @name $$cookieReader - * @requires $document - * - * @description - * This is a private service for reading cookies used by $http and ngCookies - * - * @return {Object} a key/value map of the current cookies - */ -function $$CookieReader($document) { - var rawDocument = $document[0] || {}; - var lastCookies = {}; - var lastCookieString = ''; - - function safeDecodeURIComponent(str) { - try { - return decodeURIComponent(str); - } catch (e) { - return str; + + */ + function $WindowProvider() { + this.$get = valueFn(window); } - } - - return function() { - var cookieArray, cookie, i, index, name; - var currentCookieString = rawDocument.cookie || ''; - - if (currentCookieString !== lastCookieString) { - lastCookieString = currentCookieString; - cookieArray = lastCookieString.split('; '); - lastCookies = {}; - - for (i = 0; i < cookieArray.length; i++) { - cookie = cookieArray[i]; - index = cookie.indexOf('='); - if (index > 0) { //ignore nameless cookies - name = safeDecodeURIComponent(cookie.substring(0, index)); - // the first value that is seen for a cookie is the most - // specific one. values for the same cookie name that - // follow are for less specific paths. - if (isUndefined(lastCookies[name])) { - lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1)); - } + + /** + * @name $$cookieReader + * @requires $document + * + * @description + * This is a private service for reading cookies used by $http and ngCookies + * + * @return {Object} a key/value map of the current cookies + */ + function $$CookieReader($document) { + var rawDocument = $document[0] || {}; + var lastCookies = {}; + var lastCookieString = ''; + + function safeDecodeURIComponent(str) { + try { + return decodeURIComponent(str); + } catch (e) { + return str; + } } - } + + return function () { + var cookieArray, cookie, i, index, name; + var currentCookieString = rawDocument.cookie || ''; + + if (currentCookieString !== lastCookieString) { + lastCookieString = currentCookieString; + cookieArray = lastCookieString.split('; '); + lastCookies = {}; + + for (i = 0; i < cookieArray.length; i++) { + cookie = cookieArray[i]; + index = cookie.indexOf('='); + if (index > 0) { //ignore nameless cookies + name = safeDecodeURIComponent(cookie.substring(0, index)); + // the first value that is seen for a cookie is the most + // specific one. values for the same cookie name that + // follow are for less specific paths. + if (isUndefined(lastCookies[name])) { + lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1)); + } + } + } + } + return lastCookies; + }; } - return lastCookies; - }; -} -$$CookieReader.$inject = ['$document']; + $$CookieReader.$inject = ['$document']; -function $$CookieReaderProvider() { - this.$get = $$CookieReader; -} + function $$CookieReaderProvider() { + this.$get = $$CookieReader; + } -/* global currencyFilter: true, + /* global currencyFilter: true, dateFilter: true, filterFilter: true, jsonFilter: true, @@ -19405,25 +19493,25 @@ function $$CookieReaderProvider() { uppercaseFilter: true, */ -/** - * @ngdoc provider - * @name $filterProvider - * @description - * - * Filters are just functions which transform input to an output. However filters need to be - * Dependency Injected. To achieve this a filter definition consists of a factory function which is - * annotated with dependencies and is responsible for creating a filter function. - * - *
- * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`. - * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace - * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores - * (`myapp_subsection_filterx`). - *
- * - * ```js - * // Filter registration - * function MyModule($provide, $filterProvider) { + /** + * @ngdoc provider + * @name $filterProvider + * @description + * + * Filters are just functions which transform input to an output. However filters need to be + * Dependency Injected. To achieve this a filter definition consists of a factory function which is + * annotated with dependencies and is responsible for creating a filter function. + * + *
+ * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`. + * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace + * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores + * (`myapp_subsection_filterx`). + *
+ * + * ```js + * // Filter registration + * function MyModule($provide, $filterProvider) { * // create a service to demonstrate injection (not always needed) * $provide.value('greet', function(name){ * return 'Hello ' + name + '!'; @@ -19440,101 +19528,103 @@ function $$CookieReaderProvider() { * }; * }); * } - * ``` - * - * The filter function is registered with the `$injector` under the filter name suffix with - * `Filter`. - * - * ```js - * it('should be the same instance', inject( - * function($filterProvider) { + * ``` + * + * The filter function is registered with the `$injector` under the filter name suffix with + * `Filter`. + * + * ```js + * it('should be the same instance', inject( + * function($filterProvider) { * $filterProvider.register('reverse', function(){ * return ...; * }); * }, - * function($filter, reverseFilter) { + * function($filter, reverseFilter) { * expect($filter('reverse')).toBe(reverseFilter); * }); - * ``` - * - * - * For more information about how angular filters work, and how to create your own filters, see - * {@link guide/filter Filters} in the Angular Developer Guide. - */ + * ``` + * + * + * For more information about how angular filters work, and how to create your own filters, see + * {@link guide/filter Filters} in the Angular Developer Guide. + */ -/** - * @ngdoc service - * @name $filter - * @kind function - * @description - * Filters are used for formatting data displayed to the user. - * - * The general syntax in templates is as follows: - * - * {{ expression [| filter_name[:parameter_value] ... ] }} - * - * @param {String} name Name of the filter function to retrieve - * @return {Function} the filter function - * @example - + /** + * @ngdoc service + * @name $filter + * @kind function + * @description + * Filters are used for formatting data displayed to the user. + * + * The general syntax in templates is as follows: + * + * {{ expression [| filter_name[:parameter_value] ... ] }} + * + * @param {String} name Name of the filter function to retrieve + * @return {Function} the filter function + * @example + -
-

{{ originalText }}

-

{{ filteredText }}

-
+
+

{{ originalText }}

+

{{ filteredText }}

+
- angular.module('filterExample', []) - .controller('MainCtrl', function($scope, $filter) { + angular.module('filterExample', []) + .controller('MainCtrl', function($scope, $filter) { $scope.originalText = 'hello'; $scope.filteredText = $filter('uppercase')($scope.originalText); }); - - */ -$FilterProvider.$inject = ['$provide']; -function $FilterProvider($provide) { - var suffix = 'Filter'; - - /** - * @ngdoc method - * @name $filterProvider#register - * @param {string|Object} name Name of the filter function, or an object map of filters where - * the keys are the filter names and the values are the filter factories. - * - *
- * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`. - * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace - * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores - * (`myapp_subsection_filterx`). - *
- * @param {Function} factory If the first argument was a string, a factory function for the filter to be registered. - * @returns {Object} Registered filter instance, or if a map of filters was provided then a map - * of the registered filter instances. - */ - function register(name, factory) { - if (isObject(name)) { - var filters = {}; - forEach(name, function(filter, key) { - filters[key] = register(key, filter); - }); - return filters; - } else { - return $provide.factory(name + suffix, factory); - } - } - this.register = register; + + */ + $FilterProvider.$inject = ['$provide']; - this.$get = ['$injector', function($injector) { - return function(name) { - return $injector.get(name + suffix); - }; - }]; + function $FilterProvider($provide) { + var suffix = 'Filter'; + + /** + * @ngdoc method + * @name $filterProvider#register + * @param {string|Object} name Name of the filter function, or an object map of filters where + * the keys are the filter names and the values are the filter factories. + * + *
+ * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`. + * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace + * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores + * (`myapp_subsection_filterx`). + *
+ * @param {Function} factory If the first argument was a string, a factory function for the filter to be registered. + * @returns {Object} Registered filter instance, or if a map of filters was provided then a map + * of the registered filter instances. + */ + function register(name, factory) { + if (isObject(name)) { + var filters = {}; + forEach(name, function (filter, key) { + filters[key] = register(key, filter); + }); + return filters; + } else { + return $provide.factory(name + suffix, factory); + } + } + + this.register = register; - //////////////////////////////////////// + this.$get = ['$injector', function ($injector) { + return function (name) { + return $injector.get(name + suffix); + }; + }]; + + //////////////////////////////////////// - /* global + /* global currencyFilter: false, dateFilter: false, filterFilter: false, @@ -19546,109 +19636,109 @@ function $FilterProvider($provide) { uppercaseFilter: false, */ - register('currency', currencyFilter); - register('date', dateFilter); - register('filter', filterFilter); - register('json', jsonFilter); - register('limitTo', limitToFilter); - register('lowercase', lowercaseFilter); - register('number', numberFilter); - register('orderBy', orderByFilter); - register('uppercase', uppercaseFilter); -} + register('currency', currencyFilter); + register('date', dateFilter); + register('filter', filterFilter); + register('json', jsonFilter); + register('limitTo', limitToFilter); + register('lowercase', lowercaseFilter); + register('number', numberFilter); + register('orderBy', orderByFilter); + register('uppercase', uppercaseFilter); + } -/** - * @ngdoc filter - * @name filter - * @kind function - * - * @description - * Selects a subset of items from `array` and returns it as a new array. - * - * @param {Array} array The source array. - * @param {string|Object|function()} expression The predicate to be used for selecting items from - * `array`. - * - * Can be one of: - * - * - `string`: The string is used for matching against the contents of the `array`. All strings or - * objects with string properties in `array` that match this string will be returned. This also - * applies to nested object properties. - * The predicate can be negated by prefixing the string with `!`. - * - * - `Object`: A pattern object can be used to filter specific properties on objects contained - * by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items - * which have property `name` containing "M" and property `phone` containing "1". A special - * property name `$` can be used (as in `{$:"text"}`) to accept a match against any - * property of the object or its nested object properties. That's equivalent to the simple - * substring match with a `string` as described above. The predicate can be negated by prefixing - * the string with `!`. - * For example `{name: "!M"}` predicate will return an array of items which have property `name` - * not containing "M". - * - * Note that a named property will match properties on the same level only, while the special - * `$` property will match properties on the same level or deeper. E.g. an array item like - * `{name: {first: 'John', last: 'Doe'}}` will **not** be matched by `{name: 'John'}`, but - * **will** be matched by `{$: 'John'}`. - * - * - `function(value, index, array)`: A predicate function can be used to write arbitrary filters. - * The function is called for each element of the array, with the element, its index, and - * the entire array itself as arguments. - * - * The final result is an array of those elements that the predicate returned true for. - * - * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in - * determining if the expected value (from the filter expression) and actual value (from - * the object in the array) should be considered a match. - * - * Can be one of: - * - * - `function(actual, expected)`: - * The function will be given the object value and the predicate value to compare and - * should return true if both values should be considered equal. - * - * - `true`: A shorthand for `function(actual, expected) { return angular.equals(actual, expected)}`. - * This is essentially strict comparison of expected and actual. - * - * - `false|undefined`: A short hand for a function which will look for a substring match in case - * insensitive way. - * - * Primitive values are converted to strings. Objects are not compared against primitives, - * unless they have a custom `toString` method (e.g. `Date` objects). - * - * @example - + /** + * @ngdoc filter + * @name filter + * @kind function + * + * @description + * Selects a subset of items from `array` and returns it as a new array. + * + * @param {Array} array The source array. + * @param {string|Object|function()} expression The predicate to be used for selecting items from + * `array`. + * + * Can be one of: + * + * - `string`: The string is used for matching against the contents of the `array`. All strings or + * objects with string properties in `array` that match this string will be returned. This also + * applies to nested object properties. + * The predicate can be negated by prefixing the string with `!`. + * + * - `Object`: A pattern object can be used to filter specific properties on objects contained + * by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items + * which have property `name` containing "M" and property `phone` containing "1". A special + * property name `$` can be used (as in `{$:"text"}`) to accept a match against any + * property of the object or its nested object properties. That's equivalent to the simple + * substring match with a `string` as described above. The predicate can be negated by prefixing + * the string with `!`. + * For example `{name: "!M"}` predicate will return an array of items which have property `name` + * not containing "M". + * + * Note that a named property will match properties on the same level only, while the special + * `$` property will match properties on the same level or deeper. E.g. an array item like + * `{name: {first: 'John', last: 'Doe'}}` will **not** be matched by `{name: 'John'}`, but + * **will** be matched by `{$: 'John'}`. + * + * - `function(value, index, array)`: A predicate function can be used to write arbitrary filters. + * The function is called for each element of the array, with the element, its index, and + * the entire array itself as arguments. + * + * The final result is an array of those elements that the predicate returned true for. + * + * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in + * determining if the expected value (from the filter expression) and actual value (from + * the object in the array) should be considered a match. + * + * Can be one of: + * + * - `function(actual, expected)`: + * The function will be given the object value and the predicate value to compare and + * should return true if both values should be considered equal. + * + * - `true`: A shorthand for `function(actual, expected) { return angular.equals(actual, expected)}`. + * This is essentially strict comparison of expected and actual. + * + * - `false|undefined`: A short hand for a function which will look for a substring match in case + * insensitive way. + * + * Primitive values are converted to strings. Objects are not compared against primitives, + * unless they have a custom `toString` method (e.g. `Date` objects). + * + * @example + -
- - - - - - - - -
NamePhone
{{friend.name}}{{friend.phone}}
-
-
-
-
-
- - - - - - -
NamePhone
{{friendObj.name}}{{friendObj.phone}}
+
+ + + + + + + + +
NamePhone
{{friend.name}}{{friend.phone}}
+
+
+
+
+
+ + + + + + +
NamePhone
{{friendObj.name}}{{friendObj.phone}}
 - var expectFriendNames = function(expectedNames, key) { + var expectFriendNames = function(expectedNames, key) { element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) { arr.forEach(function(wd, i) { expect(wd.getText()).toMatch(expectedNames[i]); @@ -19656,7 +19746,7 @@ function $FilterProvider($provide) { }); }; - it('should search across all fields when filtering with a string', function() { + it('should search across all fields when filtering with a string', function() { var searchText = element(by.model('searchText')); searchText.clear(); searchText.sendKeys('m'); @@ -19667,13 +19757,13 @@ function $FilterProvider($provide) { expectFriendNames(['John', 'Julie'], 'friend'); }); - it('should search in specific fields when filtering with a predicate object', function() { + it('should search in specific fields when filtering with a predicate object', function() { var searchAny = element(by.model('search.$')); searchAny.clear(); searchAny.sendKeys('i'); expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj'); }); - it('should use a equal comparison when comparator is true', function() { + it('should use a equal comparison when comparator is true', function() { var searchName = element(by.model('search.name')); var strict = element(by.model('strict')); searchName.clear(); @@ -19682,178 +19772,178 @@ function $FilterProvider($provide) { expectFriendNames(['Julie'], 'friendObj'); }); - - */ -function filterFilter() { - return function(array, expression, comparator) { - if (!isArrayLike(array)) { - if (array == null) { - return array; - } else { - throw minErr('filter')('notarray', 'Expected array but received: {0}', array); - } - } + + */ + function filterFilter() { + return function (array, expression, comparator) { + if (!isArrayLike(array)) { + if (array == null) { + return array; + } else { + throw minErr('filter')('notarray', 'Expected array but received: {0}', array); + } + } - var expressionType = getTypeForFilter(expression); - var predicateFn; - var matchAgainstAnyProp; - - switch (expressionType) { - case 'function': - predicateFn = expression; - break; - case 'boolean': - case 'null': - case 'number': - case 'string': - matchAgainstAnyProp = true; - //jshint -W086 - case 'object': - //jshint +W086 - predicateFn = createPredicateFn(expression, comparator, matchAgainstAnyProp); - break; - default: - return array; - } + var expressionType = getTypeForFilter(expression); + var predicateFn; + var matchAgainstAnyProp; + + switch (expressionType) { + case 'function': + predicateFn = expression; + break; + case 'boolean': + case 'null': + case 'number': + case 'string': + matchAgainstAnyProp = true; + //jshint -W086 + case 'object': + //jshint +W086 + predicateFn = createPredicateFn(expression, comparator, matchAgainstAnyProp); + break; + default: + return array; + } - return Array.prototype.filter.call(array, predicateFn); - }; -} + return Array.prototype.filter.call(array, predicateFn); + }; + } // Helper functions for `filterFilter` -function createPredicateFn(expression, comparator, matchAgainstAnyProp) { - var shouldMatchPrimitives = isObject(expression) && ('$' in expression); - var predicateFn; - - if (comparator === true) { - comparator = equals; - } else if (!isFunction(comparator)) { - comparator = function(actual, expected) { - if (isUndefined(actual)) { - // No substring matching against `undefined` - return false; - } - if ((actual === null) || (expected === null)) { - // No substring matching against `null`; only match against `null` - return actual === expected; - } - if (isObject(expected) || (isObject(actual) && !hasCustomToString(actual))) { - // Should not compare primitives against objects, unless they have custom `toString` method - return false; - } + function createPredicateFn(expression, comparator, matchAgainstAnyProp) { + var shouldMatchPrimitives = isObject(expression) && ('$' in expression); + var predicateFn; + + if (comparator === true) { + comparator = equals; + } else if (!isFunction(comparator)) { + comparator = function (actual, expected) { + if (isUndefined(actual)) { + // No substring matching against `undefined` + return false; + } + if ((actual === null) || (expected === null)) { + // No substring matching against `null`; only match against `null` + return actual === expected; + } + if (isObject(expected) || (isObject(actual) && !hasCustomToString(actual))) { + // Should not compare primitives against objects, unless they have custom `toString` method + return false; + } - actual = lowercase('' + actual); - expected = lowercase('' + expected); - return actual.indexOf(expected) !== -1; - }; - } + actual = lowercase('' + actual); + expected = lowercase('' + expected); + return actual.indexOf(expected) !== -1; + }; + } + + predicateFn = function (item) { + if (shouldMatchPrimitives && !isObject(item)) { + return deepCompare(item, expression.$, comparator, false); + } + return deepCompare(item, expression, comparator, matchAgainstAnyProp); + }; - predicateFn = function(item) { - if (shouldMatchPrimitives && !isObject(item)) { - return deepCompare(item, expression.$, comparator, false); + return predicateFn; } - return deepCompare(item, expression, comparator, matchAgainstAnyProp); - }; - - return predicateFn; -} - -function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatchWholeObject) { - var actualType = getTypeForFilter(actual); - var expectedType = getTypeForFilter(expected); - - if ((expectedType === 'string') && (expected.charAt(0) === '!')) { - return !deepCompare(actual, expected.substring(1), comparator, matchAgainstAnyProp); - } else if (isArray(actual)) { - // In case `actual` is an array, consider it a match - // if ANY of it's items matches `expected` - return actual.some(function(item) { - return deepCompare(item, expected, comparator, matchAgainstAnyProp); - }); - } - - switch (actualType) { - case 'object': - var key; - if (matchAgainstAnyProp) { - for (key in actual) { - if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, true)) { - return true; - } + + function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatchWholeObject) { + var actualType = getTypeForFilter(actual); + var expectedType = getTypeForFilter(expected); + + if ((expectedType === 'string') && (expected.charAt(0) === '!')) { + return !deepCompare(actual, expected.substring(1), comparator, matchAgainstAnyProp); + } else if (isArray(actual)) { + // In case `actual` is an array, consider it a match + // if ANY of it's items matches `expected` + return actual.some(function (item) { + return deepCompare(item, expected, comparator, matchAgainstAnyProp); + }); } - return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, false); - } else if (expectedType === 'object') { - for (key in expected) { - var expectedVal = expected[key]; - if (isFunction(expectedVal) || isUndefined(expectedVal)) { - continue; - } - var matchAnyProperty = key === '$'; - var actualVal = matchAnyProperty ? actual : actual[key]; - if (!deepCompare(actualVal, expectedVal, comparator, matchAnyProperty, matchAnyProperty)) { - return false; - } + switch (actualType) { + case 'object': + var key; + if (matchAgainstAnyProp) { + for (key in actual) { + if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, true)) { + return true; + } + } + return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, false); + } else if (expectedType === 'object') { + for (key in expected) { + var expectedVal = expected[key]; + if (isFunction(expectedVal) || isUndefined(expectedVal)) { + continue; + } + + var matchAnyProperty = key === '$'; + var actualVal = matchAnyProperty ? actual : actual[key]; + if (!deepCompare(actualVal, expectedVal, comparator, matchAnyProperty, matchAnyProperty)) { + return false; + } + } + return true; + } else { + return comparator(actual, expected); + } + break; + case 'function': + return false; + default: + return comparator(actual, expected); } - return true; - } else { - return comparator(actual, expected); - } - break; - case 'function': - return false; - default: - return comparator(actual, expected); - } -} + } // Used for easily differentiating between `null` and actual `object` -function getTypeForFilter(val) { - return (val === null) ? 'null' : typeof val; -} + function getTypeForFilter(val) { + return (val === null) ? 'null' : typeof val; + } -var MAX_DIGITS = 22; -var DECIMAL_SEP = '.'; -var ZERO_CHAR = '0'; + var MAX_DIGITS = 22; + var DECIMAL_SEP = '.'; + var ZERO_CHAR = '0'; -/** - * @ngdoc filter - * @name currency - * @kind function - * - * @description - * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default - * symbol for current locale is used. - * - * @param {number} amount Input to filter. - * @param {string=} symbol Currency symbol or identifier to be displayed. - * @param {number=} fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale - * @returns {string} Formatted number. - * - * - * @example - + /** + * @ngdoc filter + * @name currency + * @kind function + * + * @description + * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default + * symbol for current locale is used. + * + * @param {number} amount Input to filter. + * @param {string=} symbol Currency symbol or identifier to be displayed. + * @param {number=} fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale + * @returns {string} Formatted number. + * + * + * @example + - -
-
- default currency symbol ($): {{amount | currency}}
- custom currency identifier (USD$): {{amount | currency:"USD$"}} - no fractions (0): {{amount | currency:"USD$":0}} -
+ +
+
+ default currency symbol ($): {{amount | currency}}
+ custom currency identifier (USD$): {{amount | currency:"USD$"}} + no fractions (0): {{amount | currency:"USD$":0}} +
- it('should init with 1234.56', function() { + it('should init with 1234.56', function() { expect(element(by.id('currency-default')).getText()).toBe('$1,234.56'); expect(element(by.id('currency-custom')).getText()).toBe('USD$1,234.56'); expect(element(by.id('currency-no-fractions')).getText()).toBe('USD$1,235'); }); - it('should update', function() { + it('should update', function() { if (browser.params.browser == 'safari') { // Safari does not understand the minus key. See // https://github.com/angular/protractor/issues/481 @@ -19866,73 +19956,73 @@ var ZERO_CHAR = '0'; expect(element(by.id('currency-no-fractions')).getText()).toBe('-USD$1,234'); }); - - */ -currencyFilter.$inject = ['$locale']; -function currencyFilter($locale) { - var formats = $locale.NUMBER_FORMATS; - return function(amount, currencySymbol, fractionSize) { - if (isUndefined(currencySymbol)) { - currencySymbol = formats.CURRENCY_SYM; - } + + */ + currencyFilter.$inject = ['$locale']; - if (isUndefined(fractionSize)) { - fractionSize = formats.PATTERNS[1].maxFrac; - } + function currencyFilter($locale) { + var formats = $locale.NUMBER_FORMATS; + return function (amount, currencySymbol, fractionSize) { + if (isUndefined(currencySymbol)) { + currencySymbol = formats.CURRENCY_SYM; + } - // if null or undefined pass it through - return (amount == null) - ? amount - : formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, fractionSize). - replace(/\u00A4/g, currencySymbol); - }; -} + if (isUndefined(fractionSize)) { + fractionSize = formats.PATTERNS[1].maxFrac; + } -/** - * @ngdoc filter - * @name number - * @kind function - * - * @description - * Formats a number as text. - * - * If the input is null or undefined, it will just be returned. - * If the input is infinite (Infinity or -Infinity), the Infinity symbol '∞' or '-∞' is returned, respectively. - * If the input is not a number an empty string is returned. - * - * - * @param {number|string} number Number to format. - * @param {(number|string)=} fractionSize Number of decimal places to round the number to. - * If this is not provided then the fraction size is computed from the current locale's number - * formatting pattern. In the case of the default locale, it will be 3. - * @returns {string} Number rounded to `fractionSize` appropriately formatted based on the current - * locale (e.g., in the en_US locale it will have "." as the decimal separator and - * include "," group separators after each third digit). - * - * @example - + // if null or undefined pass it through + return (amount == null) + ? amount + : formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, fractionSize).replace(/\u00A4/g, currencySymbol); + }; + } + + /** + * @ngdoc filter + * @name number + * @kind function + * + * @description + * Formats a number as text. + * + * If the input is null or undefined, it will just be returned. + * If the input is infinite (Infinity or -Infinity), the Infinity symbol '∞' or '-∞' is returned, respectively. + * If the input is not a number an empty string is returned. + * + * + * @param {number|string} number Number to format. + * @param {(number|string)=} fractionSize Number of decimal places to round the number to. + * If this is not provided then the fraction size is computed from the current locale's number + * formatting pattern. In the case of the default locale, it will be 3. + * @returns {string} Number rounded to `fractionSize` appropriately formatted based on the current + * locale (e.g., in the en_US locale it will have "." as the decimal separator and + * include "," group separators after each third digit). + * + * @example + - -
-
- Default formatting: {{val | number}}
- No fractions: {{val | number:0}}
- Negative number: {{-val | number:4}} -
+ +
+
+ Default formatting: {{val | number}}
+ No fractions: {{val | number:0}}
+ Negative number: {{-val | number:4}} +
- it('should format numbers', function() { + it('should format numbers', function() { expect(element(by.id('number-default')).getText()).toBe('1,234.568'); expect(element(by.binding('val | number:0')).getText()).toBe('1,235'); expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679'); }); - it('should update', function() { + it('should update', function() { element(by.model('val')).clear(); element(by.model('val')).sendKeys('3374.333'); expect(element(by.id('number-default')).getText()).toBe('3,374.333'); @@ -19940,150 +20030,152 @@ function currencyFilter($locale) { expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330'); }); - - */ -numberFilter.$inject = ['$locale']; -function numberFilter($locale) { - var formats = $locale.NUMBER_FORMATS; - return function(number, fractionSize) { - - // if null or undefined pass it through - return (number == null) - ? number - : formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP, - fractionSize); - }; -} - -/** - * Parse a number (as a string) into three components that can be used - * for formatting the number. - * - * (Significant bits of this parse algorithm came from https://github.com/MikeMcl/big.js/) - * - * @param {string} numStr The number to parse - * @return {object} An object describing this number, containing the following keys: - * - d : an array of digits containing leading zeros as necessary - * - i : the number of the digits in `d` that are to the left of the decimal point - * - e : the exponent for numbers that would need more than `MAX_DIGITS` digits in `d` - * - */ -function parse(numStr) { - var exponent = 0, digits, numberOfIntegerDigits; - var i, j, zeros; - - // Decimal point? - if ((numberOfIntegerDigits = numStr.indexOf(DECIMAL_SEP)) > -1) { - numStr = numStr.replace(DECIMAL_SEP, ''); - } - - // Exponential form? - if ((i = numStr.search(/e/i)) > 0) { - // Work out the exponent. - if (numberOfIntegerDigits < 0) numberOfIntegerDigits = i; - numberOfIntegerDigits += +numStr.slice(i + 1); - numStr = numStr.substring(0, i); - } else if (numberOfIntegerDigits < 0) { - // There was no decimal point or exponent so it is an integer. - numberOfIntegerDigits = numStr.length; - } - - // Count the number of leading zeros. - for (i = 0; numStr.charAt(i) == ZERO_CHAR; i++) {/* jshint noempty: false */} - - if (i == (zeros = numStr.length)) { - // The digits are all zero. - digits = [0]; - numberOfIntegerDigits = 1; - } else { - // Count the number of trailing zeros - zeros--; - while (numStr.charAt(zeros) == ZERO_CHAR) zeros--; - - // Trailing zeros are insignificant so ignore them - numberOfIntegerDigits -= i; - digits = []; - // Convert string to array of digits without leading/trailing zeros. - for (j = 0; i <= zeros; i++, j++) { - digits[j] = +numStr.charAt(i); + + */ + numberFilter.$inject = ['$locale']; + + function numberFilter($locale) { + var formats = $locale.NUMBER_FORMATS; + return function (number, fractionSize) { + + // if null or undefined pass it through + return (number == null) + ? number + : formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP, + fractionSize); + }; } - } - // If the number overflows the maximum allowed digits then use an exponent. - if (numberOfIntegerDigits > MAX_DIGITS) { - digits = digits.splice(0, MAX_DIGITS - 1); - exponent = numberOfIntegerDigits - 1; - numberOfIntegerDigits = 1; - } + /** + * Parse a number (as a string) into three components that can be used + * for formatting the number. + * + * (Significant bits of this parse algorithm came from https://github.com/MikeMcl/big.js/) + * + * @param {string} numStr The number to parse + * @return {object} An object describing this number, containing the following keys: + * - d : an array of digits containing leading zeros as necessary + * - i : the number of the digits in `d` that are to the left of the decimal point + * - e : the exponent for numbers that would need more than `MAX_DIGITS` digits in `d` + * + */ + function parse(numStr) { + var exponent = 0, digits, numberOfIntegerDigits; + var i, j, zeros; - return { d: digits, e: exponent, i: numberOfIntegerDigits }; -} + // Decimal point? + if ((numberOfIntegerDigits = numStr.indexOf(DECIMAL_SEP)) > -1) { + numStr = numStr.replace(DECIMAL_SEP, ''); + } -/** - * Round the parsed number to the specified number of decimal places - * This function changed the parsedNumber in-place - */ -function roundNumber(parsedNumber, fractionSize, minFrac, maxFrac) { - var digits = parsedNumber.d; - var fractionLen = digits.length - parsedNumber.i; + // Exponential form? + if ((i = numStr.search(/e/i)) > 0) { + // Work out the exponent. + if (numberOfIntegerDigits < 0) numberOfIntegerDigits = i; + numberOfIntegerDigits += +numStr.slice(i + 1); + numStr = numStr.substring(0, i); + } else if (numberOfIntegerDigits < 0) { + // There was no decimal point or exponent so it is an integer. + numberOfIntegerDigits = numStr.length; + } - // determine fractionSize if it is not specified; `+fractionSize` converts it to a number - fractionSize = (isUndefined(fractionSize)) ? Math.min(Math.max(minFrac, fractionLen), maxFrac) : +fractionSize; + // Count the number of leading zeros. + for (i = 0; numStr.charAt(i) == ZERO_CHAR; i++) {/* jshint noempty: false */ + } - // The index of the digit to where rounding is to occur - var roundAt = fractionSize + parsedNumber.i; - var digit = digits[roundAt]; + if (i == (zeros = numStr.length)) { + // The digits are all zero. + digits = [0]; + numberOfIntegerDigits = 1; + } else { + // Count the number of trailing zeros + zeros--; + while (numStr.charAt(zeros) == ZERO_CHAR) zeros--; + + // Trailing zeros are insignificant so ignore them + numberOfIntegerDigits -= i; + digits = []; + // Convert string to array of digits without leading/trailing zeros. + for (j = 0; i <= zeros; i++, j++) { + digits[j] = +numStr.charAt(i); + } + } - if (roundAt > 0) { - // Drop fractional digits beyond `roundAt` - digits.splice(Math.max(parsedNumber.i, roundAt)); + // If the number overflows the maximum allowed digits then use an exponent. + if (numberOfIntegerDigits > MAX_DIGITS) { + digits = digits.splice(0, MAX_DIGITS - 1); + exponent = numberOfIntegerDigits - 1; + numberOfIntegerDigits = 1; + } - // Set non-fractional digits beyond `roundAt` to 0 - for (var j = roundAt; j < digits.length; j++) { - digits[j] = 0; - } - } else { - // We rounded to zero so reset the parsedNumber - fractionLen = Math.max(0, fractionLen); - parsedNumber.i = 1; - digits.length = Math.max(1, roundAt = fractionSize + 1); - digits[0] = 0; - for (var i = 1; i < roundAt; i++) digits[i] = 0; + return {d: digits, e: exponent, i: numberOfIntegerDigits}; } - if (digit >= 5) { - if (roundAt - 1 < 0) { - for (var k = 0; k > roundAt; k--) { - digits.unshift(0); - parsedNumber.i++; + /** + * Round the parsed number to the specified number of decimal places + * This function changed the parsedNumber in-place + */ + function roundNumber(parsedNumber, fractionSize, minFrac, maxFrac) { + var digits = parsedNumber.d; + var fractionLen = digits.length - parsedNumber.i; + + // determine fractionSize if it is not specified; `+fractionSize` converts it to a number + fractionSize = (isUndefined(fractionSize)) ? Math.min(Math.max(minFrac, fractionLen), maxFrac) : +fractionSize; + + // The index of the digit to where rounding is to occur + var roundAt = fractionSize + parsedNumber.i; + var digit = digits[roundAt]; + + if (roundAt > 0) { + // Drop fractional digits beyond `roundAt` + digits.splice(Math.max(parsedNumber.i, roundAt)); + + // Set non-fractional digits beyond `roundAt` to 0 + for (var j = roundAt; j < digits.length; j++) { + digits[j] = 0; + } + } else { + // We rounded to zero so reset the parsedNumber + fractionLen = Math.max(0, fractionLen); + parsedNumber.i = 1; + digits.length = Math.max(1, roundAt = fractionSize + 1); + digits[0] = 0; + for (var i = 1; i < roundAt; i++) digits[i] = 0; + } + + if (digit >= 5) { + if (roundAt - 1 < 0) { + for (var k = 0; k > roundAt; k--) { + digits.unshift(0); + parsedNumber.i++; + } + digits.unshift(1); + parsedNumber.i++; + } else { + digits[roundAt - 1]++; + } } - digits.unshift(1); - parsedNumber.i++; - } else { - digits[roundAt - 1]++; - } - } - // Pad out with zeros to get the required fraction length - for (; fractionLen < Math.max(0, fractionSize); fractionLen++) digits.push(0); + // Pad out with zeros to get the required fraction length + for (; fractionLen < Math.max(0, fractionSize); fractionLen++) digits.push(0); - // Do any carrying, e.g. a digit was rounded up to 10 - var carry = digits.reduceRight(function(carry, d, i, digits) { - d = d + carry; - digits[i] = d % 10; - return Math.floor(d / 10); - }, 0); - if (carry) { - digits.unshift(carry); - parsedNumber.i++; + // Do any carrying, e.g. a digit was rounded up to 10 + var carry = digits.reduceRight(function (carry, d, i, digits) { + d = d + carry; + digits[i] = d % 10; + return Math.floor(d / 10); + }, 0); + if (carry) { + digits.unshift(carry); + parsedNumber.i++; + } } -} -/** - * Format a number into a string - * @param {number} number The number to format - * @param {{ + /** + * Format a number into a string + * @param {number} number The number to format + * @param {{ * minFrac, // the minimum number of digits required in the fraction part of the number * maxFrac, // the maximum number of digits required in the fraction part of the number * gSize, // number of digits in each group of separated digits @@ -20093,285 +20185,287 @@ function roundNumber(parsedNumber, fractionSize, minFrac, maxFrac) { * negSuf, // the string to go after a negative number (e.g. `)`) * posSuf // the string to go after a positive number * }} pattern - * @param {string} groupSep The string to separate groups of number (e.g. `,`) - * @param {string} decimalSep The string to act as the decimal separator (e.g. `.`) - * @param {[type]} fractionSize The size of the fractional part of the number - * @return {string} The number formatted as a string - */ -function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) { + * @param {string} groupSep The string to separate groups of number (e.g. `,`) + * @param {string} decimalSep The string to act as the decimal separator (e.g. `.`) + * @param {[type]} fractionSize The size of the fractional part of the number + * @return {string} The number formatted as a string + */ + function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) { - if (!(isString(number) || isNumber(number)) || isNaN(number)) return ''; + if (!(isString(number) || isNumber(number)) || isNaN(number)) return ''; - var isInfinity = !isFinite(number); - var isZero = false; - var numStr = Math.abs(number) + '', - formattedText = '', - parsedNumber; + var isInfinity = !isFinite(number); + var isZero = false; + var numStr = Math.abs(number) + '', + formattedText = '', + parsedNumber; - if (isInfinity) { - formattedText = '\u221e'; - } else { - parsedNumber = parse(numStr); + if (isInfinity) { + formattedText = '\u221e'; + } else { + parsedNumber = parse(numStr); + + roundNumber(parsedNumber, fractionSize, pattern.minFrac, pattern.maxFrac); + + var digits = parsedNumber.d; + var integerLen = parsedNumber.i; + var exponent = parsedNumber.e; + var decimals = []; + isZero = digits.reduce(function (isZero, d) { + return isZero && !d; + }, true); + + // pad zeros for small numbers + while (integerLen < 0) { + digits.unshift(0); + integerLen++; + } - roundNumber(parsedNumber, fractionSize, pattern.minFrac, pattern.maxFrac); + // extract decimals digits + if (integerLen > 0) { + decimals = digits.splice(integerLen); + } else { + decimals = digits; + digits = [0]; + } - var digits = parsedNumber.d; - var integerLen = parsedNumber.i; - var exponent = parsedNumber.e; - var decimals = []; - isZero = digits.reduce(function(isZero, d) { return isZero && !d; }, true); + // format the integer digits with grouping separators + var groups = []; + if (digits.length >= pattern.lgSize) { + groups.unshift(digits.splice(-pattern.lgSize).join('')); + } + while (digits.length > pattern.gSize) { + groups.unshift(digits.splice(-pattern.gSize).join('')); + } + if (digits.length) { + groups.unshift(digits.join('')); + } + formattedText = groups.join(groupSep); - // pad zeros for small numbers - while (integerLen < 0) { - digits.unshift(0); - integerLen++; - } + // append the decimal digits + if (decimals.length) { + formattedText += decimalSep + decimals.join(''); + } - // extract decimals digits - if (integerLen > 0) { - decimals = digits.splice(integerLen); - } else { - decimals = digits; - digits = [0]; + if (exponent) { + formattedText += 'e+' + exponent; + } + } + if (number < 0 && !isZero) { + return pattern.negPre + formattedText + pattern.negSuf; + } else { + return pattern.posPre + formattedText + pattern.posSuf; + } } - // format the integer digits with grouping separators - var groups = []; - if (digits.length >= pattern.lgSize) { - groups.unshift(digits.splice(-pattern.lgSize).join('')); + function padNumber(num, digits, trim, negWrap) { + var neg = ''; + if (num < 0 || (negWrap && num <= 0)) { + if (negWrap) { + num = -num + 1; + } else { + num = -num; + neg = '-'; + } + } + num = '' + num; + while (num.length < digits) num = ZERO_CHAR + num; + if (trim) { + num = num.substr(num.length - digits); + } + return neg + num; } - while (digits.length > pattern.gSize) { - groups.unshift(digits.splice(-pattern.gSize).join('')); + + + function dateGetter(name, size, offset, trim, negWrap) { + offset = offset || 0; + return function (date) { + var value = date['get' + name](); + if (offset > 0 || value > -offset) { + value += offset; + } + if (value === 0 && offset == -12) value = 12; + return padNumber(value, size, trim, negWrap); + }; } - if (digits.length) { - groups.unshift(digits.join('')); + + function dateStrGetter(name, shortForm, standAlone) { + return function (date, formats) { + var value = date['get' + name](); + var propPrefix = (standAlone ? 'STANDALONE' : '') + (shortForm ? 'SHORT' : ''); + var get = uppercase(propPrefix + name); + + return formats[get][value]; + }; } - formattedText = groups.join(groupSep); - // append the decimal digits - if (decimals.length) { - formattedText += decimalSep + decimals.join(''); + function timeZoneGetter(date, formats, offset) { + var zone = -1 * offset; + var paddedZone = (zone >= 0) ? "+" : ""; + + paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) + + padNumber(Math.abs(zone % 60), 2); + + return paddedZone; } - if (exponent) { - formattedText += 'e+' + exponent; + function getFirstThursdayOfYear(year) { + // 0 = index of January + var dayOfWeekOnFirst = (new Date(year, 0, 1)).getDay(); + // 4 = index of Thursday (+1 to account for 1st = 5) + // 11 = index of *next* Thursday (+1 account for 1st = 12) + return new Date(year, 0, ((dayOfWeekOnFirst <= 4) ? 5 : 12) - dayOfWeekOnFirst); } - } - if (number < 0 && !isZero) { - return pattern.negPre + formattedText + pattern.negSuf; - } else { - return pattern.posPre + formattedText + pattern.posSuf; - } -} - -function padNumber(num, digits, trim, negWrap) { - var neg = ''; - if (num < 0 || (negWrap && num <= 0)) { - if (negWrap) { - num = -num + 1; - } else { - num = -num; - neg = '-'; + + function getThursdayThisWeek(datetime) { + return new Date(datetime.getFullYear(), datetime.getMonth(), + // 4 = index of Thursday + datetime.getDate() + (4 - datetime.getDay())); } - } - num = '' + num; - while (num.length < digits) num = ZERO_CHAR + num; - if (trim) { - num = num.substr(num.length - digits); - } - return neg + num; -} - - -function dateGetter(name, size, offset, trim, negWrap) { - offset = offset || 0; - return function(date) { - var value = date['get' + name](); - if (offset > 0 || value > -offset) { - value += offset; + + function weekGetter(size) { + return function (date) { + var firstThurs = getFirstThursdayOfYear(date.getFullYear()), + thisThurs = getThursdayThisWeek(date); + + var diff = +thisThurs - +firstThurs, + result = 1 + Math.round(diff / 6.048e8); // 6.048e8 ms per week + + return padNumber(result, size); + }; } - if (value === 0 && offset == -12) value = 12; - return padNumber(value, size, trim, negWrap); - }; -} - -function dateStrGetter(name, shortForm, standAlone) { - return function(date, formats) { - var value = date['get' + name](); - var propPrefix = (standAlone ? 'STANDALONE' : '') + (shortForm ? 'SHORT' : ''); - var get = uppercase(propPrefix + name); - - return formats[get][value]; - }; -} - -function timeZoneGetter(date, formats, offset) { - var zone = -1 * offset; - var paddedZone = (zone >= 0) ? "+" : ""; - - paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) + - padNumber(Math.abs(zone % 60), 2); - - return paddedZone; -} - -function getFirstThursdayOfYear(year) { - // 0 = index of January - var dayOfWeekOnFirst = (new Date(year, 0, 1)).getDay(); - // 4 = index of Thursday (+1 to account for 1st = 5) - // 11 = index of *next* Thursday (+1 account for 1st = 12) - return new Date(year, 0, ((dayOfWeekOnFirst <= 4) ? 5 : 12) - dayOfWeekOnFirst); -} - -function getThursdayThisWeek(datetime) { - return new Date(datetime.getFullYear(), datetime.getMonth(), - // 4 = index of Thursday - datetime.getDate() + (4 - datetime.getDay())); -} - -function weekGetter(size) { - return function(date) { - var firstThurs = getFirstThursdayOfYear(date.getFullYear()), - thisThurs = getThursdayThisWeek(date); - - var diff = +thisThurs - +firstThurs, - result = 1 + Math.round(diff / 6.048e8); // 6.048e8 ms per week - - return padNumber(result, size); - }; -} - -function ampmGetter(date, formats) { - return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1]; -} - -function eraGetter(date, formats) { - return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1]; -} - -function longEraGetter(date, formats) { - return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1]; -} - -var DATE_FORMATS = { - yyyy: dateGetter('FullYear', 4, 0, false, true), - yy: dateGetter('FullYear', 2, 0, true, true), - y: dateGetter('FullYear', 1, 0, false, true), - MMMM: dateStrGetter('Month'), - MMM: dateStrGetter('Month', true), - MM: dateGetter('Month', 2, 1), - M: dateGetter('Month', 1, 1), - LLLL: dateStrGetter('Month', false, true), - dd: dateGetter('Date', 2), - d: dateGetter('Date', 1), - HH: dateGetter('Hours', 2), - H: dateGetter('Hours', 1), - hh: dateGetter('Hours', 2, -12), - h: dateGetter('Hours', 1, -12), - mm: dateGetter('Minutes', 2), - m: dateGetter('Minutes', 1), - ss: dateGetter('Seconds', 2), - s: dateGetter('Seconds', 1), - // while ISO 8601 requires fractions to be prefixed with `.` or `,` - // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions - sss: dateGetter('Milliseconds', 3), - EEEE: dateStrGetter('Day'), - EEE: dateStrGetter('Day', true), - a: ampmGetter, - Z: timeZoneGetter, - ww: weekGetter(2), - w: weekGetter(1), - G: eraGetter, - GG: eraGetter, - GGG: eraGetter, - GGGG: longEraGetter -}; - -var DATE_FORMATS_SPLIT = /((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/, - NUMBER_STRING = /^\-?\d+$/; -/** - * @ngdoc filter - * @name date - * @kind function - * - * @description - * Formats `date` to a string based on the requested `format`. - * - * `format` string can be composed of the following elements: - * - * * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010) - * * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10) - * * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199) - * * `'MMMM'`: Month in year (January-December) - * * `'MMM'`: Month in year (Jan-Dec) - * * `'MM'`: Month in year, padded (01-12) - * * `'M'`: Month in year (1-12) - * * `'LLLL'`: Stand-alone month in year (January-December) - * * `'dd'`: Day in month, padded (01-31) - * * `'d'`: Day in month (1-31) - * * `'EEEE'`: Day in Week,(Sunday-Saturday) - * * `'EEE'`: Day in Week, (Sun-Sat) - * * `'HH'`: Hour in day, padded (00-23) - * * `'H'`: Hour in day (0-23) - * * `'hh'`: Hour in AM/PM, padded (01-12) - * * `'h'`: Hour in AM/PM, (1-12) - * * `'mm'`: Minute in hour, padded (00-59) - * * `'m'`: Minute in hour (0-59) - * * `'ss'`: Second in minute, padded (00-59) - * * `'s'`: Second in minute (0-59) - * * `'sss'`: Millisecond in second, padded (000-999) - * * `'a'`: AM/PM marker - * * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200) - * * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year - * * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year - * * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD') - * * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini') - * - * `format` string can also be one of the following predefined - * {@link guide/i18n localizable formats}: - * - * * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale - * (e.g. Sep 3, 2010 12:05:08 PM) - * * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US locale (e.g. 9/3/10 12:05 PM) - * * `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` for en_US locale - * (e.g. Friday, September 3, 2010) - * * `'longDate'`: equivalent to `'MMMM d, y'` for en_US locale (e.g. September 3, 2010) - * * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US locale (e.g. Sep 3, 2010) - * * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10) - * * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 PM) - * * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 PM) - * - * `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g. - * `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence - * (e.g. `"h 'o''clock'"`). - * - * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or - * number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its - * shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is - * specified in the string input, the time is considered to be in the local timezone. - * @param {string=} format Formatting rules (see Description). If not specified, - * `mediumDate` is used. - * @param {string=} timezone Timezone to be used for formatting. It understands UTC/GMT and the - * continental US time zone abbreviations, but for general use, use a time zone offset, for - * example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian) - * If not specified, the timezone of the browser will be used. - * @returns {string} Formatted string or the input if input is not recognized as date/millis. - * - * @example - + function ampmGetter(date, formats) { + return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1]; + } + + function eraGetter(date, formats) { + return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1]; + } + + function longEraGetter(date, formats) { + return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1]; + } + + var DATE_FORMATS = { + yyyy: dateGetter('FullYear', 4, 0, false, true), + yy: dateGetter('FullYear', 2, 0, true, true), + y: dateGetter('FullYear', 1, 0, false, true), + MMMM: dateStrGetter('Month'), + MMM: dateStrGetter('Month', true), + MM: dateGetter('Month', 2, 1), + M: dateGetter('Month', 1, 1), + LLLL: dateStrGetter('Month', false, true), + dd: dateGetter('Date', 2), + d: dateGetter('Date', 1), + HH: dateGetter('Hours', 2), + H: dateGetter('Hours', 1), + hh: dateGetter('Hours', 2, -12), + h: dateGetter('Hours', 1, -12), + mm: dateGetter('Minutes', 2), + m: dateGetter('Minutes', 1), + ss: dateGetter('Seconds', 2), + s: dateGetter('Seconds', 1), + // while ISO 8601 requires fractions to be prefixed with `.` or `,` + // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions + sss: dateGetter('Milliseconds', 3), + EEEE: dateStrGetter('Day'), + EEE: dateStrGetter('Day', true), + a: ampmGetter, + Z: timeZoneGetter, + ww: weekGetter(2), + w: weekGetter(1), + G: eraGetter, + GG: eraGetter, + GGG: eraGetter, + GGGG: longEraGetter + }; + + var DATE_FORMATS_SPLIT = /((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/, + NUMBER_STRING = /^\-?\d+$/; + + /** + * @ngdoc filter + * @name date + * @kind function + * + * @description + * Formats `date` to a string based on the requested `format`. + * + * `format` string can be composed of the following elements: + * + * * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010) + * * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10) + * * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199) + * * `'MMMM'`: Month in year (January-December) + * * `'MMM'`: Month in year (Jan-Dec) + * * `'MM'`: Month in year, padded (01-12) + * * `'M'`: Month in year (1-12) + * * `'LLLL'`: Stand-alone month in year (January-December) + * * `'dd'`: Day in month, padded (01-31) + * * `'d'`: Day in month (1-31) + * * `'EEEE'`: Day in Week,(Sunday-Saturday) + * * `'EEE'`: Day in Week, (Sun-Sat) + * * `'HH'`: Hour in day, padded (00-23) + * * `'H'`: Hour in day (0-23) + * * `'hh'`: Hour in AM/PM, padded (01-12) + * * `'h'`: Hour in AM/PM, (1-12) + * * `'mm'`: Minute in hour, padded (00-59) + * * `'m'`: Minute in hour (0-59) + * * `'ss'`: Second in minute, padded (00-59) + * * `'s'`: Second in minute (0-59) + * * `'sss'`: Millisecond in second, padded (000-999) + * * `'a'`: AM/PM marker + * * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200) + * * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year + * * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year + * * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD') + * * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini') + * + * `format` string can also be one of the following predefined + * {@link guide/i18n localizable formats}: + * + * * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale + * (e.g. Sep 3, 2010 12:05:08 PM) + * * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US locale (e.g. 9/3/10 12:05 PM) + * * `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` for en_US locale + * (e.g. Friday, September 3, 2010) + * * `'longDate'`: equivalent to `'MMMM d, y'` for en_US locale (e.g. September 3, 2010) + * * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US locale (e.g. Sep 3, 2010) + * * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10) + * * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 PM) + * * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 PM) + * + * `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g. + * `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence + * (e.g. `"h 'o''clock'"`). + * + * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or + * number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its + * shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is + * specified in the string input, the time is considered to be in the local timezone. + * @param {string=} format Formatting rules (see Description). If not specified, + * `mediumDate` is used. + * @param {string=} timezone Timezone to be used for formatting. It understands UTC/GMT and the + * continental US time zone abbreviations, but for general use, use a time zone offset, for + * example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian) + * If not specified, the timezone of the browser will be used. + * @returns {string} Formatted string or the input if input is not recognized as date/millis. + * + * @example + - {{1288323623006 | date:'medium'}}: - {{1288323623006 | date:'medium'}}
- {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}: - {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}
- {{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}: - {{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}
- {{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}: - {{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}
+ {{1288323623006 | date:'medium'}}: + {{1288323623006 | date:'medium'}}
+ {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}: + {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}
+ {{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}: + {{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}
+ {{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}: + {{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}
 - it('should format date', function() { + it('should format date', function() { expect(element(by.binding("1288323623006 | date:'medium'")).getText()). toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/); expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()). @@ -20382,175 +20476,177 @@ var DATE_FORMATS_SPLIT = /((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+ toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/); }); - - */ -dateFilter.$inject = ['$locale']; -function dateFilter($locale) { - - - var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/; - // 1 2 3 4 5 6 7 8 9 10 11 - function jsonStringToDate(string) { - var match; - if (match = string.match(R_ISO8601_STR)) { - var date = new Date(0), - tzHour = 0, - tzMin = 0, - dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear, - timeSetter = match[8] ? date.setUTCHours : date.setHours; - - if (match[9]) { - tzHour = toInt(match[9] + match[10]); - tzMin = toInt(match[9] + match[11]); - } - dateSetter.call(date, toInt(match[1]), toInt(match[2]) - 1, toInt(match[3])); - var h = toInt(match[4] || 0) - tzHour; - var m = toInt(match[5] || 0) - tzMin; - var s = toInt(match[6] || 0); - var ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000); - timeSetter.call(date, h, m, s, ms); - return date; - } - return string; - } + + */ + dateFilter.$inject = ['$locale']; + function dateFilter($locale) { - return function(date, format, timezone) { - var text = '', - parts = [], - fn, match; - format = format || 'mediumDate'; - format = $locale.DATETIME_FORMATS[format] || format; - if (isString(date)) { - date = NUMBER_STRING.test(date) ? toInt(date) : jsonStringToDate(date); - } + var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/; - if (isNumber(date)) { - date = new Date(date); - } + // 1 2 3 4 5 6 7 8 9 10 11 + function jsonStringToDate(string) { + var match; + if (match = string.match(R_ISO8601_STR)) { + var date = new Date(0), + tzHour = 0, + tzMin = 0, + dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear, + timeSetter = match[8] ? date.setUTCHours : date.setHours; - if (!isDate(date) || !isFinite(date.getTime())) { - return date; - } + if (match[9]) { + tzHour = toInt(match[9] + match[10]); + tzMin = toInt(match[9] + match[11]); + } + dateSetter.call(date, toInt(match[1]), toInt(match[2]) - 1, toInt(match[3])); + var h = toInt(match[4] || 0) - tzHour; + var m = toInt(match[5] || 0) - tzMin; + var s = toInt(match[6] || 0); + var ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000); + timeSetter.call(date, h, m, s, ms); + return date; + } + return string; + } - while (format) { - match = DATE_FORMATS_SPLIT.exec(format); - if (match) { - parts = concat(parts, match, 1); - format = parts.pop(); - } else { - parts.push(format); - format = null; - } - } - var dateTimezoneOffset = date.getTimezoneOffset(); - if (timezone) { - dateTimezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset); - date = convertTimezoneToLocal(date, timezone, true); - } - forEach(parts, function(value) { - fn = DATE_FORMATS[value]; - text += fn ? fn(date, $locale.DATETIME_FORMATS, dateTimezoneOffset) - : value === "''" ? "'" : value.replace(/(^'|'$)/g, '').replace(/''/g, "'"); - }); + return function (date, format, timezone) { + var text = '', + parts = [], + fn, match; - return text; - }; -} + format = format || 'mediumDate'; + format = $locale.DATETIME_FORMATS[format] || format; + if (isString(date)) { + date = NUMBER_STRING.test(date) ? toInt(date) : jsonStringToDate(date); + } + if (isNumber(date)) { + date = new Date(date); + } -/** - * @ngdoc filter - * @name json - * @kind function - * - * @description - * Allows you to convert a JavaScript object into JSON string. - * - * This filter is mostly useful for debugging. When using the double curly {{value}} notation - * the binding is automatically converted to JSON. - * - * @param {*} object Any JavaScript object (including arrays and primitive types) to filter. - * @param {number=} spacing The number of spaces to use per indentation, defaults to 2. - * @returns {string} JSON string. - * - * - * @example - + if (!isDate(date) || !isFinite(date.getTime())) { + return date; + } + + while (format) { + match = DATE_FORMATS_SPLIT.exec(format); + if (match) { + parts = concat(parts, match, 1); + format = parts.pop(); + } else { + parts.push(format); + format = null; + } + } + + var dateTimezoneOffset = date.getTimezoneOffset(); + if (timezone) { + dateTimezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset); + date = convertTimezoneToLocal(date, timezone, true); + } + forEach(parts, function (value) { + fn = DATE_FORMATS[value]; + text += fn ? fn(date, $locale.DATETIME_FORMATS, dateTimezoneOffset) + : value === "''" ? "'" : value.replace(/(^'|'$)/g, '').replace(/''/g, "'"); + }); + + return text; + }; + } + + + /** + * @ngdoc filter + * @name json + * @kind function + * + * @description + * Allows you to convert a JavaScript object into JSON string. + * + * This filter is mostly useful for debugging. When using the double curly {{value}} notation + * the binding is automatically converted to JSON. + * + * @param {*} object Any JavaScript object (including arrays and primitive types) to filter. + * @param {number=} spacing The number of spaces to use per indentation, defaults to 2. + * @returns {string} JSON string. + * + * + * @example + - 
{{ {'name':'value'} | json }}
- 
{{ {'name':'value'} | json:4 }}
+ 
{{ {'name':'value'} | json }}
+ 
{{ {'name':'value'} | json:4 }}
 - it('should jsonify filtered objects', function() { + it('should jsonify filtered objects', function() { expect(element(by.id('default-spacing')).getText()).toMatch(/\{\n "name": ?"value"\n}/); expect(element(by.id('custom-spacing')).getText()).toMatch(/\{\n "name": ?"value"\n}/); }); - - * - */ -function jsonFilter() { - return function(object, spacing) { - if (isUndefined(spacing)) { - spacing = 2; + + * + */ + function jsonFilter() { + return function (object, spacing) { + if (isUndefined(spacing)) { + spacing = 2; + } + return toJson(object, spacing); + }; } - return toJson(object, spacing); - }; -} -/** - * @ngdoc filter - * @name lowercase - * @kind function - * @description - * Converts string to lowercase. - * @see angular.lowercase - */ -var lowercaseFilter = valueFn(lowercase); + /** + * @ngdoc filter + * @name lowercase + * @kind function + * @description + * Converts string to lowercase. + * @see angular.lowercase + */ + var lowercaseFilter = valueFn(lowercase); -/** - * @ngdoc filter - * @name uppercase - * @kind function - * @description - * Converts string to uppercase. - * @see angular.uppercase - */ -var uppercaseFilter = valueFn(uppercase); + /** + * @ngdoc filter + * @name uppercase + * @kind function + * @description + * Converts string to uppercase. + * @see angular.uppercase + */ + var uppercaseFilter = valueFn(uppercase); -/** - * @ngdoc filter - * @name limitTo - * @kind function - * - * @description - * Creates a new array or string containing only a specified number of elements. The elements - * are taken from either the beginning or the end of the source array, string or number, as specified by - * the value and sign (positive or negative) of `limit`. If a number is used as input, it is - * converted to a string. - * - * @param {Array|string|number} input Source array, string or number to be limited. - * @param {string|number} limit The length of the returned array or string. If the `limit` number - * is positive, `limit` number of items from the beginning of the source array/string are copied. - * If the number is negative, `limit` number of items from the end of the source array/string - * are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined, - * the input will be returned unchanged. - * @param {(string|number)=} begin Index at which to begin limitation. As a negative index, `begin` - * indicates an offset from the end of `input`. Defaults to `0`. - * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array - * had less than `limit` elements. - * - * @example - + /** + * @ngdoc filter + * @name limitTo + * @kind function + * + * @description + * Creates a new array or string containing only a specified number of elements. The elements + * are taken from either the beginning or the end of the source array, string or number, as specified by + * the value and sign (positive or negative) of `limit`. If a number is used as input, it is + * converted to a string. + * + * @param {Array|string|number} input Source array, string or number to be limited. + * @param {string|number} limit The length of the returned array or string. If the `limit` number + * is positive, `limit` number of items from the beginning of the source array/string are copied. + * If the number is negative, `limit` number of items from the end of the source array/string + * are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined, + * the input will be returned unchanged. + * @param {(string|number)=} begin Index at which to begin limitation. As a negative index, `begin` + * indicates an offset from the end of `input`. Defaults to `0`. + * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array + * had less than `limit` elements. + * + * @example + - -
- -

Output numbers: {{ numbers | limitTo:numLimit }}

- -

Output letters: {{ letters | limitTo:letterLimit }}

- -

Output long number: {{ longNumber | limitTo:longNumberLimit }}

-
+ +
+ +

Output numbers: {{ numbers | limitTo:numLimit }}

+ +

Output letters: {{ letters | limitTo:letterLimit }}

+ +

Output long number: {{ longNumber | limitTo:longNumberLimit }}

+
- var numLimitInput = element(by.model('numLimit')); - var letterLimitInput = element(by.model('letterLimit')); - var longNumberLimitInput = element(by.model('longNumberLimit')); - var limitedNumbers = element(by.binding('numbers | limitTo:numLimit')); - var limitedLetters = element(by.binding('letters | limitTo:letterLimit')); - var limitedLongNumber = element(by.binding('longNumber | limitTo:longNumberLimit')); - - it('should limit the number array to first three items', function() { + var numLimitInput = element(by.model('numLimit')); + var letterLimitInput = element(by.model('letterLimit')); + var longNumberLimitInput = element(by.model('longNumberLimit')); + var limitedNumbers = element(by.binding('numbers | limitTo:numLimit')); + var limitedLetters = element(by.binding('letters | limitTo:letterLimit')); + var limitedLongNumber = element(by.binding('longNumber | limitTo:longNumberLimit')); + + it('should limit the number array to first three items', function() { expect(numLimitInput.getAttribute('value')).toBe('3'); expect(letterLimitInput.getAttribute('value')).toBe('3'); expect(longNumberLimitInput.getAttribute('value')).toBe('3'); @@ -20594,8 +20690,8 @@ var uppercaseFilter = valueFn(uppercase); expect(limitedLongNumber.getText()).toEqual('Output long number: 234'); }); - // There is a bug in safari and protractor that doesn't like the minus key - // it('should update the output when -3 is entered', function() { + // There is a bug in safari and protractor that doesn't like the minus key + // it('should update the output when -3 is entered', function() { // numLimitInput.clear(); // numLimitInput.sendKeys('-3'); // letterLimitInput.clear(); @@ -20607,7 +20703,7 @@ var uppercaseFilter = valueFn(uppercase); // expect(limitedLongNumber.getText()).toEqual('Output long number: 342'); // }); - it('should not exceed the maximum size of input array', function() { + it('should not exceed the maximum size of input array', function() { numLimitInput.clear(); numLimitInput.sendKeys('100'); letterLimitInput.clear(); @@ -20619,95 +20715,95 @@ var uppercaseFilter = valueFn(uppercase); expect(limitedLongNumber.getText()).toEqual('Output long number: 2345432342'); }); - -*/ -function limitToFilter() { - return function(input, limit, begin) { - if (Math.abs(Number(limit)) === Infinity) { - limit = Number(limit); - } else { - limit = toInt(limit); - } - if (isNaN(limit)) return input; + + */ + function limitToFilter() { + return function (input, limit, begin) { + if (Math.abs(Number(limit)) === Infinity) { + limit = Number(limit); + } else { + limit = toInt(limit); + } + if (isNaN(limit)) return input; - if (isNumber(input)) input = input.toString(); - if (!isArray(input) && !isString(input)) return input; + if (isNumber(input)) input = input.toString(); + if (!isArray(input) && !isString(input)) return input; - begin = (!begin || isNaN(begin)) ? 0 : toInt(begin); - begin = (begin < 0) ? Math.max(0, input.length + begin) : begin; + begin = (!begin || isNaN(begin)) ? 0 : toInt(begin); + begin = (begin < 0) ? Math.max(0, input.length + begin) : begin; - if (limit >= 0) { - return input.slice(begin, begin + limit); - } else { - if (begin === 0) { - return input.slice(limit, input.length); - } else { - return input.slice(Math.max(0, begin + limit), begin); - } + if (limit >= 0) { + return input.slice(begin, begin + limit); + } else { + if (begin === 0) { + return input.slice(limit, input.length); + } else { + return input.slice(Math.max(0, begin + limit), begin); + } + } + }; } - }; -} -/** - * @ngdoc filter - * @name orderBy - * @kind function - * - * @description - * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically - * for strings and numerically for numbers. Note: if you notice numbers are not being sorted - * as expected, make sure they are actually being saved as numbers and not strings. - * Array-like values (e.g. NodeLists, jQuery objects, TypedArrays, Strings, etc) are also supported. - * - * @param {Array} array The array (or array-like object) to sort. - * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be - * used by the comparator to determine the order of elements. - * - * Can be one of: - * - * - `function`: Getter function. The result of this function will be sorted using the - * `<`, `===`, `>` operator. - * - `string`: An Angular expression. The result of this expression is used to compare elements - * (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by - * 3 first characters of a property called `name`). The result of a constant expression - * is interpreted as a property name to be used in comparisons (for example `"special name"` - * to sort object by the value of their `special name` property). An expression can be - * optionally prefixed with `+` or `-` to control ascending or descending sort order - * (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array - * element itself is used to compare where sorting. - * - `Array`: An array of function or string predicates. The first predicate in the array - * is used for sorting, but when two items are equivalent, the next predicate is used. - * - * If the predicate is missing or empty then it defaults to `'+'`. - * - * @param {boolean=} reverse Reverse the order of the array. - * @returns {Array} Sorted copy of the source array. - * - * - * @example - * The example below demonstrates a simple ngRepeat, where the data is sorted - * by age in descending order (predicate is set to `'-age'`). - * `reverse` is not set, which means it defaults to `false`. - + /** + * @ngdoc filter + * @name orderBy + * @kind function + * + * @description + * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically + * for strings and numerically for numbers. Note: if you notice numbers are not being sorted + * as expected, make sure they are actually being saved as numbers and not strings. + * Array-like values (e.g. NodeLists, jQuery objects, TypedArrays, Strings, etc) are also supported. + * + * @param {Array} array The array (or array-like object) to sort. + * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be + * used by the comparator to determine the order of elements. + * + * Can be one of: + * + * - `function`: Getter function. The result of this function will be sorted using the + * `<`, `===`, `>` operator. + * - `string`: An Angular expression. The result of this expression is used to compare elements + * (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by + * 3 first characters of a property called `name`). The result of a constant expression + * is interpreted as a property name to be used in comparisons (for example `"special name"` + * to sort object by the value of their `special name` property). An expression can be + * optionally prefixed with `+` or `-` to control ascending or descending sort order + * (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array + * element itself is used to compare where sorting. + * - `Array`: An array of function or string predicates. The first predicate in the array + * is used for sorting, but when two items are equivalent, the next predicate is used. + * + * If the predicate is missing or empty then it defaults to `'+'`. + * + * @param {boolean=} reverse Reverse the order of the array. + * @returns {Array} Sorted copy of the source array. + * + * + * @example + * The example below demonstrates a simple ngRepeat, where the data is sorted + * by age in descending order (predicate is set to `'-age'`). + * `reverse` is not set, which means it defaults to `false`. + -
- - - - - - - - - - - -
NamePhone NumberAge
{{friend.name}}{{friend.phone}}{{friend.age}}
-
+
+ + + + + + + + + + + +
NamePhone NumberAge
{{friend.name}}{{friend.phone}}{{friend.age}}
+
- angular.module('orderByExample', []) - .controller('ExampleController', ['$scope', function($scope) { + angular.module('orderByExample', []) + .controller('ExampleController', ['$scope', function($scope) { $scope.friends = [{name:'John', phone:'555-1212', age:10}, {name:'Mary', phone:'555-9876', age:19}, @@ -20716,43 +20812,43 @@ function limitToFilter() { {name:'Julie', phone:'555-8765', age:29}]; }]); - - * - * The predicate and reverse parameters can be controlled dynamically through scope properties, - * as shown in the next example. - * @example - + + * + * The predicate and reverse parameters can be controlled dynamically through scope properties, + * as shown in the next example. + * @example + -
- 
Sorting predicate = {{predicate}}; reverse = {{reverse}}
-
- - - - - - - - - - - - -
- - - - - - - - -
{{friend.name}}{{friend.phone}}{{friend.age}}
-
+
+ 
Sorting predicate = {{predicate}}; reverse = {{reverse}}
+
+ + + + + + + + + + + + +
+ + + + + + + + +
{{friend.name}}{{friend.phone}}{{friend.age}}
+
- angular.module('orderByExample', []) - .controller('ExampleController', ['$scope', function($scope) { + angular.module('orderByExample', []) + .controller('ExampleController', ['$scope', function($scope) { $scope.friends = [{name:'John', phone:'555-1212', age:10}, {name:'Mary', phone:'555-9876', age:19}, @@ -20766,55 +20862,55 @@ function limitToFilter() { $scope.predicate = predicate; }; }]); - + - .sortorder:after { + .sortorder:after { content: '\25b2'; } - .sortorder.reverse:after { + .sortorder.reverse:after { content: '\25bc'; } - - * - * It's also possible to call the orderBy filter manually, by injecting `$filter`, retrieving the - * filter routine with `$filter('orderBy')`, and calling the returned filter routine with the - * desired parameters. - * - * Example: - * - * @example - - -
- 
Sorting predicate = {{predicate}}; reverse = {{reverse}}
- - - - - - - - - - - -
- - - - - - - - -
{{friend.name}}{{friend.phone}}{{friend.age}}
-
- - - - angular.module('orderByExample', []) - .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) { + + * + * It's also possible to call the orderBy filter manually, by injecting `$filter`, retrieving the + * filter routine with `$filter('orderBy')`, and calling the returned filter routine with the + * desired parameters. + * + * Example: + * + * @example + + +
+ 
Sorting predicate = {{predicate}}; reverse = {{reverse}}
+ + + + + + + + + + + +
+ + + + + + + + +
{{friend.name}}{{friend.phone}}{{friend.age}}
+
+ + + + angular.module('orderByExample', []) + .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) { var orderBy = $filter('orderBy'); $scope.friends = [ { name: 'John', phone: '555-1212', age: 10 }, @@ -20830,239 +20926,252 @@ function limitToFilter() { }; $scope.order('age', true); }]); - + + + + .sortorder:after { + content: '\25b2'; + } + .sortorder.reverse:after { + content: '\25bc'; + } + + + */ + orderByFilter.$inject = ['$parse']; + + function orderByFilter($parse) { + return function (array, sortPredicate, reverseOrder) { + + if (array == null) return array; + if (!isArrayLike(array)) { + throw minErr('orderBy')('notarray', 'Expected array but received: {0}', array); + } + + if (!isArray(sortPredicate)) { + sortPredicate = [sortPredicate]; + } + if (sortPredicate.length === 0) { + sortPredicate = ['+']; + } + + var predicates = processPredicates(sortPredicate, reverseOrder); + // Add a predicate at the end that evaluates to the element index. This makes the + // sort stable as it works as a tie-breaker when all the input predicates cannot + // distinguish between two elements. + predicates.push({ + get: function () { + return {}; + }, descending: reverseOrder ? -1 : 1 + }); + + // The next three lines are a version of a Swartzian Transform idiom from Perl + // (sometimes called the Decorate-Sort-Undecorate idiom) + // See https://en.wikipedia.org/wiki/Schwartzian_transform + var compareValues = Array.prototype.map.call(array, getComparisonObject); + compareValues.sort(doComparison); + array = compareValues.map(function (item) { + return item.value; + }); - - .sortorder:after { - content: '\25b2'; - } - .sortorder.reverse:after { - content: '\25bc'; - } - - - */ -orderByFilter.$inject = ['$parse']; -function orderByFilter($parse) { - return function(array, sortPredicate, reverseOrder) { + return array; - if (array == null) return array; - if (!isArrayLike(array)) { - throw minErr('orderBy')('notarray', 'Expected array but received: {0}', array); - } + function getComparisonObject(value, index) { + return { + value: value, + predicateValues: predicates.map(function (predicate) { + return getPredicateValue(predicate.get(value), index); + }) + }; + } - if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; } - if (sortPredicate.length === 0) { sortPredicate = ['+']; } - - var predicates = processPredicates(sortPredicate, reverseOrder); - // Add a predicate at the end that evaluates to the element index. This makes the - // sort stable as it works as a tie-breaker when all the input predicates cannot - // distinguish between two elements. - predicates.push({ get: function() { return {}; }, descending: reverseOrder ? -1 : 1}); - - // The next three lines are a version of a Swartzian Transform idiom from Perl - // (sometimes called the Decorate-Sort-Undecorate idiom) - // See https://en.wikipedia.org/wiki/Schwartzian_transform - var compareValues = Array.prototype.map.call(array, getComparisonObject); - compareValues.sort(doComparison); - array = compareValues.map(function(item) { return item.value; }); - - return array; - - function getComparisonObject(value, index) { - return { - value: value, - predicateValues: predicates.map(function(predicate) { - return getPredicateValue(predicate.get(value), index); - }) - }; - } + function doComparison(v1, v2) { + var result = 0; + for (var index = 0, length = predicates.length; index < length; ++index) { + result = compare(v1.predicateValues[index], v2.predicateValues[index]) * predicates[index].descending; + if (result) break; + } + return result; + } + }; - function doComparison(v1, v2) { - var result = 0; - for (var index=0, length = predicates.length; index < length; ++index) { - result = compare(v1.predicateValues[index], v2.predicateValues[index]) * predicates[index].descending; - if (result) break; - } - return result; - } - }; - - function processPredicates(sortPredicate, reverseOrder) { - reverseOrder = reverseOrder ? -1 : 1; - return sortPredicate.map(function(predicate) { - var descending = 1, get = identity; - - if (isFunction(predicate)) { - get = predicate; - } else if (isString(predicate)) { - if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) { - descending = predicate.charAt(0) == '-' ? -1 : 1; - predicate = predicate.substring(1); + function processPredicates(sortPredicate, reverseOrder) { + reverseOrder = reverseOrder ? -1 : 1; + return sortPredicate.map(function (predicate) { + var descending = 1, get = identity; + + if (isFunction(predicate)) { + get = predicate; + } else if (isString(predicate)) { + if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) { + descending = predicate.charAt(0) == '-' ? -1 : 1; + predicate = predicate.substring(1); + } + if (predicate !== '') { + get = $parse(predicate); + if (get.constant) { + var key = get(); + get = function (value) { + return value[key]; + }; + } + } + } + return {get: get, descending: descending * reverseOrder}; + }); } - if (predicate !== '') { - get = $parse(predicate); - if (get.constant) { - var key = get(); - get = function(value) { return value[key]; }; - } + + function isPrimitive(value) { + switch (typeof value) { + case 'number': /* falls through */ + case 'boolean': /* falls through */ + case 'string': + return true; + default: + return false; + } } - } - return { get: get, descending: descending * reverseOrder }; - }); - } - function isPrimitive(value) { - switch (typeof value) { - case 'number': /* falls through */ - case 'boolean': /* falls through */ - case 'string': - return true; - default: - return false; - } - } + function objectValue(value, index) { + // If `valueOf` is a valid function use that + if (typeof value.valueOf === 'function') { + value = value.valueOf(); + if (isPrimitive(value)) return value; + } + // If `toString` is a valid function and not the one from `Object.prototype` use that + if (hasCustomToString(value)) { + value = value.toString(); + if (isPrimitive(value)) return value; + } + // We have a basic object so we use the position of the object in the collection + return index; + } + + function getPredicateValue(value, index) { + var type = typeof value; + if (value === null) { + type = 'string'; + value = 'null'; + } else if (type === 'string') { + value = value.toLowerCase(); + } else if (type === 'object') { + value = objectValue(value, index); + } + return {value: value, type: type}; + } - function objectValue(value, index) { - // If `valueOf` is a valid function use that - if (typeof value.valueOf === 'function') { - value = value.valueOf(); - if (isPrimitive(value)) return value; - } - // If `toString` is a valid function and not the one from `Object.prototype` use that - if (hasCustomToString(value)) { - value = value.toString(); - if (isPrimitive(value)) return value; - } - // We have a basic object so we use the position of the object in the collection - return index; - } - - function getPredicateValue(value, index) { - var type = typeof value; - if (value === null) { - type = 'string'; - value = 'null'; - } else if (type === 'string') { - value = value.toLowerCase(); - } else if (type === 'object') { - value = objectValue(value, index); - } - return { value: value, type: type }; - } - - function compare(v1, v2) { - var result = 0; - if (v1.type === v2.type) { - if (v1.value !== v2.value) { - result = v1.value < v2.value ? -1 : 1; - } - } else { - result = v1.type < v2.type ? -1 : 1; + function compare(v1, v2) { + var result = 0; + if (v1.type === v2.type) { + if (v1.value !== v2.value) { + result = v1.value < v2.value ? -1 : 1; + } + } else { + result = v1.type < v2.type ? -1 : 1; + } + return result; + } } - return result; - } -} - -function ngDirective(directive) { - if (isFunction(directive)) { - directive = { - link: directive - }; - } - directive.restrict = directive.restrict || 'AC'; - return valueFn(directive); -} -/** - * @ngdoc directive - * @name a - * @restrict E - * - * @description - * Modifies the default behavior of the html A tag so that the default action is prevented when - * the href attribute is empty. - * - * This change permits the easy creation of action links with the `ngClick` directive - * without changing the location or causing page reloads, e.g.: - * `Add Item` - */ -var htmlAnchorDirective = valueFn({ - restrict: 'E', - compile: function(element, attr) { - if (!attr.href && !attr.xlinkHref) { - return function(scope, element) { - // If the linked element is not an anchor tag anymore, do nothing - if (element[0].nodeName.toLowerCase() !== 'a') return; - - // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute. - var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ? - 'xlink:href' : 'href'; - element.on('click', function(event) { - // if we have no href url, then don't navigate anywhere. - if (!element.attr(href)) { - event.preventDefault(); - } - }); - }; + function ngDirective(directive) { + if (isFunction(directive)) { + directive = { + link: directive + }; + } + directive.restrict = directive.restrict || 'AC'; + return valueFn(directive); } - } -}); -/** - * @ngdoc directive - * @name ngHref - * @restrict A - * @priority 99 - * - * @description - * Using Angular markup like `{{hash}}` in an href attribute will - * make the link go to the wrong URL if the user clicks it before - * Angular has a chance to replace the `{{hash}}` markup with its - * value. Until Angular replaces the markup the link will be broken - * and will most likely return a 404 error. The `ngHref` directive - * solves this problem. - * - * The wrong way to write it: - * ```html - * link1 - * ``` - * - * The correct way to write it: - * ```html - * link1 - * ``` - * - * @element A - * @param {template} ngHref any string which can contain `{{}}` markup. - * - * @example - * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes - * in links and their different behaviors: - - -
- link 1 (link, don't reload)
- link 2 (link, don't reload)
- link 3 (link, reload!)
- anchor (link, don't reload)
- anchor (no link)
- link (link, change location) - - - it('should execute ng-click but not reload when href without value', function() { + /** + * @ngdoc directive + * @name a + * @restrict E + * + * @description + * Modifies the default behavior of the html A tag so that the default action is prevented when + * the href attribute is empty. + * + * This change permits the easy creation of action links with the `ngClick` directive + * without changing the location or causing page reloads, e.g.: + * `Add Item` + */ + var htmlAnchorDirective = valueFn({ + restrict: 'E', + compile: function (element, attr) { + if (!attr.href && !attr.xlinkHref) { + return function (scope, element) { + // If the linked element is not an anchor tag anymore, do nothing + if (element[0].nodeName.toLowerCase() !== 'a') return; + + // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute. + var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ? + 'xlink:href' : 'href'; + element.on('click', function (event) { + // if we have no href url, then don't navigate anywhere. + if (!element.attr(href)) { + event.preventDefault(); + } + }); + }; + } + } + }); + + /** + * @ngdoc directive + * @name ngHref + * @restrict A + * @priority 99 + * + * @description + * Using Angular markup like `{{hash}}` in an href attribute will + * make the link go to the wrong URL if the user clicks it before + * Angular has a chance to replace the `{{hash}}` markup with its + * value. Until Angular replaces the markup the link will be broken + * and will most likely return a 404 error. The `ngHref` directive + * solves this problem. + * + * The wrong way to write it: + * ```html + * link1 + * ``` + * + * The correct way to write it: + * ```html + * link1 + * ``` + * + * @element A + * @param {template} ngHref any string which can contain `{{}}` markup. + * + * @example + * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes + * in links and their different behaviors: + + +
+ link 1 (link, don't reload)
+ link 2 (link, don't reload)
+ link 3 (link, reload!)
+ anchor (link, don't reload)
+ anchor (no link)
+ link (link, change location) + + + it('should execute ng-click but not reload when href without value', function() { element(by.id('link-1')).click(); expect(element(by.model('value')).getAttribute('value')).toEqual('1'); expect(element(by.id('link-1')).getAttribute('href')).toBe(''); }); - it('should execute ng-click but not reload when href empty string', function() { + it('should execute ng-click but not reload when href empty string', function() { element(by.id('link-2')).click(); expect(element(by.model('value')).getAttribute('value')).toEqual('2'); expect(element(by.id('link-2')).getAttribute('href')).toBe(''); }); - it('should execute ng-click and change url when ng-href specified', function() { + it('should execute ng-click and change url when ng-href specified', function() { expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/); element(by.id('link-3')).click(); @@ -21077,19 +21186,19 @@ var htmlAnchorDirective = valueFn({ }, 5000, 'page should navigate to /123'); }); - it('should execute ng-click but not reload when href empty string and name specified', function() { + it('should execute ng-click but not reload when href empty string and name specified', function() { element(by.id('link-4')).click(); expect(element(by.model('value')).getAttribute('value')).toEqual('4'); expect(element(by.id('link-4')).getAttribute('href')).toBe(''); }); - it('should execute ng-click but not reload when no href but name specified', function() { + it('should execute ng-click but not reload when no href but name specified', function() { element(by.id('link-5')).click(); expect(element(by.model('value')).getAttribute('value')).toEqual('5'); expect(element(by.id('link-5')).getAttribute('href')).toBe(null); }); - it('should only change url when only ng-href', function() { + it('should only change url when only ng-href', function() { element(by.model('value')).clear(); element(by.model('value')).sendKeys('6'); expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/); @@ -21104,773 +21213,774 @@ var htmlAnchorDirective = valueFn({ }); }, 5000, 'page should navigate to /6'); }); - - - */ + + + */ -/** - * @ngdoc directive - * @name ngSrc - * @restrict A - * @priority 99 - * - * @description - * Using Angular markup like `{{hash}}` in a `src` attribute doesn't - * work right: The browser will fetch from the URL with the literal - * text `{{hash}}` until Angular replaces the expression inside - * `{{hash}}`. The `ngSrc` directive solves this problem. - * - * The buggy way to write it: - * ```html - * Description - * ``` - * - * The correct way to write it: - * ```html - * Description - * ``` - * - * @element IMG - * @param {template} ngSrc any string which can contain `{{}}` markup. - */ + /** + * @ngdoc directive + * @name ngSrc + * @restrict A + * @priority 99 + * + * @description + * Using Angular markup like `{{hash}}` in a `src` attribute doesn't + * work right: The browser will fetch from the URL with the literal + * text `{{hash}}` until Angular replaces the expression inside + * `{{hash}}`. The `ngSrc` directive solves this problem. + * + * The buggy way to write it: + * ```html + * Description + * ``` + * + * The correct way to write it: + * ```html + * Description + * ``` + * + * @element IMG + * @param {template} ngSrc any string which can contain `{{}}` markup. + */ -/** - * @ngdoc directive - * @name ngSrcset - * @restrict A - * @priority 99 - * - * @description - * Using Angular markup like `{{hash}}` in a `srcset` attribute doesn't - * work right: The browser will fetch from the URL with the literal - * text `{{hash}}` until Angular replaces the expression inside - * `{{hash}}`. The `ngSrcset` directive solves this problem. - * - * The buggy way to write it: - * ```html - * Description - * ``` - * - * The correct way to write it: - * ```html - * Description - * ``` - * - * @element IMG - * @param {template} ngSrcset any string which can contain `{{}}` markup. - */ + /** + * @ngdoc directive + * @name ngSrcset + * @restrict A + * @priority 99 + * + * @description + * Using Angular markup like `{{hash}}` in a `srcset` attribute doesn't + * work right: The browser will fetch from the URL with the literal + * text `{{hash}}` until Angular replaces the expression inside + * `{{hash}}`. The `ngSrcset` directive solves this problem. + * + * The buggy way to write it: + * ```html + * Description + * ``` + * + * The correct way to write it: + * ```html + * Description + * ``` + * + * @element IMG + * @param {template} ngSrcset any string which can contain `{{}}` markup. + */ -/** - * @ngdoc directive - * @name ngDisabled - * @restrict A - * @priority 100 - * - * @description - * - * This directive sets the `disabled` attribute on the element if the - * {@link guide/expression expression} inside `ngDisabled` evaluates to truthy. - * - * A special directive is necessary because we cannot use interpolation inside the `disabled` - * attribute. See the {@link guide/interpolation interpolation guide} for more info. - * - * @example - - -
- - - - it('should toggle button', function() { + /** + * @ngdoc directive + * @name ngDisabled + * @restrict A + * @priority 100 + * + * @description + * + * This directive sets the `disabled` attribute on the element if the + * {@link guide/expression expression} inside `ngDisabled` evaluates to truthy. + * + * A special directive is necessary because we cannot use interpolation inside the `disabled` + * attribute. See the {@link guide/interpolation interpolation guide} for more info. + * + * @example + + +
+ + + + it('should toggle button', function() { expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy(); element(by.model('checked')).click(); expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy(); }); - - - * - * @element INPUT - * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy, - * then the `disabled` attribute will be set on the element - */ + + + * + * @element INPUT + * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy, + * then the `disabled` attribute will be set on the element + */ -/** - * @ngdoc directive - * @name ngChecked - * @restrict A - * @priority 100 - * - * @description - * Sets the `checked` attribute on the element, if the expression inside `ngChecked` is truthy. - * - * Note that this directive should not be used together with {@link ngModel `ngModel`}, - * as this can lead to unexpected behavior. - * - * A special directive is necessary because we cannot use interpolation inside the `checked` - * attribute. See the {@link guide/interpolation interpolation guide} for more info. - * - * @example - - -
- - - - it('should check both checkBoxes', function() { + /** + * @ngdoc directive + * @name ngChecked + * @restrict A + * @priority 100 + * + * @description + * Sets the `checked` attribute on the element, if the expression inside `ngChecked` is truthy. + * + * Note that this directive should not be used together with {@link ngModel `ngModel`}, + * as this can lead to unexpected behavior. + * + * A special directive is necessary because we cannot use interpolation inside the `checked` + * attribute. See the {@link guide/interpolation interpolation guide} for more info. + * + * @example + + +
+ + + + it('should check both checkBoxes', function() { expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy(); element(by.model('master')).click(); expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy(); }); - - - * - * @element INPUT - * @param {expression} ngChecked If the {@link guide/expression expression} is truthy, - * then the `checked` attribute will be set on the element - */ + + + * + * @element INPUT + * @param {expression} ngChecked If the {@link guide/expression expression} is truthy, + * then the `checked` attribute will be set on the element + */ -/** - * @ngdoc directive - * @name ngReadonly - * @restrict A - * @priority 100 - * - * @description - * - * Sets the `readOnly` attribute on the element, if the expression inside `ngReadonly` is truthy. - * - * A special directive is necessary because we cannot use interpolation inside the `readOnly` - * attribute. See the {@link guide/interpolation interpolation guide} for more info. - * - * @example - - -
- - - - it('should toggle readonly attr', function() { + /** + * @ngdoc directive + * @name ngReadonly + * @restrict A + * @priority 100 + * + * @description + * + * Sets the `readOnly` attribute on the element, if the expression inside `ngReadonly` is truthy. + * + * A special directive is necessary because we cannot use interpolation inside the `readOnly` + * attribute. See the {@link guide/interpolation interpolation guide} for more info. + * + * @example + + +
+ + + + it('should toggle readonly attr', function() { expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy(); element(by.model('checked')).click(); expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy(); }); - - - * - * @element INPUT - * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy, - * then special attribute "readonly" will be set on the element - */ + + + * + * @element INPUT + * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy, + * then special attribute "readonly" will be set on the element + */ -/** - * @ngdoc directive - * @name ngSelected - * @restrict A - * @priority 100 - * - * @description - * - * Sets the `selected` attribute on the element, if the expression inside `ngSelected` is truthy. - * - * A special directive is necessary because we cannot use interpolation inside the `selected` - * attribute. See the {@link guide/interpolation interpolation guide} for more info. - * - * @example - - -
- - - - it('should select Greetings!', function() { + /** + * @ngdoc directive + * @name ngSelected + * @restrict A + * @priority 100 + * + * @description + * + * Sets the `selected` attribute on the element, if the expression inside `ngSelected` is truthy. + * + * A special directive is necessary because we cannot use interpolation inside the `selected` + * attribute. See the {@link guide/interpolation interpolation guide} for more info. + * + * @example + + +
+ + + + it('should select Greetings!', function() { expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy(); element(by.model('selected')).click(); expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy(); }); - - - * - * @element OPTION - * @param {expression} ngSelected If the {@link guide/expression expression} is truthy, - * then special attribute "selected" will be set on the element - */ + + + * + * @element OPTION + * @param {expression} ngSelected If the {@link guide/expression expression} is truthy, + * then special attribute "selected" will be set on the element + */ -/** - * @ngdoc directive - * @name ngOpen - * @restrict A - * @priority 100 - * - * @description - * - * Sets the `open` attribute on the element, if the expression inside `ngOpen` is truthy. - * - * A special directive is necessary because we cannot use interpolation inside the `open` - * attribute. See the {@link guide/interpolation interpolation guide} for more info. - * - * @example + /** + * @ngdoc directive + * @name ngOpen + * @restrict A + * @priority 100 + * + * @description + * + * Sets the `open` attribute on the element, if the expression inside `ngOpen` is truthy. + * + * A special directive is necessary because we cannot use interpolation inside the `open` + * attribute. See the {@link guide/interpolation interpolation guide} for more info. + * + * @example - -
-
- Show/Hide me -
- - - it('should toggle open', function() { + +
+
+ Show/Hide me +
+ + + it('should toggle open', function() { expect(element(by.id('details')).getAttribute('open')).toBeFalsy(); element(by.model('open')).click(); expect(element(by.id('details')).getAttribute('open')).toBeTruthy(); }); - + - * - * @element DETAILS - * @param {expression} ngOpen If the {@link guide/expression expression} is truthy, - * then special attribute "open" will be set on the element - */ + * + * @element DETAILS + * @param {expression} ngOpen If the {@link guide/expression expression} is truthy, + * then special attribute "open" will be set on the element + */ -var ngAttributeAliasDirectives = {}; + var ngAttributeAliasDirectives = {}; // boolean attrs are evaluated -forEach(BOOLEAN_ATTR, function(propName, attrName) { - // binding to multiple is not supported - if (propName == "multiple") return; + forEach(BOOLEAN_ATTR, function (propName, attrName) { + // binding to multiple is not supported + if (propName == "multiple") return; - function defaultLinkFn(scope, element, attr) { - scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) { - attr.$set(attrName, !!value); - }); - } + function defaultLinkFn(scope, element, attr) { + scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) { + attr.$set(attrName, !!value); + }); + } - var normalized = directiveNormalize('ng-' + attrName); - var linkFn = defaultLinkFn; + var normalized = directiveNormalize('ng-' + attrName); + var linkFn = defaultLinkFn; - if (propName === 'checked') { - linkFn = function(scope, element, attr) { - // ensuring ngChecked doesn't interfere with ngModel when both are set on the same input - if (attr.ngModel !== attr[normalized]) { - defaultLinkFn(scope, element, attr); - } - }; - } + if (propName === 'checked') { + linkFn = function (scope, element, attr) { + // ensuring ngChecked doesn't interfere with ngModel when both are set on the same input + if (attr.ngModel !== attr[normalized]) { + defaultLinkFn(scope, element, attr); + } + }; + } - ngAttributeAliasDirectives[normalized] = function() { - return { - restrict: 'A', - priority: 100, - link: linkFn - }; - }; -}); + ngAttributeAliasDirectives[normalized] = function () { + return { + restrict: 'A', + priority: 100, + link: linkFn + }; + }; + }); // aliased input attrs are evaluated -forEach(ALIASED_ATTR, function(htmlAttr, ngAttr) { - ngAttributeAliasDirectives[ngAttr] = function() { - return { - priority: 100, - link: function(scope, element, attr) { - //special case ngPattern when a literal regular expression value - //is used as the expression (this way we don't have to watch anything). - if (ngAttr === "ngPattern" && attr.ngPattern.charAt(0) == "/") { - var match = attr.ngPattern.match(REGEX_STRING_REGEXP); - if (match) { - attr.$set("ngPattern", new RegExp(match[1], match[2])); - return; - } - } + forEach(ALIASED_ATTR, function (htmlAttr, ngAttr) { + ngAttributeAliasDirectives[ngAttr] = function () { + return { + priority: 100, + link: function (scope, element, attr) { + //special case ngPattern when a literal regular expression value + //is used as the expression (this way we don't have to watch anything). + if (ngAttr === "ngPattern" && attr.ngPattern.charAt(0) == "/") { + var match = attr.ngPattern.match(REGEX_STRING_REGEXP); + if (match) { + attr.$set("ngPattern", new RegExp(match[1], match[2])); + return; + } + } - scope.$watch(attr[ngAttr], function ngAttrAliasWatchAction(value) { - attr.$set(ngAttr, value); - }); - } - }; - }; -}); + scope.$watch(attr[ngAttr], function ngAttrAliasWatchAction(value) { + attr.$set(ngAttr, value); + }); + } + }; + }; + }); + +// ng-src, ng-srcset, ng-href are interpolated + forEach(['src', 'srcset', 'href'], function (attrName) { + var normalized = directiveNormalize('ng-' + attrName); + ngAttributeAliasDirectives[normalized] = function () { + return { + priority: 99, // it needs to run after the attributes are interpolated + link: function (scope, element, attr) { + var propName = attrName, + name = attrName; + + if (attrName === 'href' && + toString.call(element.prop('href')) === '[object SVGAnimatedString]') { + name = 'xlinkHref'; + attr.$attr[name] = 'xlink:href'; + propName = null; + } + + attr.$observe(normalized, function (value) { + if (!value) { + if (attrName === 'href') { + attr.$set(name, null); + } + return; + } + + attr.$set(name, value); + + // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist + // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need + // to set the property as well to achieve the desired effect. + // we use attr[attrName] value since $set can sanitize the url. + if (msie && propName) element.prop(propName, attr[name]); + }); + } + }; + }; + }); -// ng-src, ng-srcset, ng-href are interpolated -forEach(['src', 'srcset', 'href'], function(attrName) { - var normalized = directiveNormalize('ng-' + attrName); - ngAttributeAliasDirectives[normalized] = function() { - return { - priority: 99, // it needs to run after the attributes are interpolated - link: function(scope, element, attr) { - var propName = attrName, - name = attrName; - - if (attrName === 'href' && - toString.call(element.prop('href')) === '[object SVGAnimatedString]') { - name = 'xlinkHref'; - attr.$attr[name] = 'xlink:href'; - propName = null; - } + /* global -nullFormCtrl, -SUBMITTED_CLASS, addSetValidityMethod: true + */ + var nullFormCtrl = { + $addControl: noop, + $$renameControl: nullFormRenameControl, + $removeControl: noop, + $setValidity: noop, + $setDirty: noop, + $setPristine: noop, + $setSubmitted: noop + }, + SUBMITTED_CLASS = 'ng-submitted'; - attr.$observe(normalized, function(value) { - if (!value) { - if (attrName === 'href') { - attr.$set(name, null); - } - return; - } + function nullFormRenameControl(control, name) { + control.$name = name; + } - attr.$set(name, value); + /** + * @ngdoc type + * @name form.FormController + * + * @property {boolean} $pristine True if user has not interacted with the form yet. + * @property {boolean} $dirty True if user has already interacted with the form. + * @property {boolean} $valid True if all of the containing forms and controls are valid. + * @property {boolean} $invalid True if at least one containing control or form is invalid. + * @property {boolean} $pending True if at least one containing control or form is pending. + * @property {boolean} $submitted True if user has submitted the form even if its invalid. + * + * @property {Object} $error Is an object hash, containing references to controls or + * forms with failing validators, where: + * + * - keys are validation tokens (error names), + * - values are arrays of controls or forms that have a failing validator for given error name. + * + * Built-in validation tokens: + * + * - `email` + * - `max` + * - `maxlength` + * - `min` + * - `minlength` + * - `number` + * - `pattern` + * - `required` + * - `url` + * - `date` + * - `datetimelocal` + * - `time` + * - `week` + * - `month` + * + * @description + * `FormController` keeps track of all its controls and nested forms as well as the state of them, + * such as being valid/invalid or dirty/pristine. + * + * Each {@link ng.directive:form form} directive creates an instance + * of `FormController`. + * + */ +//asks for $scope to fool the BC controller module + FormController.$inject = ['$element', '$attrs', '$scope', '$animate', '$interpolate']; + + function FormController(element, attrs, $scope, $animate, $interpolate) { + var form = this, + controls = []; + + // init state + form.$error = {}; + form.$$success = {}; + form.$pending = undefined; + form.$name = $interpolate(attrs.name || attrs.ngForm || '')($scope); + form.$dirty = false; + form.$pristine = true; + form.$valid = true; + form.$invalid = false; + form.$submitted = false; + form.$$parentForm = nullFormCtrl; - // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist - // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need - // to set the property as well to achieve the desired effect. - // we use attr[attrName] value since $set can sanitize the url. - if (msie && propName) element.prop(propName, attr[name]); - }); - } - }; - }; -}); + /** + * @ngdoc method + * @name form.FormController#$rollbackViewValue + * + * @description + * Rollback all form controls pending updates to the `$modelValue`. + * + * Updates may be pending by a debounced event or because the input is waiting for a some future + * event defined in `ng-model-options`. This method is typically needed by the reset button of + * a form that uses `ng-model-options` to pend updates. + */ + form.$rollbackViewValue = function () { + forEach(controls, function (control) { + control.$rollbackViewValue(); + }); + }; -/* global -nullFormCtrl, -SUBMITTED_CLASS, addSetValidityMethod: true - */ -var nullFormCtrl = { - $addControl: noop, - $$renameControl: nullFormRenameControl, - $removeControl: noop, - $setValidity: noop, - $setDirty: noop, - $setPristine: noop, - $setSubmitted: noop -}, -SUBMITTED_CLASS = 'ng-submitted'; - -function nullFormRenameControl(control, name) { - control.$name = name; -} + /** + * @ngdoc method + * @name form.FormController#$commitViewValue + * + * @description + * Commit all form controls pending updates to the `$modelValue`. + * + * Updates may be pending by a debounced event or because the input is waiting for a some future + * event defined in `ng-model-options`. This method is rarely needed as `NgModelController` + * usually handles calling this in response to input events. + */ + form.$commitViewValue = function () { + forEach(controls, function (control) { + control.$commitViewValue(); + }); + }; -/** - * @ngdoc type - * @name form.FormController - * - * @property {boolean} $pristine True if user has not interacted with the form yet. - * @property {boolean} $dirty True if user has already interacted with the form. - * @property {boolean} $valid True if all of the containing forms and controls are valid. - * @property {boolean} $invalid True if at least one containing control or form is invalid. - * @property {boolean} $pending True if at least one containing control or form is pending. - * @property {boolean} $submitted True if user has submitted the form even if its invalid. - * - * @property {Object} $error Is an object hash, containing references to controls or - * forms with failing validators, where: - * - * - keys are validation tokens (error names), - * - values are arrays of controls or forms that have a failing validator for given error name. - * - * Built-in validation tokens: - * - * - `email` - * - `max` - * - `maxlength` - * - `min` - * - `minlength` - * - `number` - * - `pattern` - * - `required` - * - `url` - * - `date` - * - `datetimelocal` - * - `time` - * - `week` - * - `month` - * - * @description - * `FormController` keeps track of all its controls and nested forms as well as the state of them, - * such as being valid/invalid or dirty/pristine. - * - * Each {@link ng.directive:form form} directive creates an instance - * of `FormController`. - * - */ -//asks for $scope to fool the BC controller module -FormController.$inject = ['$element', '$attrs', '$scope', '$animate', '$interpolate']; -function FormController(element, attrs, $scope, $animate, $interpolate) { - var form = this, - controls = []; - - // init state - form.$error = {}; - form.$$success = {}; - form.$pending = undefined; - form.$name = $interpolate(attrs.name || attrs.ngForm || '')($scope); - form.$dirty = false; - form.$pristine = true; - form.$valid = true; - form.$invalid = false; - form.$submitted = false; - form.$$parentForm = nullFormCtrl; - - /** - * @ngdoc method - * @name form.FormController#$rollbackViewValue - * - * @description - * Rollback all form controls pending updates to the `$modelValue`. - * - * Updates may be pending by a debounced event or because the input is waiting for a some future - * event defined in `ng-model-options`. This method is typically needed by the reset button of - * a form that uses `ng-model-options` to pend updates. - */ - form.$rollbackViewValue = function() { - forEach(controls, function(control) { - control.$rollbackViewValue(); - }); - }; + /** + * @ngdoc method + * @name form.FormController#$addControl + * @param {object} control control object, either a {@link form.FormController} or an + * {@link ngModel.NgModelController} + * + * @description + * Register a control with the form. Input elements using ngModelController do this automatically + * when they are linked. + * + * Note that the current state of the control will not be reflected on the new parent form. This + * is not an issue with normal use, as freshly compiled and linked controls are in a `$pristine` + * state. + * + * However, if the method is used programmatically, for example by adding dynamically created controls, + * or controls that have been previously removed without destroying their corresponding DOM element, + * it's the developers responsibility to make sure the current state propagates to the parent form. + * + * For example, if an input control is added that is already `$dirty` and has `$error` properties, + * calling `$setDirty()` and `$validate()` afterwards will propagate the state to the parent form. + */ + form.$addControl = function (control) { + // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored + // and not added to the scope. Now we throw an error. + assertNotHasOwnProperty(control.$name, 'input'); + controls.push(control); + + if (control.$name) { + form[control.$name] = control; + } - /** - * @ngdoc method - * @name form.FormController#$commitViewValue - * - * @description - * Commit all form controls pending updates to the `$modelValue`. - * - * Updates may be pending by a debounced event or because the input is waiting for a some future - * event defined in `ng-model-options`. This method is rarely needed as `NgModelController` - * usually handles calling this in response to input events. - */ - form.$commitViewValue = function() { - forEach(controls, function(control) { - control.$commitViewValue(); - }); - }; + control.$$parentForm = form; + }; - /** - * @ngdoc method - * @name form.FormController#$addControl - * @param {object} control control object, either a {@link form.FormController} or an - * {@link ngModel.NgModelController} - * - * @description - * Register a control with the form. Input elements using ngModelController do this automatically - * when they are linked. - * - * Note that the current state of the control will not be reflected on the new parent form. This - * is not an issue with normal use, as freshly compiled and linked controls are in a `$pristine` - * state. - * - * However, if the method is used programmatically, for example by adding dynamically created controls, - * or controls that have been previously removed without destroying their corresponding DOM element, - * it's the developers responsibility to make sure the current state propagates to the parent form. - * - * For example, if an input control is added that is already `$dirty` and has `$error` properties, - * calling `$setDirty()` and `$validate()` afterwards will propagate the state to the parent form. - */ - form.$addControl = function(control) { - // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored - // and not added to the scope. Now we throw an error. - assertNotHasOwnProperty(control.$name, 'input'); - controls.push(control); - - if (control.$name) { - form[control.$name] = control; - } + // Private API: rename a form control + form.$$renameControl = function (control, newName) { + var oldName = control.$name; - control.$$parentForm = form; - }; + if (form[oldName] === control) { + delete form[oldName]; + } + form[newName] = control; + control.$name = newName; + }; - // Private API: rename a form control - form.$$renameControl = function(control, newName) { - var oldName = control.$name; + /** + * @ngdoc method + * @name form.FormController#$removeControl + * @param {object} control control object, either a {@link form.FormController} or an + * {@link ngModel.NgModelController} + * + * @description + * Deregister a control from the form. + * + * Input elements using ngModelController do this automatically when they are destroyed. + * + * Note that only the removed control's validation state (`$errors`etc.) will be removed from the + * form. `$dirty`, `$submitted` states will not be changed, because the expected behavior can be + * different from case to case. For example, removing the only `$dirty` control from a form may or + * may not mean that the form is still `$dirty`. + */ + form.$removeControl = function (control) { + if (control.$name && form[control.$name] === control) { + delete form[control.$name]; + } + forEach(form.$pending, function (value, name) { + form.$setValidity(name, null, control); + }); + forEach(form.$error, function (value, name) { + form.$setValidity(name, null, control); + }); + forEach(form.$$success, function (value, name) { + form.$setValidity(name, null, control); + }); - if (form[oldName] === control) { - delete form[oldName]; - } - form[newName] = control; - control.$name = newName; - }; - - /** - * @ngdoc method - * @name form.FormController#$removeControl - * @param {object} control control object, either a {@link form.FormController} or an - * {@link ngModel.NgModelController} - * - * @description - * Deregister a control from the form. - * - * Input elements using ngModelController do this automatically when they are destroyed. - * - * Note that only the removed control's validation state (`$errors`etc.) will be removed from the - * form. `$dirty`, `$submitted` states will not be changed, because the expected behavior can be - * different from case to case. For example, removing the only `$dirty` control from a form may or - * may not mean that the form is still `$dirty`. - */ - form.$removeControl = function(control) { - if (control.$name && form[control.$name] === control) { - delete form[control.$name]; - } - forEach(form.$pending, function(value, name) { - form.$setValidity(name, null, control); - }); - forEach(form.$error, function(value, name) { - form.$setValidity(name, null, control); - }); - forEach(form.$$success, function(value, name) { - form.$setValidity(name, null, control); - }); + arrayRemove(controls, control); + control.$$parentForm = nullFormCtrl; + }; - arrayRemove(controls, control); - control.$$parentForm = nullFormCtrl; - }; + /** + * @ngdoc method + * @name form.FormController#$setValidity + * + * @description + * Sets the validity of a form control. + * + * This method will also propagate to parent forms. + */ + addSetValidityMethod({ + ctrl: this, + $element: element, + set: function (object, property, controller) { + var list = object[property]; + if (!list) { + object[property] = [controller]; + } else { + var index = list.indexOf(controller); + if (index === -1) { + list.push(controller); + } + } + }, + unset: function (object, property, controller) { + var list = object[property]; + if (!list) { + return; + } + arrayRemove(list, controller); + if (list.length === 0) { + delete object[property]; + } + }, + $animate: $animate + }); - /** - * @ngdoc method - * @name form.FormController#$setValidity - * - * @description - * Sets the validity of a form control. - * - * This method will also propagate to parent forms. - */ - addSetValidityMethod({ - ctrl: this, - $element: element, - set: function(object, property, controller) { - var list = object[property]; - if (!list) { - object[property] = [controller]; - } else { - var index = list.indexOf(controller); - if (index === -1) { - list.push(controller); - } - } - }, - unset: function(object, property, controller) { - var list = object[property]; - if (!list) { - return; - } - arrayRemove(list, controller); - if (list.length === 0) { - delete object[property]; - } - }, - $animate: $animate - }); + /** + * @ngdoc method + * @name form.FormController#$setDirty + * + * @description + * Sets the form to a dirty state. + * + * This method can be called to add the 'ng-dirty' class and set the form to a dirty + * state (ng-dirty class). This method will also propagate to parent forms. + */ + form.$setDirty = function () { + $animate.removeClass(element, PRISTINE_CLASS); + $animate.addClass(element, DIRTY_CLASS); + form.$dirty = true; + form.$pristine = false; + form.$$parentForm.$setDirty(); + }; - /** - * @ngdoc method - * @name form.FormController#$setDirty - * - * @description - * Sets the form to a dirty state. - * - * This method can be called to add the 'ng-dirty' class and set the form to a dirty - * state (ng-dirty class). This method will also propagate to parent forms. - */ - form.$setDirty = function() { - $animate.removeClass(element, PRISTINE_CLASS); - $animate.addClass(element, DIRTY_CLASS); - form.$dirty = true; - form.$pristine = false; - form.$$parentForm.$setDirty(); - }; - - /** - * @ngdoc method - * @name form.FormController#$setPristine - * - * @description - * Sets the form to its pristine state. - * - * This method can be called to remove the 'ng-dirty' class and set the form to its pristine - * state (ng-pristine class). This method will also propagate to all the controls contained - * in this form. - * - * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after - * saving or resetting it. - */ - form.$setPristine = function() { - $animate.setClass(element, PRISTINE_CLASS, DIRTY_CLASS + ' ' + SUBMITTED_CLASS); - form.$dirty = false; - form.$pristine = true; - form.$submitted = false; - forEach(controls, function(control) { - control.$setPristine(); - }); - }; + /** + * @ngdoc method + * @name form.FormController#$setPristine + * + * @description + * Sets the form to its pristine state. + * + * This method can be called to remove the 'ng-dirty' class and set the form to its pristine + * state (ng-pristine class). This method will also propagate to all the controls contained + * in this form. + * + * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after + * saving or resetting it. + */ + form.$setPristine = function () { + $animate.setClass(element, PRISTINE_CLASS, DIRTY_CLASS + ' ' + SUBMITTED_CLASS); + form.$dirty = false; + form.$pristine = true; + form.$submitted = false; + forEach(controls, function (control) { + control.$setPristine(); + }); + }; - /** - * @ngdoc method - * @name form.FormController#$setUntouched - * - * @description - * Sets the form to its untouched state. - * - * This method can be called to remove the 'ng-touched' class and set the form controls to their - * untouched state (ng-untouched class). - * - * Setting a form controls back to their untouched state is often useful when setting the form - * back to its pristine state. - */ - form.$setUntouched = function() { - forEach(controls, function(control) { - control.$setUntouched(); - }); - }; + /** + * @ngdoc method + * @name form.FormController#$setUntouched + * + * @description + * Sets the form to its untouched state. + * + * This method can be called to remove the 'ng-touched' class and set the form controls to their + * untouched state (ng-untouched class). + * + * Setting a form controls back to their untouched state is often useful when setting the form + * back to its pristine state. + */ + form.$setUntouched = function () { + forEach(controls, function (control) { + control.$setUntouched(); + }); + }; - /** - * @ngdoc method - * @name form.FormController#$setSubmitted - * - * @description - * Sets the form to its submitted state. - */ - form.$setSubmitted = function() { - $animate.addClass(element, SUBMITTED_CLASS); - form.$submitted = true; - form.$$parentForm.$setSubmitted(); - }; -} + /** + * @ngdoc method + * @name form.FormController#$setSubmitted + * + * @description + * Sets the form to its submitted state. + */ + form.$setSubmitted = function () { + $animate.addClass(element, SUBMITTED_CLASS); + form.$submitted = true; + form.$$parentForm.$setSubmitted(); + }; + } -/** - * @ngdoc directive - * @name ngForm - * @restrict EAC - * - * @description - * Nestable alias of {@link ng.directive:form `form`} directive. HTML - * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a - * sub-group of controls needs to be determined. - * - * Note: the purpose of `ngForm` is to group controls, - * but not to be a replacement for the `
` tag with all of its capabilities - * (e.g. posting to the server, ...). - * - * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into - * related scope, under this name. - * - */ + /** + * @ngdoc directive + * @name ngForm + * @restrict EAC + * + * @description + * Nestable alias of {@link ng.directive:form `form`} directive. HTML + * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a + * sub-group of controls needs to be determined. + * + * Note: the purpose of `ngForm` is to group controls, + * but not to be a replacement for the `` tag with all of its capabilities + * (e.g. posting to the server, ...). + * + * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into + * related scope, under this name. + * + */ - /** - * @ngdoc directive - * @name form - * @restrict E - * - * @description - * Directive that instantiates - * {@link form.FormController FormController}. - * - * If the `name` attribute is specified, the form controller is published onto the current scope under - * this name. - * - * # Alias: {@link ng.directive:ngForm `ngForm`} - * - * In Angular, forms can be nested. This means that the outer form is valid when all of the child - * forms are valid as well. However, browsers do not allow nesting of `` elements, so - * Angular provides the {@link ng.directive:ngForm `ngForm`} directive, which behaves identically to - * `form` but can be nested. Nested forms can be useful, for example, if the validity of a sub-group - * of controls needs to be determined. - * - * # CSS classes - * - `ng-valid` is set if the form is valid. - * - `ng-invalid` is set if the form is invalid. - * - `ng-pending` is set if the form is pending. - * - `ng-pristine` is set if the form is pristine. - * - `ng-dirty` is set if the form is dirty. - * - `ng-submitted` is set if the form was submitted. - * - * Keep in mind that ngAnimate can detect each of these classes when added and removed. - * - * - * # Submitting a form and preventing the default action - * - * Since the role of forms in client-side Angular applications is different than in classical - * roundtrip apps, it is desirable for the browser not to translate the form submission into a full - * page reload that sends the data to the server. Instead some javascript logic should be triggered - * to handle the form submission in an application-specific way. - * - * For this reason, Angular prevents the default action (form submission to the server) unless the - * `` element has an `action` attribute specified. - * - * You can use one of the following two ways to specify what javascript method should be called when - * a form is submitted: - * - * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element - * - {@link ng.directive:ngClick ngClick} directive on the first - * button or input field of type submit (input[type=submit]) - * - * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit} - * or {@link ng.directive:ngClick ngClick} directives. - * This is because of the following form submission rules in the HTML specification: - * - * - If a form has only one input field then hitting enter in this field triggers form submit - * (`ngSubmit`) - * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter - * doesn't trigger submit - * - if a form has one or more input fields and one or more buttons or input[type=submit] then - * hitting enter in any of the input fields will trigger the click handler on the *first* button or - * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`) - * - * Any pending `ngModelOptions` changes will take place immediately when an enclosing form is - * submitted. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit` - * to have access to the updated model. - * - * ## Animation Hooks - * - * Animations in ngForm are triggered when any of the associated CSS classes are added and removed. - * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any - * other validations that are performed within the form. Animations in ngForm are similar to how - * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well - * as JS animations. - * - * The following example shows a simple way to utilize CSS transitions to style a form element - * that has been rendered as invalid after it has been validated: - * - * 
- * //be sure to include ngAnimate as a module to hook into more
- * //advanced animations
- * .my-form {
+    /**
+     * @ngdoc directive
+     * @name form
+     * @restrict E
+     *
+     * @description
+     * Directive that instantiates
+     * {@link form.FormController FormController}.
+     *
+     * If the `name` attribute is specified, the form controller is published onto the current scope under
+     * this name.
+     *
+     * # Alias: {@link ng.directive:ngForm `ngForm`}
+     *
+     * In Angular, forms can be nested. This means that the outer form is valid when all of the child
+     * forms are valid as well. However, browsers do not allow nesting of `` elements, so
+     * Angular provides the {@link ng.directive:ngForm `ngForm`} directive, which behaves identically to
+     * `form` but can be nested. Nested forms can be useful, for example, if the validity of a sub-group
+     * of controls needs to be determined.
+     *
+     * # CSS classes
+     *  - `ng-valid` is set if the form is valid.
+     *  - `ng-invalid` is set if the form is invalid.
+     *  - `ng-pending` is set if the form is pending.
+     *  - `ng-pristine` is set if the form is pristine.
+     *  - `ng-dirty` is set if the form is dirty.
+     *  - `ng-submitted` is set if the form was submitted.
+     *
+     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+     *
+     *
+     * # Submitting a form and preventing the default action
+     *
+     * Since the role of forms in client-side Angular applications is different than in classical
+     * roundtrip apps, it is desirable for the browser not to translate the form submission into a full
+     * page reload that sends the data to the server. Instead some javascript logic should be triggered
+     * to handle the form submission in an application-specific way.
+     *
+     * For this reason, Angular prevents the default action (form submission to the server) unless the
+     * `` element has an `action` attribute specified.
+     *
+     * You can use one of the following two ways to specify what javascript method should be called when
+     * a form is submitted:
+     *
+     * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element
+     * - {@link ng.directive:ngClick ngClick} directive on the first
+     *  button or input field of type submit (input[type=submit])
+     *
+     * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit}
+     * or {@link ng.directive:ngClick ngClick} directives.
+     * This is because of the following form submission rules in the HTML specification:
+     *
+     * - If a form has only one input field then hitting enter in this field triggers form submit
+     * (`ngSubmit`)
+     * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter
+     * doesn't trigger submit
+     * - if a form has one or more input fields and one or more buttons or input[type=submit] then
+     * hitting enter in any of the input fields will trigger the click handler on the *first* button or
+     * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
+     *
+     * Any pending `ngModelOptions` changes will take place immediately when an enclosing form is
+     * submitted. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+     * to have access to the updated model.
+     *
+     * ## Animation Hooks
+     *
+     * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
+     * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
+     * other validations that are performed within the form. Animations in ngForm are similar to how
+     * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
+     * as JS animations.
+     *
+     * The following example shows a simple way to utilize CSS transitions to style a form element
+     * that has been rendered as invalid after it has been validated:
+     *
+     * 
+     * //be sure to include ngAnimate as a module to hook into more
+     * //advanced animations
+     * .my-form {
  *   transition:0.5s linear all;
  *   background: white;
  * }
- * .my-form.ng-invalid {
+     * .my-form.ng-invalid {
  *   background: red;
  *   color:white;
  * }
- * 

- *
- * @example
-    
-      
-       
-       
-       
-         userType: 
-         Required!

-         userType = {{userType}}

-         myForm.input.$valid = {{myForm.input.$valid}}

-         myForm.input.$error = {{myForm.input.$error}}

-         myForm.$valid = {{myForm.$valid}}

-         myForm.$error.required = {{!!myForm.$error.required}}

-        
-      
-      
-        it('should initialize to model', function() {
+     
+     

+     userType: 
+     Required!

+     userType = {{userType}}

+     myForm.input.$valid = {{myForm.input.$valid}}

+     myForm.input.$error = {{myForm.input.$error}}

+     myForm.$valid = {{myForm.$valid}}

+     myForm.$error.required = {{!!myForm.$error.required}}

+     

+     
+     
+     it('should initialize to model', function() {
           var userType = element(by.binding('userType'));
           var valid = element(by.binding('myForm.input.$valid'));
 
@@ -21878,7 +21988,7 @@ function FormController(element, attrs, $scope, $animate, $interpolate) {
           expect(valid.getText()).toContain('true');
         });
 
-        it('should be invalid if empty', function() {
+     it('should be invalid if empty', function() {
           var userType = element(by.binding('userType'));
           var valid = element(by.binding('myForm.input.$valid'));
           var userInput = element(by.model('userType'));
@@ -21889,98 +21999,98 @@ function FormController(element, attrs, $scope, $animate, $interpolate) {
           expect(userType.getText()).toEqual('userType =');
           expect(valid.getText()).toContain('false');
         });
-      
-    
- *
- * @param {string=} name Name of the form. If specified, the form controller will be published into
- *                       related scope, under this name.
- */
-var formDirectiveFactory = function(isNgForm) {
-  return ['$timeout', '$parse', function($timeout, $parse) {
-    var formDirective = {
-      name: 'form',
-      restrict: isNgForm ? 'EAC' : 'E',
-      require: ['form', '^^?form'], //first is the form's own ctrl, second is an optional parent form
-      controller: FormController,
-      compile: function ngFormCompile(formElement, attr) {
-        // Setup initial state of the control
-        formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS);
-
-        var nameAttr = attr.name ? 'name' : (isNgForm && attr.ngForm ? 'ngForm' : false);
-
-        return {
-          pre: function ngFormPreLink(scope, formElement, attr, ctrls) {
-            var controller = ctrls[0];
-
-            // if `action` attr is not present on the form, prevent the default action (submission)
-            if (!('action' in attr)) {
-              // we can't use jq events because if a form is destroyed during submission the default
-              // action is not prevented. see #1238
-              //
-              // IE 9 is not affected because it doesn't fire a submit event and try to do a full
-              // page reload if the form was destroyed by submission of the form via a click handler
-              // on a button in the form. Looks like an IE9 specific bug.
-              var handleFormSubmission = function(event) {
-                scope.$apply(function() {
-                  controller.$commitViewValue();
-                  controller.$setSubmitted();
-                });
-
-                event.preventDefault();
-              };
-
-              addEventListenerFn(formElement[0], 'submit', handleFormSubmission);
-
-              // unregister the preventDefault listener so that we don't not leak memory but in a
-              // way that will achieve the prevention of the default action.
-              formElement.on('$destroy', function() {
-                $timeout(function() {
-                  removeEventListenerFn(formElement[0], 'submit', handleFormSubmission);
-                }, 0, false);
-              });
-            }
-
-            var parentFormCtrl = ctrls[1] || controller.$$parentForm;
-            parentFormCtrl.$addControl(controller);
+     
+     
+     *
+     * @param {string=} name Name of the form. If specified, the form controller will be published into
+     *                       related scope, under this name.
+     */
+    var formDirectiveFactory = function (isNgForm) {
+        return ['$timeout', '$parse', function ($timeout, $parse) {
+            var formDirective = {
+                name: 'form',
+                restrict: isNgForm ? 'EAC' : 'E',
+                require: ['form', '^^?form'], //first is the form's own ctrl, second is an optional parent form
+                controller: FormController,
+                compile: function ngFormCompile(formElement, attr) {
+                    // Setup initial state of the control
+                    formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS);
+
+                    var nameAttr = attr.name ? 'name' : (isNgForm && attr.ngForm ? 'ngForm' : false);
+
+                    return {
+                        pre: function ngFormPreLink(scope, formElement, attr, ctrls) {
+                            var controller = ctrls[0];
+
+                            // if `action` attr is not present on the form, prevent the default action (submission)
+                            if (!('action' in attr)) {
+                                // we can't use jq events because if a form is destroyed during submission the default
+                                // action is not prevented. see #1238
+                                //
+                                // IE 9 is not affected because it doesn't fire a submit event and try to do a full
+                                // page reload if the form was destroyed by submission of the form via a click handler
+                                // on a button in the form. Looks like an IE9 specific bug.
+                                var handleFormSubmission = function (event) {
+                                    scope.$apply(function () {
+                                        controller.$commitViewValue();
+                                        controller.$setSubmitted();
+                                    });
+
+                                    event.preventDefault();
+                                };
+
+                                addEventListenerFn(formElement[0], 'submit', handleFormSubmission);
+
+                                // unregister the preventDefault listener so that we don't not leak memory but in a
+                                // way that will achieve the prevention of the default action.
+                                formElement.on('$destroy', function () {
+                                    $timeout(function () {
+                                        removeEventListenerFn(formElement[0], 'submit', handleFormSubmission);
+                                    }, 0, false);
+                                });
+                            }
+
+                            var parentFormCtrl = ctrls[1] || controller.$$parentForm;
+                            parentFormCtrl.$addControl(controller);
+
+                            var setter = nameAttr ? getSetter(controller.$name) : noop;
+
+                            if (nameAttr) {
+                                setter(scope, controller);
+                                attr.$observe(nameAttr, function (newValue) {
+                                    if (controller.$name === newValue) return;
+                                    setter(scope, undefined);
+                                    controller.$$parentForm.$$renameControl(controller, newValue);
+                                    setter = getSetter(controller.$name);
+                                    setter(scope, controller);
+                                });
+                            }
+                            formElement.on('$destroy', function () {
+                                controller.$$parentForm.$removeControl(controller);
+                                setter(scope, undefined);
+                                extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
+                            });
+                        }
+                    };
+                }
+            };
 
-            var setter = nameAttr ? getSetter(controller.$name) : noop;
+            return formDirective;
 
-            if (nameAttr) {
-              setter(scope, controller);
-              attr.$observe(nameAttr, function(newValue) {
-                if (controller.$name === newValue) return;
-                setter(scope, undefined);
-                controller.$$parentForm.$$renameControl(controller, newValue);
-                setter = getSetter(controller.$name);
-                setter(scope, controller);
-              });
+            function getSetter(expression) {
+                if (expression === '') {
+                    //create an assignable expression, so forms with an empty name can be renamed later
+                    return $parse('this[""]').assign;
+                }
+                return $parse(expression).assign || noop;
             }
-            formElement.on('$destroy', function() {
-              controller.$$parentForm.$removeControl(controller);
-              setter(scope, undefined);
-              extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
-            });
-          }
-        };
-      }
+        }];
     };
 
-    return formDirective;
+    var formDirective = formDirectiveFactory();
+    var ngFormDirective = formDirectiveFactory(true);
 
-    function getSetter(expression) {
-      if (expression === '') {
-        //create an assignable expression, so forms with an empty name can be renamed later
-        return $parse('this[""]').assign;
-      }
-      return $parse(expression).assign || noop;
-    }
-  }];
-};
-
-var formDirective = formDirectiveFactory();
-var ngFormDirective = formDirectiveFactory(true);
-
-/* global VALID_CLASS: false,
+    /* global VALID_CLASS: false,
   INVALID_CLASS: false,
   PRISTINE_CLASS: false,
   DIRTY_CLASS: false,
@@ -21990,7 +22100,7 @@ var ngFormDirective = formDirectiveFactory(true);
 */
 
 // Regex code was initially obtained from SO prior to modification: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231
-var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/;
+    var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/;
 // See valid URLs in RFC3987 (http://tools.ietf.org/html/rfc3987)
 // Note: We are being more lenient, because browsers are too.
 //   1. Scheme
@@ -22003,66 +22113,66 @@ var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-
 //   8. Query
 //   9. Fragment
 //                 1111111111111111 222   333333    44444        555555555555555555555555    666     77777777     8888888     999
-var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
-var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
-var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
-var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
-var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
-var WEEK_REGEXP = /^(\d{4,})-W(\d\d)$/;
-var MONTH_REGEXP = /^(\d{4,})-(\d\d)$/;
-var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
-
-var PARTIAL_VALIDATION_EVENTS = 'keydown wheel mousedown';
-var PARTIAL_VALIDATION_TYPES = createMap();
-forEach('date,datetime-local,month,time,week'.split(','), function(type) {
-  PARTIAL_VALIDATION_TYPES[type] = true;
-});
-
-var inputType = {
-
-  /**
-   * @ngdoc input
-   * @name input[text]
-   *
-   * @description
-   * Standard HTML text input with angular data binding, inherited by most of the `input` elements.
-   *
-   *
-   * @param {string} ngModel Assignable angular expression to data-bind to.
-   * @param {string=} name Property name of the form under which the control is published.
-   * @param {string=} required Adds `required` validation error key if the value is not entered.
-   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-   *    `required` when you want to data-bind to the `required` attribute.
-   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-   *    minlength.
-   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
-   *    any length.
-   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
-   *    that contains the regular expression body that will be converted to a regular expression
-   *    as in the ngPattern directive.
-   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-   *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
-   *    If the expression evaluates to a RegExp object, then this is used directly.
-   *    If the expression evaluates to a string, then it will be converted to a RegExp
-   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-   *    `new RegExp('^abc$')`.

-   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-   *    start at the index of the last search's match, thus not taking the whole input value into
-   *    account.
-   * @param {string=} ngChange Angular expression to be executed when input changes due to user
-   *    interaction with the input element.
-   * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
-   *    This parameter is ignored for input[type=password] controls, which will never trim the
-   *    input.
-   *
-   * @example
-      
-        
+    var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
+    var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
+    var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
+    var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
+    var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+    var WEEK_REGEXP = /^(\d{4,})-W(\d\d)$/;
+    var MONTH_REGEXP = /^(\d{4,})-(\d\d)$/;
+    var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+
+    var PARTIAL_VALIDATION_EVENTS = 'keydown wheel mousedown';
+    var PARTIAL_VALIDATION_TYPES = createMap();
+    forEach('date,datetime-local,month,time,week'.split(','), function (type) {
+        PARTIAL_VALIDATION_TYPES[type] = true;
+    });
+
+    var inputType = {
+
+        /**
+         * @ngdoc input
+         * @name input[text]
+         *
+         * @description
+         * Standard HTML text input with angular data binding, inherited by most of the `input` elements.
+         *
+         *
+         * @param {string} ngModel Assignable angular expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} required Adds `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.

+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange Angular expression to be executed when input changes due to user
+         *    interaction with the input element.
+         * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+         *    This parameter is ignored for input[type=password] controls, which will never trim the
+         *    input.
+         *
+         * @example
+         
+         
          
          

-           
-           

-             
-               Required!
-             
-               Single word only!
-           

-           text = {{example.text}}

-           myForm.input.$valid = {{myForm.input.$valid}}

-           myForm.input.$error = {{myForm.input.$error}}

-           myForm.$valid = {{myForm.$valid}}

-           myForm.$error.required = {{!!myForm.$error.required}}

-          

-        
-        
-          var text = element(by.binding('example.text'));
-          var valid = element(by.binding('myForm.input.$valid'));
-          var input = element(by.model('example.text'));
+         
+         

+         
+         Required!
+         
+         Single word only!
+         

+         text = {{example.text}}

+         myForm.input.$valid = {{myForm.input.$valid}}

+         myForm.input.$error = {{myForm.input.$error}}

+         myForm.$valid = {{myForm.$valid}}

+         myForm.$error.required = {{!!myForm.$error.required}}

+         
+         
+         
+         var text = element(by.binding('example.text'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.text'));
 
-          it('should initialize to model', function() {
+         it('should initialize to model', function() {
             expect(text.getText()).toContain('guest');
             expect(valid.getText()).toContain('true');
           });
 
-          it('should be invalid if empty', function() {
+         it('should be invalid if empty', function() {
             input.clear();
             input.sendKeys('');
 
@@ -22105,92 +22215,92 @@ var inputType = {
             expect(valid.getText()).toContain('false');
           });
 
-          it('should be invalid if multi word', function() {
+         it('should be invalid if multi word', function() {
             input.clear();
             input.sendKeys('hello world');
 
             expect(valid.getText()).toContain('false');
           });
-        
-      
-   */
-  'text': textInputType,
+         
+         
+         */
+        'text': textInputType,
 
-    /**
-     * @ngdoc input
-     * @name input[date]
-     *
-     * @description
-     * Input with date validation and transformation. In browsers that do not yet support
-     * the HTML5 date input, a text element will be used. In that case, text must be entered in a valid ISO-8601
-     * date format (yyyy-MM-dd), for example: `2009-01-06`. Since many
-     * modern browsers do not yet support this input type, it is important to provide cues to users on the
-     * expected input format via a placeholder or label.
-     *
-     * The model must always be a Date object, otherwise Angular will throw an error.
-     * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-     *
-     * The timezone to be used to read/write the `Date` instance in the model can be defined using
-     * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-     *
-     * @param {string} ngModel Assignable angular expression to data-bind to.
-     * @param {string=} name Property name of the form under which the control is published.
-     * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
-     *   valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
-     *   (e.g. `min="{{minDate | date:'yyyy-MM-dd'}}"`). Note that `min` will also add native HTML5
-     *   constraint validation.
-     * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be
-     *   a valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
-     *   (e.g. `max="{{maxDate | date:'yyyy-MM-dd'}}"`). Note that `max` will also add native HTML5
-     *   constraint validation.
-     * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO date string
-     *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-     * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO date string
-     *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
-     * @param {string=} required Sets `required` validation error key if the value is not entered.
-     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-     *    `required` when you want to data-bind to the `required` attribute.
-     * @param {string=} ngChange Angular expression to be executed when input changes due to user
-     *    interaction with the input element.
-     *
-     * @example
-     
-     
-       
-       

-          
-          
-          

-            
-                Required!
-            
-                Not a valid date!
-           

-           value = {{example.value | date: "yyyy-MM-dd"}}

-           myForm.input.$valid = {{myForm.input.$valid}}

-           myForm.input.$error = {{myForm.input.$error}}

-           myForm.$valid = {{myForm.$valid}}

-           myForm.$error.required = {{!!myForm.$error.required}}

-       

-     
-     
-        var value = element(by.binding('example.value | date: "yyyy-MM-dd"'));
-        var valid = element(by.binding('myForm.input.$valid'));
-        var input = element(by.model('example.value'));
-
-        // currently protractor/webdriver does not support
-        // sending keys to all known HTML5 input controls
-        // for various browsers (see https://github.com/angular/protractor/issues/562).
-        function setInput(val) {
+         
+         

+         
+         
+         

+         
+         Required!
+         
+         Not a valid date!
+         

+         value = {{example.value | date: "yyyy-MM-dd"}}

+         myForm.input.$valid = {{myForm.input.$valid}}

+         myForm.input.$error = {{myForm.input.$error}}

+         myForm.$valid = {{myForm.$valid}}

+         myForm.$error.required = {{!!myForm.$error.required}}

+         

+         
+         
+         var value = element(by.binding('example.value | date: "yyyy-MM-dd"'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.value'));
+
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (see https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
           // set the value of the element and force validation.
           var scr = "var ipt = document.getElementById('exampleInput'); " +
           "ipt.value = '" + val + "';" +
@@ -22198,102 +22308,102 @@ var inputType = {
           browser.executeScript(scr);
         }
 
-        it('should initialize to model', function() {
+         it('should initialize to model', function() {
           expect(value.getText()).toContain('2013-10-22');
           expect(valid.getText()).toContain('myForm.input.$valid = true');
         });
 
-        it('should be invalid if empty', function() {
+         it('should be invalid if empty', function() {
           setInput('');
           expect(value.getText()).toEqual('value =');
           expect(valid.getText()).toContain('myForm.input.$valid = false');
         });
 
-        it('should be invalid if over max', function() {
+         it('should be invalid if over max', function() {
           setInput('2015-01-01');
           expect(value.getText()).toContain('');
           expect(valid.getText()).toContain('myForm.input.$valid = false');
         });
-     
-     
-     */
-  'date': createDateInputType('date', DATE_REGEXP,
-         createDateParser(DATE_REGEXP, ['yyyy', 'MM', 'dd']),
-         'yyyy-MM-dd'),
-
-   /**
-    * @ngdoc input
-    * @name input[datetime-local]
-    *
-    * @description
-    * Input with datetime validation and transformation. In browsers that do not yet support
-    * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
-    * local datetime format (yyyy-MM-ddTHH:mm:ss), for example: `2010-12-28T14:57:00`.
-    *
-    * The model must always be a Date object, otherwise Angular will throw an error.
-    * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-    *
-    * The timezone to be used to read/write the `Date` instance in the model can be defined using
-    * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-    *
-    * @param {string} ngModel Assignable angular expression to data-bind to.
-    * @param {string=} name Property name of the form under which the control is published.
-    * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-    *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
-    *   inside this attribute (e.g. `min="{{minDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
-    *   Note that `min` will also add native HTML5 constraint validation.
-    * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-    *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
-    *   inside this attribute (e.g. `max="{{maxDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
-    *   Note that `max` will also add native HTML5 constraint validation.
-    * @param {(date|string)=} ngMin Sets the `min` validation error key to the Date / ISO datetime string
-    *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-    * @param {(date|string)=} ngMax Sets the `max` validation error key to the Date / ISO datetime string
-    *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
-    * @param {string=} required Sets `required` validation error key if the value is not entered.
-    * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-    *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-    *    `required` when you want to data-bind to the `required` attribute.
-    * @param {string=} ngChange Angular expression to be executed when input changes due to user
-    *    interaction with the input element.
-    *
-    * @example
-    
-    
-      
-      

-        
-        
-        

-          
-              Required!
-          
-              Not a valid date!
-        

-        value = {{example.value | date: "yyyy-MM-ddTHH:mm:ss"}}

-        myForm.input.$valid = {{myForm.input.$valid}}

-        myForm.input.$error = {{myForm.input.$error}}

-        myForm.$valid = {{myForm.$valid}}

-        myForm.$error.required = {{!!myForm.$error.required}}

-      

-    
-    
-      var value = element(by.binding('example.value | date: "yyyy-MM-ddTHH:mm:ss"'));
-      var valid = element(by.binding('myForm.input.$valid'));
-      var input = element(by.model('example.value'));
-
-      // currently protractor/webdriver does not support
-      // sending keys to all known HTML5 input controls
-      // for various browsers (https://github.com/angular/protractor/issues/562).
-      function setInput(val) {
+         
+         

+         
+         
+         

+         
+         Required!
+         
+         Not a valid date!
+         

+         value = {{example.value | date: "yyyy-MM-ddTHH:mm:ss"}}

+         myForm.input.$valid = {{myForm.input.$valid}}

+         myForm.input.$error = {{myForm.input.$error}}

+         myForm.$valid = {{myForm.$valid}}

+         myForm.$error.required = {{!!myForm.$error.required}}

+         

+         
+         
+         var value = element(by.binding('example.value | date: "yyyy-MM-ddTHH:mm:ss"'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.value'));
+
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
         // set the value of the element and force validation.
         var scr = "var ipt = document.getElementById('exampleInput'); " +
         "ipt.value = '" + val + "';" +
@@ -22301,103 +22411,103 @@ var inputType = {
         browser.executeScript(scr);
       }
 
-      it('should initialize to model', function() {
+         it('should initialize to model', function() {
         expect(value.getText()).toContain('2010-12-28T14:57:00');
         expect(valid.getText()).toContain('myForm.input.$valid = true');
       });
 
-      it('should be invalid if empty', function() {
+         it('should be invalid if empty', function() {
         setInput('');
         expect(value.getText()).toEqual('value =');
         expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
 
-      it('should be invalid if over max', function() {
+         it('should be invalid if over max', function() {
         setInput('2015-01-01T23:59:00');
         expect(value.getText()).toContain('');
         expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
-    
-    
-    */
-  'datetime-local': createDateInputType('datetimelocal', DATETIMELOCAL_REGEXP,
-      createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss', 'sss']),
-      'yyyy-MM-ddTHH:mm:ss.sss'),
-
-  /**
-   * @ngdoc input
-   * @name input[time]
-   *
-   * @description
-   * Input with time validation and transformation. In browsers that do not yet support
-   * the HTML5 time input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
-   * local time format (HH:mm:ss), for example: `14:57:00`. Model must be a Date object. This binding will always output a
-   * Date object to the model of January 1, 1970, or local date `new Date(1970, 0, 1, HH, mm, ss)`.
-   *
-   * The model must always be a Date object, otherwise Angular will throw an error.
-   * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-   *
-   * The timezone to be used to read/write the `Date` instance in the model can be defined using
-   * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-   *
-   * @param {string} ngModel Assignable angular expression to data-bind to.
-   * @param {string=} name Property name of the form under which the control is published.
-   * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-   *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
-   *   attribute (e.g. `min="{{minTime | date:'HH:mm:ss'}}"`). Note that `min` will also add
-   *   native HTML5 constraint validation.
-   * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-   *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
-   *   attribute (e.g. `max="{{maxTime | date:'HH:mm:ss'}}"`). Note that `max` will also add
-   *   native HTML5 constraint validation.
-   * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO time string the
-   *   `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-   * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO time string the
-   *   `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
-   * @param {string=} required Sets `required` validation error key if the value is not entered.
-   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-   *    `required` when you want to data-bind to the `required` attribute.
-   * @param {string=} ngChange Angular expression to be executed when input changes due to user
-   *    interaction with the input element.
-   *
-   * @example
-   
-   
-     
-     

-        
-        
-        

-          
-              Required!
-          
-              Not a valid date!
-        

-        value = {{example.value | date: "HH:mm:ss"}}

-        myForm.input.$valid = {{myForm.input.$valid}}

-        myForm.input.$error = {{myForm.input.$error}}

-        myForm.$valid = {{myForm.$valid}}

-        myForm.$error.required = {{!!myForm.$error.required}}

-     

-   
-   
-      var value = element(by.binding('example.value | date: "HH:mm:ss"'));
-      var valid = element(by.binding('myForm.input.$valid'));
-      var input = element(by.model('example.value'));
-
-      // currently protractor/webdriver does not support
-      // sending keys to all known HTML5 input controls
-      // for various browsers (https://github.com/angular/protractor/issues/562).
-      function setInput(val) {
+         
+         

+         
+         
+         

+         
+         Required!
+         
+         Not a valid date!
+         

+         value = {{example.value | date: "HH:mm:ss"}}

+         myForm.input.$valid = {{myForm.input.$valid}}

+         myForm.input.$error = {{myForm.input.$error}}

+         myForm.$valid = {{myForm.$valid}}

+         myForm.$error.required = {{!!myForm.$error.required}}

+         

+         
+         
+         var value = element(by.binding('example.value | date: "HH:mm:ss"'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.value'));
+
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
         // set the value of the element and force validation.
         var scr = "var ipt = document.getElementById('exampleInput'); " +
         "ipt.value = '" + val + "';" +
@@ -22405,104 +22515,104 @@ var inputType = {
         browser.executeScript(scr);
       }
 
-      it('should initialize to model', function() {
+         it('should initialize to model', function() {
         expect(value.getText()).toContain('14:57:00');
         expect(valid.getText()).toContain('myForm.input.$valid = true');
       });
 
-      it('should be invalid if empty', function() {
+         it('should be invalid if empty', function() {
         setInput('');
         expect(value.getText()).toEqual('value =');
         expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
 
-      it('should be invalid if over max', function() {
+         it('should be invalid if over max', function() {
         setInput('23:59:00');
         expect(value.getText()).toContain('');
         expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
-   
-   
-   */
-  'time': createDateInputType('time', TIME_REGEXP,
-      createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss', 'sss']),
-     'HH:mm:ss.sss'),
-
-   /**
-    * @ngdoc input
-    * @name input[week]
-    *
-    * @description
-    * Input with week-of-the-year validation and transformation to Date. In browsers that do not yet support
-    * the HTML5 week input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
-    * week format (yyyy-W##), for example: `2013-W02`.
-    *
-    * The model must always be a Date object, otherwise Angular will throw an error.
-    * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-    *
-    * The timezone to be used to read/write the `Date` instance in the model can be defined using
-    * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-    *
-    * @param {string} ngModel Assignable angular expression to data-bind to.
-    * @param {string=} name Property name of the form under which the control is published.
-    * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-    *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
-    *   attribute (e.g. `min="{{minWeek | date:'yyyy-Www'}}"`). Note that `min` will also add
-    *   native HTML5 constraint validation.
-    * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-    *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
-    *   attribute (e.g. `max="{{maxWeek | date:'yyyy-Www'}}"`). Note that `max` will also add
-    *   native HTML5 constraint validation.
-    * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
-    *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-    * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
-    *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
-    * @param {string=} required Sets `required` validation error key if the value is not entered.
-    * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-    *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-    *    `required` when you want to data-bind to the `required` attribute.
-    * @param {string=} ngChange Angular expression to be executed when input changes due to user
-    *    interaction with the input element.
-    *
-    * @example
-    
-    
-      
-      

-        
-        

-          
-              Required!
-          
-              Not a valid date!
-        

-        value = {{example.value | date: "yyyy-Www"}}

-        myForm.input.$valid = {{myForm.input.$valid}}

-        myForm.input.$error = {{myForm.input.$error}}

-        myForm.$valid = {{myForm.$valid}}

-        myForm.$error.required = {{!!myForm.$error.required}}

-      

-    
-    
-      var value = element(by.binding('example.value | date: "yyyy-Www"'));
-      var valid = element(by.binding('myForm.input.$valid'));
-      var input = element(by.model('example.value'));
-
-      // currently protractor/webdriver does not support
-      // sending keys to all known HTML5 input controls
-      // for various browsers (https://github.com/angular/protractor/issues/562).
-      function setInput(val) {
+         
+         

+         
+         

+         
+         Required!
+         
+         Not a valid date!
+         

+         value = {{example.value | date: "yyyy-Www"}}

+         myForm.input.$valid = {{myForm.input.$valid}}

+         myForm.input.$error = {{myForm.input.$error}}

+         myForm.$valid = {{myForm.$valid}}

+         myForm.$error.required = {{!!myForm.$error.required}}

+         

+         
+         
+         var value = element(by.binding('example.value | date: "yyyy-Www"'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.value'));
+
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
         // set the value of the element and force validation.
         var scr = "var ipt = document.getElementById('exampleInput'); " +
         "ipt.value = '" + val + "';" +
@@ -22510,103 +22620,103 @@ var inputType = {
         browser.executeScript(scr);
       }
 
-      it('should initialize to model', function() {
+         it('should initialize to model', function() {
         expect(value.getText()).toContain('2013-W01');
         expect(valid.getText()).toContain('myForm.input.$valid = true');
       });
 
-      it('should be invalid if empty', function() {
+         it('should be invalid if empty', function() {
         setInput('');
         expect(value.getText()).toEqual('value =');
         expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
 
-      it('should be invalid if over max', function() {
+         it('should be invalid if over max', function() {
         setInput('2015-W01');
         expect(value.getText()).toContain('');
         expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
-    
-    
-    */
-  'week': createDateInputType('week', WEEK_REGEXP, weekParser, 'yyyy-Www'),
-
-  /**
-   * @ngdoc input
-   * @name input[month]
-   *
-   * @description
-   * Input with month validation and transformation. In browsers that do not yet support
-   * the HTML5 month input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
-   * month format (yyyy-MM), for example: `2009-01`.
-   *
-   * The model must always be a Date object, otherwise Angular will throw an error.
-   * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
-   * If the model is not set to the first of the month, the next view to model update will set it
-   * to the first of the month.
-   *
-   * The timezone to be used to read/write the `Date` instance in the model can be defined using
-   * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
-   *
-   * @param {string} ngModel Assignable angular expression to data-bind to.
-   * @param {string=} name Property name of the form under which the control is published.
-   * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-   *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
-   *   attribute (e.g. `min="{{minMonth | date:'yyyy-MM'}}"`). Note that `min` will also add
-   *   native HTML5 constraint validation.
-   * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-   *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
-   *   attribute (e.g. `max="{{maxMonth | date:'yyyy-MM'}}"`). Note that `max` will also add
-   *   native HTML5 constraint validation.
-   * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
-   *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
-   * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
-   *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
-
-   * @param {string=} required Sets `required` validation error key if the value is not entered.
-   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-   *    `required` when you want to data-bind to the `required` attribute.
-   * @param {string=} ngChange Angular expression to be executed when input changes due to user
-   *    interaction with the input element.
-   *
-   * @example
-   
-   
-     
-     

-       
-       
-       

+         
+         
+         
+         
+         

          
-            Required!
+         Required!
          
-            Not a valid month!
-       

-       value = {{example.value | date: "yyyy-MM"}}

-       myForm.input.$valid = {{myForm.input.$valid}}

-       myForm.input.$error = {{myForm.input.$error}}

-       myForm.$valid = {{myForm.$valid}}

-       myForm.$error.required = {{!!myForm.$error.required}}

-     
-   
-   
-      var value = element(by.binding('example.value | date: "yyyy-MM"'));
-      var valid = element(by.binding('myForm.input.$valid'));
-      var input = element(by.model('example.value'));
-
-      // currently protractor/webdriver does not support
-      // sending keys to all known HTML5 input controls
-      // for various browsers (https://github.com/angular/protractor/issues/562).
-      function setInput(val) {
+         Not a valid month!
+         

+         value = {{example.value | date: "yyyy-MM"}}

+         myForm.input.$valid = {{myForm.input.$valid}}

+         myForm.input.$error = {{myForm.input.$error}}

+         myForm.$valid = {{myForm.$valid}}

+         myForm.$error.required = {{!!myForm.$error.required}}

+         
+         
+         
+         var value = element(by.binding('example.value | date: "yyyy-MM"'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.value'));
+
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
         // set the value of the element and force validation.
         var scr = "var ipt = document.getElementById('exampleInput'); " +
         "ipt.value = '" + val + "';" +
@@ -22614,219 +22724,219 @@ var inputType = {
         browser.executeScript(scr);
       }
 
-      it('should initialize to model', function() {
+         it('should initialize to model', function() {
         expect(value.getText()).toContain('2013-10');
         expect(valid.getText()).toContain('myForm.input.$valid = true');
       });
 
-      it('should be invalid if empty', function() {
+         it('should be invalid if empty', function() {
         setInput('');
         expect(value.getText()).toEqual('value =');
         expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
 
-      it('should be invalid if over max', function() {
+         it('should be invalid if over max', function() {
         setInput('2015-01');
         expect(value.getText()).toContain('');
         expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
-   
-   
-   */
-  'month': createDateInputType('month', MONTH_REGEXP,
-     createDateParser(MONTH_REGEXP, ['yyyy', 'MM']),
-     'yyyy-MM'),
+         
+         
+         */
+        'month': createDateInputType('month', MONTH_REGEXP,
+            createDateParser(MONTH_REGEXP, ['yyyy', 'MM']),
+            'yyyy-MM'),
 
-  /**
-   * @ngdoc input
-   * @name input[number]
-   *
-   * @description
-   * Text input with number validation and transformation. Sets the `number` validation
-   * error if not a valid number.
-   *
-   * 

-   * The model must always be of type `number` otherwise Angular will throw an error.
-   * Be aware that a string containing a number is not enough. See the {@link ngModel:numfmt}
-   * error docs for more information and an example of how to convert your model if necessary.
-   * 

-   *
-   * ## Issues with HTML5 constraint validation
-   *
-   * In browsers that follow the
-   * [HTML5 specification](https://html.spec.whatwg.org/multipage/forms.html#number-state-%28type=number%29),
-   * `input[number]` does not work as expected with {@link ngModelOptions `ngModelOptions.allowInvalid`}.
-   * If a non-number is entered in the input, the browser will report the value as an empty string,
-   * which means the view / model values in `ngModel` and subsequently the scope value
-   * will also be an empty string.
-   *
-   *
-   * @param {string} ngModel Assignable angular expression to data-bind to.
-   * @param {string=} name Property name of the form under which the control is published.
-   * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-   * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-   * @param {string=} required Sets `required` validation error key if the value is not entered.
-   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-   *    `required` when you want to data-bind to the `required` attribute.
-   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-   *    minlength.
-   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
-   *    any length.
-   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
-   *    that contains the regular expression body that will be converted to a regular expression
-   *    as in the ngPattern directive.
-   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-   *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
-   *    If the expression evaluates to a RegExp object, then this is used directly.
-   *    If the expression evaluates to a string, then it will be converted to a RegExp
-   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-   *    `new RegExp('^abc$')`.

-   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-   *    start at the index of the last search's match, thus not taking the whole input value into
-   *    account.
-   * @param {string=} ngChange Angular expression to be executed when input changes due to user
-   *    interaction with the input element.
-   *
-   * @example
-      
-        
+        /**
+         * @ngdoc input
+         * @name input[number]
+         *
+         * @description
+         * Text input with number validation and transformation. Sets the `number` validation
+         * error if not a valid number.
+         *
+         * 

+         * The model must always be of type `number` otherwise Angular will throw an error.
+         * Be aware that a string containing a number is not enough. See the {@link ngModel:numfmt}
+         * error docs for more information and an example of how to convert your model if necessary.
+         * 

+         *
+         * ## Issues with HTML5 constraint validation
+         *
+         * In browsers that follow the
+         * [HTML5 specification](https://html.spec.whatwg.org/multipage/forms.html#number-state-%28type=number%29),
+         * `input[number]` does not work as expected with {@link ngModelOptions `ngModelOptions.allowInvalid`}.
+         * If a non-number is entered in the input, the browser will report the value as an empty string,
+         * which means the view / model values in `ngModel` and subsequently the scope value
+         * will also be an empty string.
+         *
+         *
+         * @param {string} ngModel Assignable angular expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.

+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange Angular expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         
+         
          
          

-           
-           

-             
-               Required!
-             
-               Not valid number!
-           

-           value = {{example.value}}

-           myForm.input.$valid = {{myForm.input.$valid}}

-           myForm.input.$error = {{myForm.input.$error}}

-           myForm.$valid = {{myForm.$valid}}

-           myForm.$error.required = {{!!myForm.$error.required}}

-          

-        
-        
-          var value = element(by.binding('example.value'));
-          var valid = element(by.binding('myForm.input.$valid'));
-          var input = element(by.model('example.value'));
+         
+         

+         
+         Required!
+         
+         Not valid number!
+         

+         value = {{example.value}}

+         myForm.input.$valid = {{myForm.input.$valid}}

+         myForm.input.$error = {{myForm.input.$error}}

+         myForm.$valid = {{myForm.$valid}}

+         myForm.$error.required = {{!!myForm.$error.required}}

+         
+         
+         
+         var value = element(by.binding('example.value'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.value'));
 
-          it('should initialize to model', function() {
+         it('should initialize to model', function() {
             expect(value.getText()).toContain('12');
             expect(valid.getText()).toContain('true');
           });
 
-          it('should be invalid if empty', function() {
+         it('should be invalid if empty', function() {
             input.clear();
             input.sendKeys('');
             expect(value.getText()).toEqual('value =');
             expect(valid.getText()).toContain('false');
           });
 
-          it('should be invalid if over max', function() {
+         it('should be invalid if over max', function() {
             input.clear();
             input.sendKeys('123');
             expect(value.getText()).toEqual('value =');
             expect(valid.getText()).toContain('false');
           });
-        
-      
-   */
-  'number': numberInputType,
+         
+         
+         */
+        'number': numberInputType,
 
 
-  /**
-   * @ngdoc input
-   * @name input[url]
-   *
-   * @description
-   * Text input with URL validation. Sets the `url` validation error key if the content is not a
-   * valid URL.
-   *
-   * 

-   * **Note:** `input[url]` uses a regex to validate urls that is derived from the regex
-   * used in Chromium. If you need stricter validation, you can use `ng-pattern` or modify
-   * the built-in validators (see the {@link guide/forms Forms guide})
-   * 

-   *
-   * @param {string} ngModel Assignable angular expression to data-bind to.
-   * @param {string=} name Property name of the form under which the control is published.
-   * @param {string=} required Sets `required` validation error key if the value is not entered.
-   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-   *    `required` when you want to data-bind to the `required` attribute.
-   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-   *    minlength.
-   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
-   *    any length.
-   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
-   *    that contains the regular expression body that will be converted to a regular expression
-   *    as in the ngPattern directive.
-   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-   *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
-   *    If the expression evaluates to a RegExp object, then this is used directly.
-   *    If the expression evaluates to a string, then it will be converted to a RegExp
-   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-   *    `new RegExp('^abc$')`.

-   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-   *    start at the index of the last search's match, thus not taking the whole input value into
-   *    account.
-   * @param {string=} ngChange Angular expression to be executed when input changes due to user
-   *    interaction with the input element.
-   *
-   * @example
-      
-        
+        /**
+         * @ngdoc input
+         * @name input[url]
+         *
+         * @description
+         * Text input with URL validation. Sets the `url` validation error key if the content is not a
+         * valid URL.
+         *
+         * 

+         * **Note:** `input[url]` uses a regex to validate urls that is derived from the regex
+         * used in Chromium. If you need stricter validation, you can use `ng-pattern` or modify
+         * the built-in validators (see the {@link guide/forms Forms guide})
+         * 

+         *
+         * @param {string} ngModel Assignable angular expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.

+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange Angular expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         
+         
          
          

-           

-        
-          var text = element(by.binding('url.text'));
-          var valid = element(by.binding('myForm.input.$valid'));
-          var input = element(by.model('url.text'));
+         
+         
+         var text = element(by.binding('url.text'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('url.text'));
 
-          it('should initialize to model', function() {
+         it('should initialize to model', function() {
             expect(text.getText()).toContain('http://google.com');
             expect(valid.getText()).toContain('true');
           });
 
-          it('should be invalid if empty', function() {
+         it('should be invalid if empty', function() {
             input.clear();
             input.sendKeys('');
 
@@ -22834,140 +22944,140 @@ var inputType = {
             expect(valid.getText()).toContain('false');
           });
 
-          it('should be invalid if not url', function() {
+         it('should be invalid if not url', function() {
             input.clear();
             input.sendKeys('box');
 
             expect(valid.getText()).toContain('false');
           });
-        
-      
-   */
-  'url': urlInputType,
+         
+         
+         */
+        'url': urlInputType,
 
 
-  /**
-   * @ngdoc input
-   * @name input[email]
-   *
-   * @description
-   * Text input with email validation. Sets the `email` validation error key if not a valid email
-   * address.
-   *
-   * 

-   * **Note:** `input[email]` uses a regex to validate email addresses that is derived from the regex
-   * used in Chromium. If you need stricter validation (e.g. requiring a top-level domain), you can
-   * use `ng-pattern` or modify the built-in validators (see the {@link guide/forms Forms guide})
-   * 

-   *
-   * @param {string} ngModel Assignable angular expression to data-bind to.
-   * @param {string=} name Property name of the form under which the control is published.
-   * @param {string=} required Sets `required` validation error key if the value is not entered.
-   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-   *    `required` when you want to data-bind to the `required` attribute.
-   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-   *    minlength.
-   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
-   *    any length.
-   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
-   *    that contains the regular expression body that will be converted to a regular expression
-   *    as in the ngPattern directive.
-   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
-   *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
-   *    If the expression evaluates to a RegExp object, then this is used directly.
-   *    If the expression evaluates to a string, then it will be converted to a RegExp
-   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
-   *    `new RegExp('^abc$')`.

-   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
-   *    start at the index of the last search's match, thus not taking the whole input value into
-   *    account.
-   * @param {string=} ngChange Angular expression to be executed when input changes due to user
-   *    interaction with the input element.
-   *
-   * @example
-      
-        
+        /**
+         * @ngdoc input
+         * @name input[email]
+         *
+         * @description
+         * Text input with email validation. Sets the `email` validation error key if not a valid email
+         * address.
+         *
+         * 

+         * **Note:** `input[email]` uses a regex to validate email addresses that is derived from the regex
+         * used in Chromium. If you need stricter validation (e.g. requiring a top-level domain), you can
+         * use `ng-pattern` or modify the built-in validators (see the {@link guide/forms Forms guide})
+         * 

+         *
+         * @param {string} ngModel Assignable angular expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.

+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange Angular expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         
+         
          
-           

-             
-             

-               
-                 Required!
-               
-                 Not valid email!
-             

-             text = {{email.text}}

-             myForm.input.$valid = {{myForm.input.$valid}}

-             myForm.input.$error = {{myForm.input.$error}}

-             myForm.$valid = {{myForm.$valid}}

-             myForm.$error.required = {{!!myForm.$error.required}}

-             myForm.$error.email = {{!!myForm.$error.email}}

-           

+         

+         
+         

+         
+         Required!
+         
+         Not valid email!
+         

+         text = {{email.text}}

+         myForm.input.$valid = {{myForm.input.$valid}}

+         myForm.input.$error = {{myForm.input.$error}}

+         myForm.$valid = {{myForm.$valid}}

+         myForm.$error.required = {{!!myForm.$error.required}}

+         myForm.$error.email = {{!!myForm.$error.email}}

+         

          
-        
-          var text = element(by.binding('email.text'));
-          var valid = element(by.binding('myForm.input.$valid'));
-          var input = element(by.model('email.text'));
+         
+         var text = element(by.binding('email.text'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('email.text'));
 
-          it('should initialize to model', function() {
+         it('should initialize to model', function() {
             expect(text.getText()).toContain('me@example.com');
             expect(valid.getText()).toContain('true');
           });
 
-          it('should be invalid if empty', function() {
+         it('should be invalid if empty', function() {
             input.clear();
             input.sendKeys('');
             expect(text.getText()).toEqual('text =');
             expect(valid.getText()).toContain('false');
           });
 
-          it('should be invalid if not email', function() {
+         it('should be invalid if not email', function() {
             input.clear();
             input.sendKeys('xxx');
 
             expect(valid.getText()).toContain('false');
           });
-        
-      
-   */
-  'email': emailInputType,
+         
+         
+         */
+        'email': emailInputType,
 
 
-  /**
-   * @ngdoc input
-   * @name input[radio]
-   *
-   * @description
-   * HTML radio button.
-   *
-   * @param {string} ngModel Assignable angular expression to data-bind to.
-   * @param {string} value The value to which the `ngModel` expression should be set when selected.
-   *    Note that `value` only supports `string` values, i.e. the scope model needs to be a string,
-   *    too. Use `ngValue` if you need complex models (`number`, `object`, ...).
-   * @param {string=} name Property name of the form under which the control is published.
-   * @param {string=} ngChange Angular expression to be executed when input changes due to user
-   *    interaction with the input element.
-   * @param {string} ngValue Angular expression to which `ngModel` will be be set when the radio
-   *    is selected. Should be used instead of the `value` attribute if you need
-   *    a non-string `ngModel` (`boolean`, `array`, ...).
-   *
-   * @example
-      
-        
+        /**
+         * @ngdoc input
+         * @name input[radio]
+         *
+         * @description
+         * HTML radio button.
+         *
+         * @param {string} ngModel Assignable angular expression to data-bind to.
+         * @param {string} value The value to which the `ngModel` expression should be set when selected.
+         *    Note that `value` only supports `string` values, i.e. the scope model needs to be a string,
+         *    too. Use `ngValue` if you need complex models (`number`, `object`, ...).
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} ngChange Angular expression to be executed when input changes due to user
+         *    interaction with the input element.
+         * @param {string} ngValue Angular expression to which `ngModel` will be be set when the radio
+         *    is selected. Should be used instead of the `value` attribute if you need
+         *    a non-string `ngModel` (`boolean`, `array`, ...).
+         *
+         * @example
+         
+         
          
          

-           

-           

-           

-           color = {{color.name | json}}

-          

-          Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
-        
-        
-          it('should change state', function() {
+         

+         

+         

+         color = {{color.name | json}}

+         
+         Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
+         
+         
+         it('should change state', function() {
             var color = element(by.binding('color.name'));
 
             expect(color.getText()).toContain('blue');
@@ -23004,32 +23114,32 @@ var inputType = {
 
             expect(color.getText()).toContain('red');
           });
-        
-      
-   */
-  'radio': radioInputType,
+         
+         
+         */
+        'radio': radioInputType,
 
 
-  /**
-   * @ngdoc input
-   * @name input[checkbox]
-   *
-   * @description
-   * HTML checkbox.
-   *
-   * @param {string} ngModel Assignable angular expression to data-bind to.
-   * @param {string=} name Property name of the form under which the control is published.
-   * @param {expression=} ngTrueValue The value to which the expression should be set when selected.
-   * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
-   * @param {string=} ngChange Angular expression to be executed when input changes due to user
-   *    interaction with the input element.
-   *
-   * @example
-      
-        
+        /**
+         * @ngdoc input
+         * @name input[checkbox]
+         *
+         * @description
+         * HTML checkbox.
+         *
+         * @param {string} ngModel Assignable angular expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {expression=} ngTrueValue The value to which the expression should be set when selected.
+         * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
+         * @param {string=} ngChange Angular expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         
+         
          
          

-           

-           

-           value1 = {{checkboxModel.value1}}

-           value2 = {{checkboxModel.value2}}

-          

-        
-        
-          it('should change state', function() {
+         

+         

+         value1 = {{checkboxModel.value1}}

+         value2 = {{checkboxModel.value2}}

+         
+         
+         
+         it('should change state', function() {
             var value1 = element(by.binding('checkboxModel.value1'));
             var value2 = element(by.binding('checkboxModel.value2'));
 
@@ -23062,584 +23172,584 @@ var inputType = {
             expect(value1.getText()).toContain('false');
             expect(value2.getText()).toContain('NO');
           });
-        
-      
-   */
-  'checkbox': checkboxInputType,
-
-  'hidden': noop,
-  'button': noop,
-  'submit': noop,
-  'reset': noop,
-  'file': noop
-};
-
-function stringBasedInputType(ctrl) {
-  ctrl.$formatters.push(function(value) {
-    return ctrl.$isEmpty(value) ? value : value.toString();
-  });
-}
+         
+         
+         */
+        'checkbox': checkboxInputType,
 
-function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-  stringBasedInputType(ctrl);
-}
+        'hidden': noop,
+        'button': noop,
+        'submit': noop,
+        'reset': noop,
+        'file': noop
+    };
 
-function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-  var type = lowercase(element[0].type);
+    function stringBasedInputType(ctrl) {
+        ctrl.$formatters.push(function (value) {
+            return ctrl.$isEmpty(value) ? value : value.toString();
+        });
+    }
 
-  // In composition mode, users are still inputing intermediate text buffer,
-  // hold the listener until composition is done.
-  // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
-  if (!$sniffer.android) {
-    var composing = false;
+    function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+        stringBasedInputType(ctrl);
+    }
 
-    element.on('compositionstart', function() {
-      composing = true;
-    });
+    function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        var type = lowercase(element[0].type);
 
-    element.on('compositionend', function() {
-      composing = false;
-      listener();
-    });
-  }
+        // In composition mode, users are still inputing intermediate text buffer,
+        // hold the listener until composition is done.
+        // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
+        if (!$sniffer.android) {
+            var composing = false;
 
-  var timeout;
+            element.on('compositionstart', function () {
+                composing = true;
+            });
 
-  var listener = function(ev) {
-    if (timeout) {
-      $browser.defer.cancel(timeout);
-      timeout = null;
-    }
-    if (composing) return;
-    var value = element.val(),
-        event = ev && ev.type;
-
-    // By default we will trim the value
-    // If the attribute ng-trim exists we will avoid trimming
-    // If input type is 'password', the value is never trimmed
-    if (type !== 'password' && (!attr.ngTrim || attr.ngTrim !== 'false')) {
-      value = trim(value);
-    }
+            element.on('compositionend', function () {
+                composing = false;
+                listener();
+            });
+        }
 
-    // If a control is suffering from bad input (due to native validators), browsers discard its
-    // value, so it may be necessary to revalidate (by calling $setViewValue again) even if the
-    // control's value is the same empty value twice in a row.
-    if (ctrl.$viewValue !== value || (value === '' && ctrl.$$hasNativeValidators)) {
-      ctrl.$setViewValue(value, event);
-    }
-  };
-
-  // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
-  // input event on backspace, delete or cut
-  if ($sniffer.hasEvent('input')) {
-    element.on('input', listener);
-  } else {
-    var deferListener = function(ev, input, origValue) {
-      if (!timeout) {
-        timeout = $browser.defer(function() {
-          timeout = null;
-          if (!input || input.value !== origValue) {
-            listener(ev);
-          }
-        });
-      }
-    };
+        var timeout;
+
+        var listener = function (ev) {
+            if (timeout) {
+                $browser.defer.cancel(timeout);
+                timeout = null;
+            }
+            if (composing) return;
+            var value = element.val(),
+                event = ev && ev.type;
+
+            // By default we will trim the value
+            // If the attribute ng-trim exists we will avoid trimming
+            // If input type is 'password', the value is never trimmed
+            if (type !== 'password' && (!attr.ngTrim || attr.ngTrim !== 'false')) {
+                value = trim(value);
+            }
+
+            // If a control is suffering from bad input (due to native validators), browsers discard its
+            // value, so it may be necessary to revalidate (by calling $setViewValue again) even if the
+            // control's value is the same empty value twice in a row.
+            if (ctrl.$viewValue !== value || (value === '' && ctrl.$$hasNativeValidators)) {
+                ctrl.$setViewValue(value, event);
+            }
+        };
 
-    element.on('keydown', function(event) {
-      var key = event.keyCode;
+        // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
+        // input event on backspace, delete or cut
+        if ($sniffer.hasEvent('input')) {
+            element.on('input', listener);
+        } else {
+            var deferListener = function (ev, input, origValue) {
+                if (!timeout) {
+                    timeout = $browser.defer(function () {
+                        timeout = null;
+                        if (!input || input.value !== origValue) {
+                            listener(ev);
+                        }
+                    });
+                }
+            };
 
-      // ignore
-      //    command            modifiers                   arrows
-      if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
+            element.on('keydown', function (event) {
+                var key = event.keyCode;
 
-      deferListener(event, this, this.value);
-    });
+                // ignore
+                //    command            modifiers                   arrows
+                if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
 
-    // if user modifies input value using context menu in IE, we need "paste" and "cut" events to catch it
-    if ($sniffer.hasEvent('paste')) {
-      element.on('paste cut', deferListener);
+                deferListener(event, this, this.value);
+            });
+
+            // if user modifies input value using context menu in IE, we need "paste" and "cut" events to catch it
+            if ($sniffer.hasEvent('paste')) {
+                element.on('paste cut', deferListener);
+            }
+        }
+
+        // if user paste into input using mouse on older browser
+        // or form autocomplete on newer browser, we need "change" event to catch it
+        element.on('change', listener);
+
+        // Some native input types (date-family) have the ability to change validity without
+        // firing any input/change events.
+        // For these event types, when native validators are present and the browser supports the type,
+        // check for validity changes on various DOM events.
+        if (PARTIAL_VALIDATION_TYPES[type] && ctrl.$$hasNativeValidators && type === attr.type) {
+            element.on(PARTIAL_VALIDATION_EVENTS, function (ev) {
+                if (!timeout) {
+                    var validity = this[VALIDITY_STATE_PROPERTY];
+                    var origBadInput = validity.badInput;
+                    var origTypeMismatch = validity.typeMismatch;
+                    timeout = $browser.defer(function () {
+                        timeout = null;
+                        if (validity.badInput !== origBadInput || validity.typeMismatch !== origTypeMismatch) {
+                            listener(ev);
+                        }
+                    });
+                }
+            });
+        }
+
+        ctrl.$render = function () {
+            // Workaround for Firefox validation #12102.
+            var value = ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue;
+            if (element.val() !== value) {
+                element.val(value);
+            }
+        };
     }
-  }
-
-  // if user paste into input using mouse on older browser
-  // or form autocomplete on newer browser, we need "change" event to catch it
-  element.on('change', listener);
-
-  // Some native input types (date-family) have the ability to change validity without
-  // firing any input/change events.
-  // For these event types, when native validators are present and the browser supports the type,
-  // check for validity changes on various DOM events.
-  if (PARTIAL_VALIDATION_TYPES[type] && ctrl.$$hasNativeValidators && type === attr.type) {
-    element.on(PARTIAL_VALIDATION_EVENTS, function(ev) {
-      if (!timeout) {
-        var validity = this[VALIDITY_STATE_PROPERTY];
-        var origBadInput = validity.badInput;
-        var origTypeMismatch = validity.typeMismatch;
-        timeout = $browser.defer(function() {
-          timeout = null;
-          if (validity.badInput !== origBadInput || validity.typeMismatch !== origTypeMismatch) {
-            listener(ev);
-          }
-        });
-      }
-    });
-  }
 
-  ctrl.$render = function() {
-    // Workaround for Firefox validation #12102.
-    var value = ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue;
-    if (element.val() !== value) {
-      element.val(value);
+    function weekParser(isoWeek, existingDate) {
+        if (isDate(isoWeek)) {
+            return isoWeek;
+        }
+
+        if (isString(isoWeek)) {
+            WEEK_REGEXP.lastIndex = 0;
+            var parts = WEEK_REGEXP.exec(isoWeek);
+            if (parts) {
+                var year = +parts[1],
+                    week = +parts[2],
+                    hours = 0,
+                    minutes = 0,
+                    seconds = 0,
+                    milliseconds = 0,
+                    firstThurs = getFirstThursdayOfYear(year),
+                    addDays = (week - 1) * 7;
+
+                if (existingDate) {
+                    hours = existingDate.getHours();
+                    minutes = existingDate.getMinutes();
+                    seconds = existingDate.getSeconds();
+                    milliseconds = existingDate.getMilliseconds();
+                }
+
+                return new Date(year, 0, firstThurs.getDate() + addDays, hours, minutes, seconds, milliseconds);
+            }
+        }
+
+        return NaN;
     }
-  };
-}
-
-function weekParser(isoWeek, existingDate) {
-  if (isDate(isoWeek)) {
-    return isoWeek;
-  }
-
-  if (isString(isoWeek)) {
-    WEEK_REGEXP.lastIndex = 0;
-    var parts = WEEK_REGEXP.exec(isoWeek);
-    if (parts) {
-      var year = +parts[1],
-          week = +parts[2],
-          hours = 0,
-          minutes = 0,
-          seconds = 0,
-          milliseconds = 0,
-          firstThurs = getFirstThursdayOfYear(year),
-          addDays = (week - 1) * 7;
-
-      if (existingDate) {
-        hours = existingDate.getHours();
-        minutes = existingDate.getMinutes();
-        seconds = existingDate.getSeconds();
-        milliseconds = existingDate.getMilliseconds();
-      }
 
-      return new Date(year, 0, firstThurs.getDate() + addDays, hours, minutes, seconds, milliseconds);
+    function createDateParser(regexp, mapping) {
+        return function (iso, date) {
+            var parts, map;
+
+            if (isDate(iso)) {
+                return iso;
+            }
+
+            if (isString(iso)) {
+                // When a date is JSON'ified to wraps itself inside of an extra
+                // set of double quotes. This makes the date parsing code unable
+                // to match the date string and parse it as a date.
+                if (iso.charAt(0) == '"' && iso.charAt(iso.length - 1) == '"') {
+                    iso = iso.substring(1, iso.length - 1);
+                }
+                if (ISO_DATE_REGEXP.test(iso)) {
+                    return new Date(iso);
+                }
+                regexp.lastIndex = 0;
+                parts = regexp.exec(iso);
+
+                if (parts) {
+                    parts.shift();
+                    if (date) {
+                        map = {
+                            yyyy: date.getFullYear(),
+                            MM: date.getMonth() + 1,
+                            dd: date.getDate(),
+                            HH: date.getHours(),
+                            mm: date.getMinutes(),
+                            ss: date.getSeconds(),
+                            sss: date.getMilliseconds() / 1000
+                        };
+                    } else {
+                        map = {yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0};
+                    }
+
+                    forEach(parts, function (part, index) {
+                        if (index < mapping.length) {
+                            map[mapping[index]] = +part;
+                        }
+                    });
+                    return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0);
+                }
+            }
+
+            return NaN;
+        };
     }
-  }
 
-  return NaN;
-}
+    function createDateInputType(type, regexp, parseDate, format) {
+        return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) {
+            badInputChecker(scope, element, attr, ctrl);
+            baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+            var timezone = ctrl && ctrl.$options && ctrl.$options.timezone;
+            var previousDate;
+
+            ctrl.$$parserName = type;
+            ctrl.$parsers.push(function (value) {
+                if (ctrl.$isEmpty(value)) return null;
+                if (regexp.test(value)) {
+                    // Note: We cannot read ctrl.$modelValue, as there might be a different
+                    // parser/formatter in the processing chain so that the model
+                    // contains some different data format!
+                    var parsedDate = parseDate(value, previousDate);
+                    if (timezone) {
+                        parsedDate = convertTimezoneToLocal(parsedDate, timezone);
+                    }
+                    return parsedDate;
+                }
+                return undefined;
+            });
+
+            ctrl.$formatters.push(function (value) {
+                if (value && !isDate(value)) {
+                    throw ngModelMinErr('datefmt', 'Expected `{0}` to be a date', value);
+                }
+                if (isValidDate(value)) {
+                    previousDate = value;
+                    if (previousDate && timezone) {
+                        previousDate = convertTimezoneToLocal(previousDate, timezone, true);
+                    }
+                    return $filter('date')(value, format, timezone);
+                } else {
+                    previousDate = null;
+                    return '';
+                }
+            });
+
+            if (isDefined(attr.min) || attr.ngMin) {
+                var minVal;
+                ctrl.$validators.min = function (value) {
+                    return !isValidDate(value) || isUndefined(minVal) || parseDate(value) >= minVal;
+                };
+                attr.$observe('min', function (val) {
+                    minVal = parseObservedDateValue(val);
+                    ctrl.$validate();
+                });
+            }
+
+            if (isDefined(attr.max) || attr.ngMax) {
+                var maxVal;
+                ctrl.$validators.max = function (value) {
+                    return !isValidDate(value) || isUndefined(maxVal) || parseDate(value) <= maxVal;
+                };
+                attr.$observe('max', function (val) {
+                    maxVal = parseObservedDateValue(val);
+                    ctrl.$validate();
+                });
+            }
 
-function createDateParser(regexp, mapping) {
-  return function(iso, date) {
-    var parts, map;
+            function isValidDate(value) {
+                // Invalid Date: getTime() returns NaN
+                return value && !(value.getTime && value.getTime() !== value.getTime());
+            }
 
-    if (isDate(iso)) {
-      return iso;
+            function parseObservedDateValue(val) {
+                return isDefined(val) && !isDate(val) ? parseDate(val) || undefined : val;
+            }
+        };
     }
 
-    if (isString(iso)) {
-      // When a date is JSON'ified to wraps itself inside of an extra
-      // set of double quotes. This makes the date parsing code unable
-      // to match the date string and parse it as a date.
-      if (iso.charAt(0) == '"' && iso.charAt(iso.length - 1) == '"') {
-        iso = iso.substring(1, iso.length - 1);
-      }
-      if (ISO_DATE_REGEXP.test(iso)) {
-        return new Date(iso);
-      }
-      regexp.lastIndex = 0;
-      parts = regexp.exec(iso);
-
-      if (parts) {
-        parts.shift();
-        if (date) {
-          map = {
-            yyyy: date.getFullYear(),
-            MM: date.getMonth() + 1,
-            dd: date.getDate(),
-            HH: date.getHours(),
-            mm: date.getMinutes(),
-            ss: date.getSeconds(),
-            sss: date.getMilliseconds() / 1000
-          };
-        } else {
-          map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 };
+    function badInputChecker(scope, element, attr, ctrl) {
+        var node = element[0];
+        var nativeValidation = ctrl.$$hasNativeValidators = isObject(node.validity);
+        if (nativeValidation) {
+            ctrl.$parsers.push(function (value) {
+                var validity = element.prop(VALIDITY_STATE_PROPERTY) || {};
+                return validity.badInput || validity.typeMismatch ? undefined : value;
+            });
         }
+    }
 
-        forEach(parts, function(part, index) {
-          if (index < mapping.length) {
-            map[mapping[index]] = +part;
-          }
+    function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        badInputChecker(scope, element, attr, ctrl);
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+
+        ctrl.$$parserName = 'number';
+        ctrl.$parsers.push(function (value) {
+            if (ctrl.$isEmpty(value)) return null;
+            if (NUMBER_REGEXP.test(value)) return parseFloat(value);
+            return undefined;
         });
-        return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0);
-      }
-    }
 
-    return NaN;
-  };
-}
-
-function createDateInputType(type, regexp, parseDate, format) {
-  return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) {
-    badInputChecker(scope, element, attr, ctrl);
-    baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-    var timezone = ctrl && ctrl.$options && ctrl.$options.timezone;
-    var previousDate;
-
-    ctrl.$$parserName = type;
-    ctrl.$parsers.push(function(value) {
-      if (ctrl.$isEmpty(value)) return null;
-      if (regexp.test(value)) {
-        // Note: We cannot read ctrl.$modelValue, as there might be a different
-        // parser/formatter in the processing chain so that the model
-        // contains some different data format!
-        var parsedDate = parseDate(value, previousDate);
-        if (timezone) {
-          parsedDate = convertTimezoneToLocal(parsedDate, timezone);
-        }
-        return parsedDate;
-      }
-      return undefined;
-    });
+        ctrl.$formatters.push(function (value) {
+            if (!ctrl.$isEmpty(value)) {
+                if (!isNumber(value)) {
+                    throw ngModelMinErr('numfmt', 'Expected `{0}` to be a number', value);
+                }
+                value = value.toString();
+            }
+            return value;
+        });
 
-    ctrl.$formatters.push(function(value) {
-      if (value && !isDate(value)) {
-        throw ngModelMinErr('datefmt', 'Expected `{0}` to be a date', value);
-      }
-      if (isValidDate(value)) {
-        previousDate = value;
-        if (previousDate && timezone) {
-          previousDate = convertTimezoneToLocal(previousDate, timezone, true);
+        if (isDefined(attr.min) || attr.ngMin) {
+            var minVal;
+            ctrl.$validators.min = function (value) {
+                return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal;
+            };
+
+            attr.$observe('min', function (val) {
+                if (isDefined(val) && !isNumber(val)) {
+                    val = parseFloat(val, 10);
+                }
+                minVal = isNumber(val) && !isNaN(val) ? val : undefined;
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            });
         }
-        return $filter('date')(value, format, timezone);
-      } else {
-        previousDate = null;
-        return '';
-      }
-    });
 
-    if (isDefined(attr.min) || attr.ngMin) {
-      var minVal;
-      ctrl.$validators.min = function(value) {
-        return !isValidDate(value) || isUndefined(minVal) || parseDate(value) >= minVal;
-      };
-      attr.$observe('min', function(val) {
-        minVal = parseObservedDateValue(val);
-        ctrl.$validate();
-      });
-    }
+        if (isDefined(attr.max) || attr.ngMax) {
+            var maxVal;
+            ctrl.$validators.max = function (value) {
+                return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal;
+            };
 
-    if (isDefined(attr.max) || attr.ngMax) {
-      var maxVal;
-      ctrl.$validators.max = function(value) {
-        return !isValidDate(value) || isUndefined(maxVal) || parseDate(value) <= maxVal;
-      };
-      attr.$observe('max', function(val) {
-        maxVal = parseObservedDateValue(val);
-        ctrl.$validate();
-      });
+            attr.$observe('max', function (val) {
+                if (isDefined(val) && !isNumber(val)) {
+                    val = parseFloat(val, 10);
+                }
+                maxVal = isNumber(val) && !isNaN(val) ? val : undefined;
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            });
+        }
     }
 
-    function isValidDate(value) {
-      // Invalid Date: getTime() returns NaN
-      return value && !(value.getTime && value.getTime() !== value.getTime());
-    }
+    function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        // Note: no badInputChecker here by purpose as `url` is only a validation
+        // in browsers, i.e. we can always read out input.value even if it is not valid!
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+        stringBasedInputType(ctrl);
 
-    function parseObservedDateValue(val) {
-      return isDefined(val) && !isDate(val) ? parseDate(val) || undefined : val;
+        ctrl.$$parserName = 'url';
+        ctrl.$validators.url = function (modelValue, viewValue) {
+            var value = modelValue || viewValue;
+            return ctrl.$isEmpty(value) || URL_REGEXP.test(value);
+        };
     }
-  };
-}
-
-function badInputChecker(scope, element, attr, ctrl) {
-  var node = element[0];
-  var nativeValidation = ctrl.$$hasNativeValidators = isObject(node.validity);
-  if (nativeValidation) {
-    ctrl.$parsers.push(function(value) {
-      var validity = element.prop(VALIDITY_STATE_PROPERTY) || {};
-      return validity.badInput || validity.typeMismatch ? undefined : value;
-    });
-  }
-}
-
-function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-  badInputChecker(scope, element, attr, ctrl);
-  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-
-  ctrl.$$parserName = 'number';
-  ctrl.$parsers.push(function(value) {
-    if (ctrl.$isEmpty(value))      return null;
-    if (NUMBER_REGEXP.test(value)) return parseFloat(value);
-    return undefined;
-  });
 
-  ctrl.$formatters.push(function(value) {
-    if (!ctrl.$isEmpty(value)) {
-      if (!isNumber(value)) {
-        throw ngModelMinErr('numfmt', 'Expected `{0}` to be a number', value);
-      }
-      value = value.toString();
+    function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        // Note: no badInputChecker here by purpose as `url` is only a validation
+        // in browsers, i.e. we can always read out input.value even if it is not valid!
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+        stringBasedInputType(ctrl);
+
+        ctrl.$$parserName = 'email';
+        ctrl.$validators.email = function (modelValue, viewValue) {
+            var value = modelValue || viewValue;
+            return ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value);
+        };
     }
-    return value;
-  });
 
-  if (isDefined(attr.min) || attr.ngMin) {
-    var minVal;
-    ctrl.$validators.min = function(value) {
-      return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal;
-    };
+    function radioInputType(scope, element, attr, ctrl) {
+        // make the name unique, if not defined
+        if (isUndefined(attr.name)) {
+            element.attr('name', nextUid());
+        }
 
-    attr.$observe('min', function(val) {
-      if (isDefined(val) && !isNumber(val)) {
-        val = parseFloat(val, 10);
-      }
-      minVal = isNumber(val) && !isNaN(val) ? val : undefined;
-      // TODO(matsko): implement validateLater to reduce number of validations
-      ctrl.$validate();
-    });
-  }
+        var listener = function (ev) {
+            if (element[0].checked) {
+                ctrl.$setViewValue(attr.value, ev && ev.type);
+            }
+        };
 
-  if (isDefined(attr.max) || attr.ngMax) {
-    var maxVal;
-    ctrl.$validators.max = function(value) {
-      return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal;
-    };
+        element.on('click', listener);
 
-    attr.$observe('max', function(val) {
-      if (isDefined(val) && !isNumber(val)) {
-        val = parseFloat(val, 10);
-      }
-      maxVal = isNumber(val) && !isNaN(val) ? val : undefined;
-      // TODO(matsko): implement validateLater to reduce number of validations
-      ctrl.$validate();
-    });
-  }
-}
-
-function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-  // Note: no badInputChecker here by purpose as `url` is only a validation
-  // in browsers, i.e. we can always read out input.value even if it is not valid!
-  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-  stringBasedInputType(ctrl);
-
-  ctrl.$$parserName = 'url';
-  ctrl.$validators.url = function(modelValue, viewValue) {
-    var value = modelValue || viewValue;
-    return ctrl.$isEmpty(value) || URL_REGEXP.test(value);
-  };
-}
-
-function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-  // Note: no badInputChecker here by purpose as `url` is only a validation
-  // in browsers, i.e. we can always read out input.value even if it is not valid!
-  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-  stringBasedInputType(ctrl);
-
-  ctrl.$$parserName = 'email';
-  ctrl.$validators.email = function(modelValue, viewValue) {
-    var value = modelValue || viewValue;
-    return ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value);
-  };
-}
-
-function radioInputType(scope, element, attr, ctrl) {
-  // make the name unique, if not defined
-  if (isUndefined(attr.name)) {
-    element.attr('name', nextUid());
-  }
-
-  var listener = function(ev) {
-    if (element[0].checked) {
-      ctrl.$setViewValue(attr.value, ev && ev.type);
+        ctrl.$render = function () {
+            var value = attr.value;
+            element[0].checked = (value == ctrl.$viewValue);
+        };
+
+        attr.$observe('value', ctrl.$render);
     }
-  };
 
-  element.on('click', listener);
+    function parseConstantExpr($parse, context, name, expression, fallback) {
+        var parseFn;
+        if (isDefined(expression)) {
+            parseFn = $parse(expression);
+            if (!parseFn.constant) {
+                throw ngModelMinErr('constexpr', 'Expected constant expression for `{0}`, but saw ' +
+                    '`{1}`.', name, expression);
+            }
+            return parseFn(context);
+        }
+        return fallback;
+    }
 
-  ctrl.$render = function() {
-    var value = attr.value;
-    element[0].checked = (value == ctrl.$viewValue);
-  };
+    function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter, $parse) {
+        var trueValue = parseConstantExpr($parse, scope, 'ngTrueValue', attr.ngTrueValue, true);
+        var falseValue = parseConstantExpr($parse, scope, 'ngFalseValue', attr.ngFalseValue, false);
 
-  attr.$observe('value', ctrl.$render);
-}
+        var listener = function (ev) {
+            ctrl.$setViewValue(element[0].checked, ev && ev.type);
+        };
 
-function parseConstantExpr($parse, context, name, expression, fallback) {
-  var parseFn;
-  if (isDefined(expression)) {
-    parseFn = $parse(expression);
-    if (!parseFn.constant) {
-      throw ngModelMinErr('constexpr', 'Expected constant expression for `{0}`, but saw ' +
-                                   '`{1}`.', name, expression);
-    }
-    return parseFn(context);
-  }
-  return fallback;
-}
-
-function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter, $parse) {
-  var trueValue = parseConstantExpr($parse, scope, 'ngTrueValue', attr.ngTrueValue, true);
-  var falseValue = parseConstantExpr($parse, scope, 'ngFalseValue', attr.ngFalseValue, false);
-
-  var listener = function(ev) {
-    ctrl.$setViewValue(element[0].checked, ev && ev.type);
-  };
-
-  element.on('click', listener);
-
-  ctrl.$render = function() {
-    element[0].checked = ctrl.$viewValue;
-  };
-
-  // Override the standard `$isEmpty` because the $viewValue of an empty checkbox is always set to `false`
-  // This is because of the parser below, which compares the `$modelValue` with `trueValue` to convert
-  // it to a boolean.
-  ctrl.$isEmpty = function(value) {
-    return value === false;
-  };
-
-  ctrl.$formatters.push(function(value) {
-    return equals(value, trueValue);
-  });
+        element.on('click', listener);
 
-  ctrl.$parsers.push(function(value) {
-    return value ? trueValue : falseValue;
-  });
-}
+        ctrl.$render = function () {
+            element[0].checked = ctrl.$viewValue;
+        };
 
+        // Override the standard `$isEmpty` because the $viewValue of an empty checkbox is always set to `false`
+        // This is because of the parser below, which compares the `$modelValue` with `trueValue` to convert
+        // it to a boolean.
+        ctrl.$isEmpty = function (value) {
+            return value === false;
+        };
 
-/**
- * @ngdoc directive
- * @name textarea
- * @restrict E
- *
- * @description
- * HTML textarea element control with angular data-binding. The data-binding and validation
- * properties of this element are exactly the same as those of the
- * {@link ng.directive:input input element}.
- *
- * @param {string} ngModel Assignable angular expression to data-bind to.
- * @param {string=} name Property name of the form under which the control is published.
- * @param {string=} required Sets `required` validation error key if the value is not entered.
- * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
- *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
- *    `required` when you want to data-bind to the `required` attribute.
- * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
- *    minlength.
- * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
- *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
- *    length.
- * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
- *    does not match a RegExp found by evaluating the Angular expression given in the attribute value.
- *    If the expression evaluates to a RegExp object, then this is used directly.
- *    If the expression evaluates to a string, then it will be converted to a RegExp
- *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
- *    `new RegExp('^abc$')`.

- *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
- *    start at the index of the last search's match, thus not taking the whole input value into
- *    account.
- * @param {string=} ngChange Angular expression to be executed when input changes due to user
- *    interaction with the input element.
- * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
- */
+        ctrl.$formatters.push(function (value) {
+            return equals(value, trueValue);
+        });
+
+        ctrl.$parsers.push(function (value) {
+            return value ? trueValue : falseValue;
+        });
+    }
 
 
-/**
- * @ngdoc directive
- * @name input
- * @restrict E
- *
- * @description
- * HTML input element control. When used together with {@link ngModel `ngModel`}, it provides data-binding,
- * input state control, and validation.
- * Input control follows HTML5 input types and polyfills the HTML5 validation behavior for older browsers.
- *
- * 

- * **Note:** Not every feature offered is available for all input types.
- * Specifically, data binding and event handling via `ng-model` is unsupported for `input[file]`.
- * 

- *
- * @param {string} ngModel Assignable angular expression to data-bind to.
- * @param {string=} name Property name of the form under which the control is published.
- * @param {string=} required Sets `required` validation error key if the value is not entered.
- * @param {boolean=} ngRequired Sets `required` attribute if set to true
- * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
- *    minlength.
- * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
- *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
- *    length.
- * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
- *    value does not match a RegExp found by evaluating the Angular expression given in the attribute value.
- *    If the expression evaluates to a RegExp object, then this is used directly.
- *    If the expression evaluates to a string, then it will be converted to a RegExp
- *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
- *    `new RegExp('^abc$')`.

- *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
- *    start at the index of the last search's match, thus not taking the whole input value into
- *    account.
- * @param {string=} ngChange Angular expression to be executed when input changes due to user
- *    interaction with the input element.
- * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
- *    This parameter is ignored for input[type=password] controls, which will never trim the
- *    input.
- *
- * @example
-    
-      
-       
-       

-         

-           
-           

-             
-              Required!
-           

-           
-           

-             
-               Too short!
-             
-               Too long!
-           

-         

-         

-         user = {{user}}

-         myForm.userName.$valid = {{myForm.userName.$valid}}

-         myForm.userName.$error = {{myForm.userName.$error}}

-         myForm.lastName.$valid = {{myForm.lastName.$valid}}

-         myForm.lastName.$error = {{myForm.lastName.$error}}

-         myForm.$valid = {{myForm.$valid}}

-         myForm.$error.required = {{!!myForm.$error.required}}

-         myForm.$error.minlength = {{!!myForm.$error.minlength}}

-         myForm.$error.maxlength = {{!!myForm.$error.maxlength}}

-       

-      
-      
-        var user = element(by.exactBinding('user'));
-        var userNameValid = element(by.binding('myForm.userName.$valid'));
-        var lastNameValid = element(by.binding('myForm.lastName.$valid'));
-        var lastNameError = element(by.binding('myForm.lastName.$error'));
-        var formValid = element(by.binding('myForm.$valid'));
-        var userNameInput = element(by.model('user.name'));
-        var userLastInput = element(by.model('user.last'));
-
-        it('should initialize to model', function() {
+     
+     

+     

+     
+     

+     
+     Required!
+     

+     
+     

+     
+     Too short!
+     
+     Too long!
+     

+     

+     

+     user = {{user}}

+     myForm.userName.$valid = {{myForm.userName.$valid}}

+     myForm.userName.$error = {{myForm.userName.$error}}

+     myForm.lastName.$valid = {{myForm.lastName.$valid}}

+     myForm.lastName.$error = {{myForm.lastName.$error}}

+     myForm.$valid = {{myForm.$valid}}

+     myForm.$error.required = {{!!myForm.$error.required}}

+     myForm.$error.minlength = {{!!myForm.$error.minlength}}

+     myForm.$error.maxlength = {{!!myForm.$error.maxlength}}

+     

+     
+     
+     var user = element(by.exactBinding('user'));
+     var userNameValid = element(by.binding('myForm.userName.$valid'));
+     var lastNameValid = element(by.binding('myForm.lastName.$valid'));
+     var lastNameError = element(by.binding('myForm.lastName.$error'));
+     var formValid = element(by.binding('myForm.$valid'));
+     var userNameInput = element(by.model('user.name'));
+     var userLastInput = element(by.model('user.last'));
+
+     it('should initialize to model', function() {
           expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
           expect(userNameValid.getText()).toContain('true');
           expect(formValid.getText()).toContain('true');
         });
 
-        it('should be invalid if empty when required', function() {
+     it('should be invalid if empty when required', function() {
           userNameInput.clear();
           userNameInput.sendKeys('');
 
@@ -23648,7 +23758,7 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt
           expect(formValid.getText()).toContain('false');
         });
 
-        it('should be valid if empty when min length is set', function() {
+     it('should be valid if empty when min length is set', function() {
           userLastInput.clear();
           userLastInput.sendKeys('');
 
@@ -23657,7 +23767,7 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt
           expect(formValid.getText()).toContain('true');
         });
 
-        it('should be invalid if less than required min length', function() {
+     it('should be invalid if less than required min length', function() {
           userLastInput.clear();
           userLastInput.sendKeys('xx');
 
@@ -23667,7 +23777,7 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt
           expect(formValid.getText()).toContain('false');
         });
 
-        it('should be invalid if longer than max length', function() {
+     it('should be invalid if longer than max length', function() {
           userLastInput.clear();
           userLastInput.sendKeys('some ridiculously long name');
 
@@ -23676,146 +23786,145 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt
           expect(lastNameError.getText()).toContain('maxlength');
           expect(formValid.getText()).toContain('false');
         });
-      
-    
- */
-var inputDirective = ['$browser', '$sniffer', '$filter', '$parse',
-    function($browser, $sniffer, $filter, $parse) {
-  return {
-    restrict: 'E',
-    require: ['?ngModel'],
-    link: {
-      pre: function(scope, element, attr, ctrls) {
-        if (ctrls[0]) {
-          (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrls[0], $sniffer,
-                                                              $browser, $filter, $parse);
-        }
-      }
-    }
-  };
-}];
-
+     
+     
+     */
+    var inputDirective = ['$browser', '$sniffer', '$filter', '$parse',
+        function ($browser, $sniffer, $filter, $parse) {
+            return {
+                restrict: 'E',
+                require: ['?ngModel'],
+                link: {
+                    pre: function (scope, element, attr, ctrls) {
+                        if (ctrls[0]) {
+                            (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrls[0], $sniffer,
+                                $browser, $filter, $parse);
+                        }
+                    }
+                }
+            };
+        }];
 
 
-var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
-/**
- * @ngdoc directive
- * @name ngValue
- *
- * @description
- * Binds the given expression to the value of `