Merge Develop into Master for 1.3.1 release #277
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…es to layer state. Better docs. Layer controls accept layer id as well as layer object. Minor CSS tweaks. Add all on/off menu items for dynamic layers with sublayers.
index.html - load Font-Awesome 4.2.0 css in head since iOS devices require it there - load dboostrap,css in head for better first view of web page dboostrap.css: - removed @font-face css class so old font-awesome version is not loaded dboostrap main.js: - used release 0.1.1 from May 24, 2014 which does not include dojo/dijit classes so is much smaller in size (from 22KB to < 4KB) - removed the `xstyle/css` and `xstyle/load-css` function since css file is no longer loaded via js (file size reduced further to 1KB) files/folders: - removed the font folder and font files which are no longer necessary. - removed the dijit.css file that was not referenced (same classes are contained in dbootstrap.css) basic testing completed with no issues using: - Chrome, Firefox, Safari and Internet Explorer 9/10/11 on Windows. - Chrome, Firefox, Opera and default browser on Android 4.4.4 - Chrome and Safari on iOS 6.x
LayerControl 1.3.1 patch
Conflicts: viewer/index.html
to remove font-awesome font-face class.
to remove font-awesome font-face class and dojo classes to load stylesheet.
…cmv/cmv-app into feature/dbootstrap-separate-css-from-js
dojo 1.9 / 1.10 officially supports IE 8 and higher. IE 8 will not be supported in dojo 2.0. There are only minor changes required to support IE8 in CMV so why not do so until dojo 2.0 is available and used by ESRI. index.html: - added conditional es5-shim required by Proj4JS lib with IE8. - needed for StreetView and MapInfo widgets Find/Identify/Editor widgets: - keyword 'class' requires single quotes in data-dojo-props in IE8. This is a good idea for all browsers.
Fixes for Internet Explorer 8 compatibility.
Add missing "font-family: FontAwesome;" to relevant CSS classes.
updatge indent on readme.md
Add missing `dijit/form/DropDownButton` module.
switch onOpen method to onShow so dialog content shows when openOnStartu...
remove dboostrap JS package.
Add i18n to LayerControl.
Feature/dbootstrap separate css from js
Updated 'Contributing to the Project' section under 'User Contributed Widgets' with a with link referencing the CMV wiki page Building Custom Widgets.
added link to CMV's wiki page Building Custom Widgets
Add menu icon and remove menu link. Add icon object for icons. Clean up.
…yers on/off layer menu items.
Add `allSublayerToggles` layer option to not include toggle all sublayer...
use cross-browser css 'calc' so sidebar collapse arrows are correctly positioned in all browsers. Tested with Chrome, Firefox, IE8/11, Android def browser and iOS Safari.
corrected handling of showing help dialog contents on startup.
add css to fix border container issue when gutter = false. This bug was introduced in dojo 1.10.0 (used in JS API v 3.11). It was subsequently fixed in dojo 1.10.1 (https://bugs.dojotoolkit.org/ticket/18097). This css can be removed when ESRI updates to a newer dojo build.
Fix/remove old toc widget
update to JS API version 3.11.
remove icons that are not used any more.
…-getInfoTemplate-function the layerId of the feature layer was not being passed.
…r.js removed toc parameters from config/viewer.js
…r.js removed tocLayerInfos array from Controller.
DavidSpriggs
added a commit
that referenced
this pull request
Oct 31, 2014
Merge Develop into Master for 1.3.1 release
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
v1.3.1 release