Merging of PR 139:

jansenbe · jansenbe · commit c6b056d660b5 · 2014-09-17T10:44:26.000+02:00
diff --git a/Components/Core.TaxonomyPicker/Core.TaxonomyPickerWeb/Pages/Default.aspx b/Components/Core.TaxonomyPicker/Core.TaxonomyPickerWeb/Pages/Default.aspx
@@ -7,7 +7,7 @@
     <title>TaxonomyPicker Samples</title>
     <link rel="Stylesheet" type="text/css" href="../Styles/taxonomypickercontrol.css" />
     <script src="../Scripts/jquery-1.9.1.min.js" type="text/javascript"></script>
-    <script src="../Scripts/app.js" type="text/javascript"></script>
+    <script src="../Scripts/app.js?rev=1" type="text/javascript"></script>
     <script src="../Scripts/taxonomypickercontrol.js" type="text/javascript"></script>
 </head>
 <body style="display: none;">
diff --git a/Components/Core.TaxonomyPicker/Core.TaxonomyPickerWeb/Web.config b/Components/Core.TaxonomyPicker/Core.TaxonomyPickerWeb/Web.config
@@ -1,28 +1,28 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<!--
-  For more information on how to configure your ASP.NET application, please visit
-  http://go.microsoft.com/fwlink/?LinkId=169433
-  -->
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.5" />
-    <httpRuntime targetFramework="4.5" />
-  </system.web>
-  <appSettings>
-    <add key="ClientId" value="01075b73-6243-4800-b3c6-e8db026e7ea6" />
-    <add key="ClientSecret" value="gP+mEn7wiiRCgcWITKBcBUswkPghHRHRSsm2DaOplF4=" />
-  </appSettings>
-  <system.serviceModel>
-    <bindings>
-      <basicHttpBinding>
-        <!--Used by app for SharePoint-->
-        <binding name="secureBinding">
-          <security mode="Transport" />
-        </binding>
-      </basicHttpBinding>
-    </bindings>
-    <protocolMapping>
-      <add binding="basicHttpBinding" scheme="https" bindingConfiguration="secureBinding" />
-    </protocolMapping>
-  </system.serviceModel>
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+  For more information on how to configure your ASP.NET application, please visit
+  http://go.microsoft.com/fwlink/?LinkId=169433
+  -->
+<configuration>
+  <system.web>
+    <compilation debug="true" targetFramework="4.5" />
+    <httpRuntime targetFramework="4.5" />
+  </system.web>
+  <appSettings>
+    <add key="ClientId" value="ad2c9697-6d8a-4d65-a72f-ed3355e1f93c" />
+    <add key="ClientSecret" value="gP+mEn7wiiRCgcWITKBcBUswkPghHRHRSsm2DaOplF4=" />
+  </appSettings>
+  <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <!--Used by app for SharePoint-->
+        <binding name="secureBinding">
+          <security mode="Transport" />
+        </binding>
+      </basicHttpBinding>
+    </bindings>
+    <protocolMapping>
+      <add binding="basicHttpBinding" scheme="https" bindingConfiguration="secureBinding" />
+    </protocolMapping>
+  </system.serviceModel>
 </configuration>
diff --git a/Components/Core.TaxonomyPicker/README.md b/Components/Core.TaxonomyPicker/README.md
@@ -127,6 +127,7 @@ The first parameter of the Taxonomy Picker sets the options for the control. The
 | Parameter | Description |
 | ----------|-------------|
 | isMulti | Boolean indicating if taxonomy picker support multiple value |
+| isReadOnly | Boolean indicating if the taxonomy picker is rendered in read only mode |
 | allowFillIn | Boolean indicating if the control allows fill=ins (Open TermSets only) |
 | termSetId | the GUID of the TermSet to bind against (available from Term Mgmt) |
 | useHashtags | Boolean indicating if the default hashtags TermSet should be used |
